Merge branch 'master' of github.com:simplesamlphp/simplesamlphp

# By Brian Vuyk
# Via Brian Vuyk (1) and Jaime Pérez Crespo (1)
* 'master' of github.com:simplesamlphp/simplesamlphp:
  Use !in_array() for improved readability
  Add support for sender-vouches

modules/saml/lib/Message.php

@@ -587,8 +587,9 @@ class sspmod_saml_Message {
 
 		$found = FALSE;
 		$lastError = 'No SubjectConfirmation element in Subject.';
+		$validSCMethods = array(SAML2_Const::CM_BEARER, SAML2_Const::CM_HOK, SAML2_Const::CM_VOUCHES);
 		foreach ($assertion->getSubjectConfirmation() as $sc) {
-			if ($sc->Method !== SAML2_Const::CM_BEARER && $sc->Method !== SAML2_Const::CM_HOK) {
+		    if (!in_array($sc->Method, $validSCMethods)) {
 				$lastError = 'Invalid Method on SubjectConfirmation: ' . var_export($sc->Method, TRUE);
 				continue;
 			}