Skip to content

Commit 1082c30

Browse files
spaceonespaceone
committed
sed -i 's/ns2/ds/g' $(git grep -l 'xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"')
1 parent 3448171 commit 1082c30

File tree

7 files changed

+55
-55
lines changed

7 files changed

+55
-55
lines changed

‎tests/encrypted_attribute_statement.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<ns0:AttributeStatement xmlns:ns0="urn:oasis:names:tc:SAML:2.0:assertion"
33
xmlns:ns1="http://www.w3.org/2001/04/xmlenc#"
4-
xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
4+
xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
55
<ns0:EncryptedAttribute >
66
<ns1:EncryptedData ID="_dcf9eb6ed26d9332d940130e0cae1ba1"
77
Type="http://www.w3.org/2001/04/xmlenc#Element">
88
<ns1:EncryptionMethod
99
Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
10-
<ns2:KeyInfo>
11-
<ns2:RetrievalMethod Type="http://www.w3.org/2001/04/xmlenc#EncryptedKey"
10+
<ds:KeyInfo>
11+
<ds:RetrievalMethod Type="http://www.w3.org/2001/04/xmlenc#EncryptedKey"
1212
URI="#_1234"/>
13-
</ns2:KeyInfo>
13+
</ds:KeyInfo>
1414
<ns1:CipherData>
1515
<ns1:CipherValue>
1616
xj+8vbBX7wMflO5/Oiw19sXUNtAjIXU5F/EAojJWQq3HRNzI/8MAy03SUHwsYdxu
@@ -27,9 +27,9 @@
2727
<ns1:EncryptedKey ID="_1234">
2828
<ns1:EncryptionMethod
2929
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
30-
<ns2:KeyInfo>
31-
<ns2:KeyName/>
32-
</ns2:KeyInfo>
30+
<ds:KeyInfo>
31+
<ds:KeyName/>
32+
</ds:KeyInfo>
3333
<ns1:CipherData>
3434
<ns1:CipherValue>
3535
H57XM3+yhY5nHiTYmfTLmH9FBL9jTRcUQTx0fwSIQaYbsHVne9gvsu47unVwXASl
@@ -46,13 +46,13 @@
4646
<ns1:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
4747
<ns1:EncryptionMethod
4848
Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
49-
<ns2:KeyInfo>
49+
<ds:KeyInfo>
5050
<ns1:EncryptedKey>
5151
<ns1:EncryptionMethod
5252
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
53-
<ns2:KeyInfo>
54-
<ns2:KeyName/>
55-
</ns2:KeyInfo>
53+
<ds:KeyInfo>
54+
<ds:KeyName/>
55+
</ds:KeyInfo>
5656
<ns1:CipherData>
5757
<ns1:CipherValue>
5858
hDtrZP8T7LHr0dtbhI5KnRDZiDpnKFJ2RT1yqP42G0MAuvE/pdPPR3bpRD6AGvfd
@@ -61,7 +61,7 @@
6161
</ns1:CipherValue>
6262
</ns1:CipherData>
6363
</ns1:EncryptedKey>
64-
</ns2:KeyInfo>
64+
</ds:KeyInfo>
6565
<ns1:CipherData>
6666
<ns1:CipherValue>
6767
XNyrhgaUs00vg9WA5idgv6yPOa5CwHrCb4IHM7tlK+aW7MWaZBjcifDFJDBNQ1At
@@ -80,13 +80,13 @@
8080
<ns1:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
8181
<ns1:EncryptionMethod
8282
Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
83-
<ns2:KeyInfo>
83+
<ds:KeyInfo>
8484
<ns1:EncryptedKey>
8585
<ns1:EncryptionMethod
8686
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
87-
<ns2:KeyInfo>
88-
<ns2:KeyName/>
89-
</ns2:KeyInfo>
87+
<ds:KeyInfo>
88+
<ds:KeyName/>
89+
</ds:KeyInfo>
9090
<ns1:CipherData>
9191
<ns1:CipherValue>
9292
mqeDbs+m1iV/iJAibjg2JkaTk5qgcoevTFmQvKi4r/poK1Ch6RuNhcY6B+avyrC7
@@ -95,7 +95,7 @@
9595
</ns1:CipherValue>
9696
</ns1:CipherData>
9797
</ns1:EncryptedKey>
98-
</ns2:KeyInfo>
98+
</ds:KeyInfo>
9999
<ns1:CipherData>
100100
<ns1:CipherValue>
101101
or5RZixvPJKh3/dk4xm5xfbTLYlgEaSs88lLtx+7eWUuTKUD7APCi3QtBJmMzPak
@@ -114,13 +114,13 @@
114114
<ns1:EncryptedData Type="http://www.w3.org/2001/04/xmlenc#Element">
115115
<ns1:EncryptionMethod
116116
Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
117-
<ns2:KeyInfo>
117+
<ds:KeyInfo>
118118
<ns1:EncryptedKey>
119119
<ns1:EncryptionMethod
120120
Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
121-
<ns2:KeyInfo>
122-
<ns2:KeyName/>
123-
</ns2:KeyInfo>
121+
<ds:KeyInfo>
122+
<ds:KeyName/>
123+
</ds:KeyInfo>
124124
<ns1:CipherData>
125125
<ns1:CipherValue>
126126
kpkeBJDeQ7Eo1h5vOo5tmIAwhJm01wuOTWRzwBw1tIne2REC0DwxpQf6+ZOXCQAe
@@ -129,7 +129,7 @@
129129
</ns1:CipherValue>
130130
</ns1:CipherData>
131131
</ns1:EncryptedKey>
132-
</ns2:KeyInfo>
132+
</ds:KeyInfo>
133133
<ns1:CipherData>
134134
<ns1:CipherValue>
135135
XQmRA71fcF0Inuzn7nEZGFu0XHnMV50VUfzbfxonOskcf63wRJQdBCSffUQPj7P6

‎tests/idp_2.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<ns0:AttributeAuthorityDescriptor
5454
protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
5555
<ns0:KeyDescriptor>
56-
<ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
57-
<ns2:X509Data>
58-
<ns2:X509Certificate>
56+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
57+
<ds:X509Data>
58+
<ds:X509Certificate>
5959
MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
6060
BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
6161
aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF
@@ -71,9 +71,9 @@
7171
h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5
7272
U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6
7373
mrPzGzk3ECbupFnqyREH3+ZPSdk=
74-
</ns2:X509Certificate>
75-
</ns2:X509Data>
76-
</ns2:KeyInfo>
74+
</ds:X509Certificate>
75+
</ds:X509Data>
76+
</ds:KeyInfo>
7777
</ns0:KeyDescriptor>
7878
<ns0:AttributeService
7979
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

‎tests/idp_aa.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<ns0:AttributeAuthorityDescriptor
5454
protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
5555
<ns0:KeyDescriptor>
56-
<ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
57-
<ns2:X509Data>
58-
<ns2:X509Certificate>
56+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
57+
<ds:X509Data>
58+
<ds:X509Certificate>
5959
MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
6060
BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
6161
aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF
@@ -71,9 +71,9 @@
7171
h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5
7272
U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6
7373
mrPzGzk3ECbupFnqyREH3+ZPSdk=
74-
</ns2:X509Certificate>
75-
</ns2:X509Data>
76-
</ns2:KeyInfo>
74+
</ds:X509Certificate>
75+
</ds:X509Data>
76+
</ds:KeyInfo>
7777
</ns0:KeyDescriptor>
7878
<ns0:AttributeService
7979
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

‎tests/metadata/idp_2.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<ns0:AttributeAuthorityDescriptor
5454
protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
5555
<ns0:KeyDescriptor>
56-
<ns2:KeyInfo xmlns:ns2="http://www.w3.org/2000/09/xmldsig#">
57-
<ns2:X509Data>
58-
<ns2:X509Certificate>
56+
<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
57+
<ds:X509Data>
58+
<ds:X509Certificate>
5959
MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
6060
BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
6161
aWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBF
@@ -71,9 +71,9 @@
7171
h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5
7272
U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6
7373
mrPzGzk3ECbupFnqyREH3+ZPSdk=
74-
</ns2:X509Certificate>
75-
</ns2:X509Data>
76-
</ns2:KeyInfo>
74+
</ds:X509Certificate>
75+
</ds:X509Data>
76+
</ds:KeyInfo>
7777
</ns0:KeyDescriptor>
7878
<ns0:AttributeService
7979
Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

‎tests/saml_hok.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- SAML response with multiple 'holder-of-key' subject confirmations. -->
33
<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol"
44
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
5-
xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"
5+
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
66
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="https://sp:443/.auth/saml/login" ID="_df9a1eadc90519252694519504a13dfb8dd67a1bb4" InResponseTo="id-KHlas49TtW2VdC8WN" IssueInstant="2019-05-14T20:35:13Z" Version="2.0">
77
<saml:Issuer>https://idp:8443</saml:Issuer>
88
<ns0:Status>
@@ -14,20 +14,20 @@
1414
<saml:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent">57a0a35eefdb29ca8b4ab78d5a118117</saml:NameID>
1515
<saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:holder-of-key">
1616
<saml:SubjectConfirmationData InResponseTo="id-KHlas49TtW2VdC8WN" NotOnOrAfter="2019-05-14T20:36:13Z" Recipient="https://sp:443/.auth/saml/login">
17-
<ns2:KeyInfo>
18-
<ns2:X509Data>
19-
<ns2:X509Certificate>MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHcj80WU/XBsd9FlyQmfjPUdfmedhCFDd6TEQmZNNqP/UG+VkGa+BXjRIHMfic/WxPTbGhCjv68ci0UDNomUXagFexLGNpkwa7+CRVtoc/1xgq+ySE6M4nhcCutScoxNvWNn5eSQ66i3U0sTv91MgsXxqEdTaiZg0BIufEc3dueQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAGUV5B+USHvaRa8kgCNJSuNpo6ARlv0ekrk8bbdNRBiEUdCMyoGJFfuM9K0zybX6Vr25wai3nvaog294Vx/jWjX2g5SDbjItH6VGy6C9GCGf1A07VxFRCfJn5tA9HuJjPKiE+g/BmrV5N4CealzFxPHWYkNOzoRU8qI7OqUai1kL</ns2:X509Certificate>
20-
</ns2:X509Data>
21-
</ns2:KeyInfo>
17+
<ds:KeyInfo>
18+
<ds:X509Data>
19+
<ds:X509Certificate>MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHcj80WU/XBsd9FlyQmfjPUdfmedhCFDd6TEQmZNNqP/UG+VkGa+BXjRIHMfic/WxPTbGhCjv68ci0UDNomUXagFexLGNpkwa7+CRVtoc/1xgq+ySE6M4nhcCutScoxNvWNn5eSQ66i3U0sTv91MgsXxqEdTaiZg0BIufEc3dueQIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAGUV5B+USHvaRa8kgCNJSuNpo6ARlv0ekrk8bbdNRBiEUdCMyoGJFfuM9K0zybX6Vr25wai3nvaog294Vx/jWjX2g5SDbjItH6VGy6C9GCGf1A07VxFRCfJn5tA9HuJjPKiE+g/BmrV5N4CealzFxPHWYkNOzoRU8qI7OqUai1kL</ds:X509Certificate>
20+
</ds:X509Data>
21+
</ds:KeyInfo>
2222
</saml:SubjectConfirmationData>
2323
</saml:SubjectConfirmation>
2424
<saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:holder-of-key">
2525
<saml:SubjectConfirmationData InResponseTo="id-KHlas49TtW2VdC8WN" NotOnOrAfter="2019-05-14T20:36:13Z" Recipient="https://sp:443/.auth/saml/login">
26-
<ns2:KeyInfo>
27-
<ns2:X509Data>
28-
<ns2:X509Certificate>MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW0kJM+4baWKtvO24ZsGXNvNKKkwTMz7OW5Z6BRqhSOq2WA0c5NCpMk6rD8Z2OTFEolPojEjf8dVyd/Ds/hrjFKQv8wQgbdXLN51YTIsgd6h+hBJO+vzhl0PT4aT7M0JKo5ALtS6qk4tsworW2BnwyvsGSAinwfeWt4t/b1J3kwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAFtj7WArQQBugmh/KQjjlfTQ5A052QeXfgTyO9vv1S6MRIi7qgiaEv49cGXnJv/TWbySkMKObPMUApjg6z8PqcxuShew5FCTkNvwhABFPiyu0fUj3e2FEPHfsBu76jz4ugtmhUqjqhzwFY9ctnWRkkl6J0AjM3LnHOSgjNIclDZG</ns2:X509Certificate>
29-
</ns2:X509Data>
30-
</ns2:KeyInfo>
26+
<ds:KeyInfo>
27+
<ds:X509Data>
28+
<ds:X509Certificate>MIICITCCAYoCAQEwDQYJKoZIhvcNAQELBQAwWDELMAkGA1UEBhMCenoxCzAJBgNVBAgMAnp6MQ0wCwYDVQQHDAR6enp6MQ4wDAYDVQQKDAVaenp6ejEOMAwGA1UECwwFWnp6enoxDTALBgNVBAMMBHRlc3QwIBcNMTkwNDEyMTk1MDM0WhgPMzAxODA4MTMxOTUwMzRaMFgxCzAJBgNVBAYTAnp6MQswCQYDVQQIDAJ6ejENMAsGA1UEBwwEenp6ejEOMAwGA1UECgwFWnp6enoxDjAMBgNVBAsMBVp6enp6MQ0wCwYDVQQDDAR0ZXN0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW0kJM+4baWKtvO24ZsGXNvNKKkwTMz7OW5Z6BRqhSOq2WA0c5NCpMk6rD8Z2OTFEolPojEjf8dVyd/Ds/hrjFKQv8wQgbdXLN51YTIsgd6h+hBJO+vzhl0PT4aT7M0JKo5ALtS6qk4tsworW2BnwyvsGSAinwfeWt4t/b1J3kwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBAFtj7WArQQBugmh/KQjjlfTQ5A052QeXfgTyO9vv1S6MRIi7qgiaEv49cGXnJv/TWbySkMKObPMUApjg6z8PqcxuShew5FCTkNvwhABFPiyu0fUj3e2FEPHfsBu76jz4ugtmhUqjqhzwFY9ctnWRkkl6J0AjM3LnHOSgjNIclDZG</ds:X509Certificate>
29+
</ds:X509Data>
30+
</ds:KeyInfo>
3131
</saml:SubjectConfirmationData>
3232
</saml:SubjectConfirmation>
3333
</saml:Subject>

‎tests/saml_hok_invalid.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- SAML response with invalid 'holder-of-key' SubjectConfirmation: missing KeyInfo element. -->
33
<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol"
44
xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
5-
xmlns:ns2="http://www.w3.org/2000/09/xmldsig#"
5+
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
66
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="https://sp:443/.auth/saml/login" ID="_df9a1eadc90519252694519504a13dfb8dd67a1bb4" InResponseTo="id-KHlas49TtW2VdC8WN" IssueInstant="2019-05-14T20:35:13Z" Version="2.0">
77
<saml:Issuer>https://idp:8443</saml:Issuer>
88
<ns0:Status>

0 commit comments

Comments
 (0)