Merge branch 'master' of github.com:rohe/pysaml2
Conflicts: src/saml2/extension/pefim.py src/saml2/sigver.py
This commit is contained in:
		@@ -32,13 +32,13 @@
 | 
				
			|||||||
                    Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
 | 
					                    Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
 | 
				
			||||||
                <saml2:SubjectConfirmationData Address="192.168.1.1"
 | 
					                <saml2:SubjectConfirmationData Address="192.168.1.1"
 | 
				
			||||||
                                               InResponseTo="id-f4d370f3d03650f3ec0da694e2348bfe"
 | 
					                                               InResponseTo="id-f4d370f3d03650f3ec0da694e2348bfe"
 | 
				
			||||||
                                               NotOnOrAfter="2014-09-14T21:06:32.081Z"
 | 
					                                               NotOnOrAfter="2024-09-14T21:06:32.081Z"
 | 
				
			||||||
                                               Recipient="https://myreviewroom.com/saml2/acs/"
 | 
					                                               Recipient="https://myreviewroom.com/saml2/acs/"
 | 
				
			||||||
                        />
 | 
					                        />
 | 
				
			||||||
            </saml2:SubjectConfirmation>
 | 
					            </saml2:SubjectConfirmation>
 | 
				
			||||||
        </saml2:Subject>
 | 
					        </saml2:Subject>
 | 
				
			||||||
        <saml2:Conditions NotBefore="2014-09-14T21:01:32.081Z"
 | 
					        <saml2:Conditions NotBefore="2014-09-14T21:01:32.081Z"
 | 
				
			||||||
                          NotOnOrAfter="2014-09-14T21:06:32.081Z"
 | 
					                          NotOnOrAfter="2024-09-14T21:06:32.081Z"
 | 
				
			||||||
                >
 | 
					                >
 | 
				
			||||||
            <saml2:AudienceRestriction>
 | 
					            <saml2:AudienceRestriction>
 | 
				
			||||||
                <saml2:Audience>urn:mace:example.com:saml:roland:sp
 | 
					                <saml2:Audience>urn:mace:example.com:saml:roland:sp
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,7 +49,7 @@ OmuMZY0K6ERY4fNVnGEAoUZeieehC6/ljmfk14xCAlE=</ns2:SignatureValue>
 | 
				
			|||||||
        _cddc88563d433f556d4cc70c3162deabddea3b5019
 | 
					        _cddc88563d433f556d4cc70c3162deabddea3b5019
 | 
				
			||||||
      </ns1:NameID>
 | 
					      </ns1:NameID>
 | 
				
			||||||
      <ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
 | 
					      <ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
 | 
				
			||||||
        <ns1:SubjectConfirmationData InResponseTo="bahigehogffohiphlfmplepdpcohkhhmheppcdie" NotOnOrAfter="2014-10-04T09:59:39Z" Recipient="http://xenosmilus.umdc.umu.se:8087/login"/>
 | 
					        <ns1:SubjectConfirmationData InResponseTo="bahigehogffohiphlfmplepdpcohkhhmheppcdie" NotOnOrAfter="2024-10-04T09:59:39Z" Recipient="http://xenosmilus.umdc.umu.se:8087/login"/>
 | 
				
			||||||
      </ns1:SubjectConfirmation>
 | 
					      </ns1:SubjectConfirmation>
 | 
				
			||||||
    </ns1:Subject>
 | 
					    </ns1:Subject>
 | 
				
			||||||
    <ns1:Conditions NotBefore="2014-10-04T09:59:39Z" NotOnOrAfter="2024-05-04T09:59:39Z">
 | 
					    <ns1:Conditions NotBefore="2014-10-04T09:59:39Z" NotOnOrAfter="2024-05-04T09:59:39Z">
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -48,5 +48,5 @@ _elem = extension_elements_to_elements(parsed.extensions.extension_elements,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
assert len(_elem) == 1
 | 
					assert len(_elem) == 1
 | 
				
			||||||
_spcertenc = _elem[0]
 | 
					_spcertenc = _elem[0]
 | 
				
			||||||
_cert = _spcertenc.x509_data[0].x509_certificate.text
 | 
					_cert = _spcertenc.key_info[0].x509_data[0].x509_certificate.text
 | 
				
			||||||
assert cert == _cert
 | 
					assert cert == _cert
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user