|
1 # CVE-2013-4238 |
|
2 # http://bugs.python.org/issue18709 |
|
3 # |
|
4 diff -r 936621d33c38 Lib/test/keycert.pem |
|
5 --- a/Lib/test/keycert.pem Wed Feb 20 18:19:55 2013 -0500 |
|
6 +++ b/Lib/test/keycert.pem Fri Aug 16 02:32:42 2013 +0200 |
|
7 @@ -1,32 +1,31 @@ |
|
8 ------BEGIN RSA PRIVATE KEY----- |
|
9 -MIICXwIBAAKBgQC8ddrhm+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9L |
|
10 -opdJhTvbGfEj0DQs1IE8M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVH |
|
11 -fhi/VwovESJlaBOp+WMnfhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQAB |
|
12 -AoGBAK0FZpaKj6WnJZN0RqhhK+ggtBWwBnc0U/ozgKz2j1s3fsShYeiGtW6CK5nU |
|
13 -D1dZ5wzhbGThI7LiOXDvRucc9n7vUgi0alqPQ/PFodPxAN/eEYkmXQ7W2k7zwsDA |
|
14 -IUK0KUhktQbLu8qF/m8qM86ba9y9/9YkXuQbZ3COl5ahTZrhAkEA301P08RKv3KM |
|
15 -oXnGU2UHTuJ1MAD2hOrPxjD4/wxA/39EWG9bZczbJyggB4RHu0I3NOSFjAm3HQm0 |
|
16 -ANOu5QK9owJBANgOeLfNNcF4pp+UikRFqxk5hULqRAWzVxVrWe85FlPm0VVmHbb/ |
|
17 -loif7mqjU8o1jTd/LM7RD9f2usZyE2psaw8CQQCNLhkpX3KO5kKJmS9N7JMZSc4j |
|
18 -oog58yeYO8BBqKKzpug0LXuQultYv2K4veaIO04iL9VLe5z9S/Q1jaCHBBuXAkEA |
|
19 -z8gjGoi1AOp6PBBLZNsncCvcV/0aC+1se4HxTNo2+duKSDnbq+ljqOM+E7odU+Nq |
|
20 -ewvIWOG//e8fssd0mq3HywJBAJ8l/c8GVmrpFTx8r/nZ2Pyyjt3dH1widooDXYSV |
|
21 -q6Gbf41Llo5sYAtmxdndTLASuHKecacTgZVhy0FryZpLKrU= |
|
22 ------END RSA PRIVATE KEY----- |
|
23 +-----BEGIN PRIVATE KEY----- |
|
24 +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANtb0+YrKuxevGpm |
|
25 +LrjaUhZSgz6zFAmuGFmKmUbdjmfv9zSmmdsQIksK++jK0Be9LeZy20j6ahOfuVa0 |
|
26 +ufEmPoP7Fy4hXegKZR9cCWcIe/A6H2xWF1IIJLRTLaU8ol/I7T+um5HD5AwAwNPP |
|
27 +USNU0Eegmvp+xxWu3NX2m1Veot85AgMBAAECgYA3ZdZ673X0oexFlq7AAmrutkHt |
|
28 +CL7LvwrpOiaBjhyTxTeSNWzvtQBkIU8DOI0bIazA4UreAFffwtvEuPmonDb3F+Iq |
|
29 +SMAu42XcGyVZEl+gHlTPU9XRX7nTOXVt+MlRRRxL6t9GkGfUAXI3XxJDXW3c0vBK |
|
30 +UL9xqD8cORXOfE06rQJBAP8mEX1ERkR64Ptsoe4281vjTlNfIbs7NMPkUnrn9N/Y |
|
31 +BLhjNIfQ3HFZG8BTMLfX7kCS9D593DW5tV4Z9BP/c6cCQQDcFzCcVArNh2JSywOQ |
|
32 +ZfTfRbJg/Z5Lt9Fkngv1meeGNPgIMLN8Sg679pAOOWmzdMO3V706rNPzSVMME7E5 |
|
33 +oPIfAkEA8pDddarP5tCvTTgUpmTFbakm0KoTZm2+FzHcnA4jRh+XNTjTOv98Y6Ik |
|
34 +eO5d1ZnKXseWvkZncQgxfdnMqqpj5wJAcNq/RVne1DbYlwWchT2Si65MYmmJ8t+F |
|
35 +0mcsULqjOnEMwf5e+ptq5LzwbyrHZYq5FNk7ocufPv/ZQrcSSC+cFwJBAKvOJByS |
|
36 +x56qyGeZLOQlWS2JS3KJo59XuLFGqcbgN9Om9xFa41Yb4N9NvplFivsvZdw3m1Q/ |
|
37 +SPIXQuT8RMPDVNQ= |
|
38 +-----END PRIVATE KEY----- |
|
39 -----BEGIN CERTIFICATE----- |
|
40 -MIICpzCCAhCgAwIBAgIJAP+qStv1cIGNMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD |
|
41 -VQQGEwJVUzERMA8GA1UECBMIRGVsYXdhcmUxEzARBgNVBAcTCldpbG1pbmd0b24x |
|
42 -IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMQwwCgYDVQQLEwNT |
|
43 -U0wxHzAdBgNVBAMTFnNvbWVtYWNoaW5lLnB5dGhvbi5vcmcwHhcNMDcwODI3MTY1 |
|
44 -NDUwWhcNMTMwMjE2MTY1NDUwWjCBiTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCERl |
|
45 -bGF3YXJlMRMwEQYDVQQHEwpXaWxtaW5ndG9uMSMwIQYDVQQKExpQeXRob24gU29m |
|
46 -dHdhcmUgRm91bmRhdGlvbjEMMAoGA1UECxMDU1NMMR8wHQYDVQQDExZzb21lbWFj |
|
47 -aGluZS5weXRob24ub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ddrh |
|
48 -m+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9LopdJhTvbGfEj0DQs1IE8 |
|
49 -M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVHfhi/VwovESJlaBOp+WMn |
|
50 -fhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQABoxUwEzARBglghkgBhvhC |
|
51 -AQEEBAMCBkAwDQYJKoZIhvcNAQEFBQADgYEAF4Q5BVqmCOLv1n8je/Jw9K669VXb |
|
52 -08hyGzQhkemEBYQd6fzQ9A/1ZzHkJKb1P6yreOLSEh4KcxYPyrLRC1ll8nr5OlCx |
|
53 -CMhKkTnR6qBsdNV0XtdU2+N25hqW+Ma4ZeqsN/iiJVCGNOZGnvQuvCAGWF8+J/f/ |
|
54 -iHkC6gGdBJhogs4= |
|
55 +MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV |
|
56 +BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u |
|
57 +IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw |
|
58 +MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH |
|
59 +Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k |
|
60 +YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw |
|
61 +gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7 |
|
62 +6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt |
|
63 +pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw |
|
64 +FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd |
|
65 +BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G |
|
66 +lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1 |
|
67 +CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX |
|
68 -----END CERTIFICATE----- |
|
69 diff -r 936621d33c38 Lib/test/nullbytecert.pem |
|
70 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
71 +++ b/Lib/test/nullbytecert.pem Fri Aug 16 02:32:42 2013 +0200 |
|
72 @@ -0,0 +1,90 @@ |
|
73 +Certificate: |
|
74 + Data: |
|
75 + Version: 3 (0x2) |
|
76 + Serial Number: 0 (0x0) |
|
77 + Signature Algorithm: sha1WithRSAEncryption |
|
78 + Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/[email protected] |
|
79 + Validity |
|
80 + Not Before: Aug 7 13:11:52 2013 GMT |
|
81 + Not After : Aug 7 13:12:52 2013 GMT |
|
82 + Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/[email protected] |
|
83 + Subject Public Key Info: |
|
84 + Public Key Algorithm: rsaEncryption |
|
85 + Public-Key: (2048 bit) |
|
86 + Modulus: |
|
87 + 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: |
|
88 + 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: |
|
89 + 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: |
|
90 + 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: |
|
91 + 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: |
|
92 + 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: |
|
93 + a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: |
|
94 + 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: |
|
95 + ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: |
|
96 + 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: |
|
97 + 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: |
|
98 + 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: |
|
99 + f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: |
|
100 + f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: |
|
101 + ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: |
|
102 + d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: |
|
103 + 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: |
|
104 + 2f:85 |
|
105 + Exponent: 65537 (0x10001) |
|
106 + X509v3 extensions: |
|
107 + X509v3 Basic Constraints: critical |
|
108 + CA:FALSE |
|
109 + X509v3 Subject Key Identifier: |
|
110 + 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C |
|
111 + X509v3 Key Usage: |
|
112 + Digital Signature, Non Repudiation, Key Encipherment |
|
113 + X509v3 Subject Alternative Name: |
|
114 + ************************************************************* |
|
115 + WARNING: The values for DNS, email and URI are WRONG. OpenSSL |
|
116 + doesn't print the text after a NULL byte. |
|
117 + ************************************************************* |
|
118 + DNS:altnull.python.org, email:[email protected], URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 |
|
119 + Signature Algorithm: sha1WithRSAEncryption |
|
120 + ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: |
|
121 + a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: |
|
122 + 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: |
|
123 + 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: |
|
124 + 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: |
|
125 + de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: |
|
126 + 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: |
|
127 + 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: |
|
128 + d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: |
|
129 + 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: |
|
130 + 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: |
|
131 + 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: |
|
132 + 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: |
|
133 + 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: |
|
134 + c1:ca:a9:94 |
|
135 +-----BEGIN CERTIFICATE----- |
|
136 +MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx |
|
137 +DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ |
|
138 +eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg |
|
139 +RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y |
|
140 +ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw |
|
141 +NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI |
|
142 +DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv |
|
143 +ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt |
|
144 +ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq |
|
145 +hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB |
|
146 +BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j |
|
147 +pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P |
|
148 +vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv |
|
149 +KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA |
|
150 +oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL |
|
151 +08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV |
|
152 +HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E |
|
153 +BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu |
|
154 +Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 |
|
155 +bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA |
|
156 +AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 |
|
157 +i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j |
|
158 +HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk |
|
159 +kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx |
|
160 +VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW |
|
161 +RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= |
|
162 +-----END CERTIFICATE----- |
|
163 diff -r 936621d33c38 Lib/test/test_ssl.py |
|
164 --- a/Lib/test/test_ssl.py Wed Feb 20 18:19:55 2013 -0500 |
|
165 +++ b/Lib/test/test_ssl.py Fri Aug 16 02:32:42 2013 +0200 |
|
166 @@ -31,6 +31,7 @@ |
|
167 HOST = test_support.HOST |
|
168 CERTFILE = None |
|
169 SVN_PYTHON_ORG_ROOT_CERT = None |
|
170 +NULLBYTECERT = None |
|
171 |
|
172 def handle_error(prefix): |
|
173 exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) |
|
174 @@ -88,6 +89,27 @@ |
|
175 if test_support.verbose: |
|
176 sys.stdout.write("\n" + pprint.pformat(p) + "\n") |
|
177 |
|
178 + def test_parse_cert_CVE_2013_4073(self): |
|
179 + p = ssl._ssl._test_decode_cert(NULLBYTECERT) |
|
180 + if test_support.verbose: |
|
181 + sys.stdout.write("\n" + pprint.pformat(p) + "\n") |
|
182 + subject = ((('countryName', 'US'),), |
|
183 + (('stateOrProvinceName', 'Oregon'),), |
|
184 + (('localityName', 'Beaverton'),), |
|
185 + (('organizationName', 'Python Software Foundation'),), |
|
186 + (('organizationalUnitName', 'Python Core Development'),), |
|
187 + (('commonName', 'null.python.org\x00example.org'),), |
|
188 + (('emailAddress', '[email protected]'),)) |
|
189 + self.assertEqual(p['subject'], subject) |
|
190 + self.assertEqual(p['issuer'], subject) |
|
191 + self.assertEqual(p['subjectAltName'], |
|
192 + (('DNS', 'altnull.python.org\x00example.com'), |
|
193 + ('email', '[email protected]\[email protected]'), |
|
194 + ('URI', 'http://null.python.org\x00http://example.org'), |
|
195 + ('IP Address', '192.0.2.1'), |
|
196 + ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) |
|
197 + ) |
|
198 + |
|
199 def test_DER_to_PEM(self): |
|
200 with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: |
|
201 pem = f.read() |
|
202 @@ -1210,15 +1232,18 @@ |
|
203 if skip_expected: |
|
204 raise test_support.TestSkipped("No SSL support") |
|
205 |
|
206 - global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT |
|
207 + global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NULLBYTECERT |
|
208 CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, |
|
209 "keycert.pem") |
|
210 SVN_PYTHON_ORG_ROOT_CERT = os.path.join( |
|
211 os.path.dirname(__file__) or os.curdir, |
|
212 "https_svn_python_org_root.pem") |
|
213 + NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, |
|
214 + "nullbytecert.pem") |
|
215 |
|
216 if (not os.path.exists(CERTFILE) or |
|
217 - not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT)): |
|
218 + not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or |
|
219 + not os.path.exists(NULLBYTECERT)): |
|
220 raise test_support.TestFailed("Can't read certificate files!") |
|
221 |
|
222 tests = [BasicTests] |
|
223 diff -r 936621d33c38 Modules/_ssl.c |
|
224 --- a/Modules/_ssl.c Wed Feb 20 18:19:55 2013 -0500 |
|
225 +++ b/Modules/_ssl.c Fri Aug 16 02:32:42 2013 +0200 |
|
226 @@ -302,8 +302,10 @@ |
|
227 self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ |
|
228 else if (proto_version == PY_SSL_VERSION_SSL3) |
|
229 self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ |
|
230 +#ifndef OPENSSL_NO_SSL2 |
|
231 else if (proto_version == PY_SSL_VERSION_SSL2) |
|
232 self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ |
|
233 +#endif |
|
234 else if (proto_version == PY_SSL_VERSION_SSL23) |
|
235 self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */ |
|
236 PySSL_END_ALLOW_THREADS |
|
237 @@ -718,8 +720,13 @@ |
|
238 |
|
239 /* get a rendering of each name in the set of names */ |
|
240 |
|
241 + int gntype; |
|
242 + ASN1_STRING *as = NULL; |
|
243 + |
|
244 name = sk_GENERAL_NAME_value(names, j); |
|
245 - if (name->type == GEN_DIRNAME) { |
|
246 + gntype = name-> type; |
|
247 + switch (gntype) { |
|
248 + case GEN_DIRNAME: |
|
249 |
|
250 /* we special-case DirName as a tuple of tuples of attributes */ |
|
251 |
|
252 @@ -741,11 +748,61 @@ |
|
253 goto fail; |
|
254 } |
|
255 PyTuple_SET_ITEM(t, 1, v); |
|
256 + break; |
|
257 |
|
258 - } else { |
|
259 + case GEN_EMAIL: |
|
260 + case GEN_DNS: |
|
261 + case GEN_URI: |
|
262 + /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string |
|
263 + correctly. */ |
|
264 + t = PyTuple_New(2); |
|
265 + if (t == NULL) |
|
266 + goto fail; |
|
267 + switch (gntype) { |
|
268 + case GEN_EMAIL: |
|
269 + v = PyUnicode_FromString("email"); |
|
270 + as = name->d.rfc822Name; |
|
271 + break; |
|
272 + case GEN_DNS: |
|
273 + v = PyUnicode_FromString("DNS"); |
|
274 + as = name->d.dNSName; |
|
275 + break; |
|
276 + case GEN_URI: |
|
277 + v = PyUnicode_FromString("URI"); |
|
278 + as = name->d.uniformResourceIdentifier; |
|
279 + break; |
|
280 + } |
|
281 + if (v == NULL) { |
|
282 + Py_DECREF(t); |
|
283 + goto fail; |
|
284 + } |
|
285 + PyTuple_SET_ITEM(t, 0, v); |
|
286 + v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), |
|
287 + ASN1_STRING_length(as)); |
|
288 + if (v == NULL) { |
|
289 + Py_DECREF(t); |
|
290 + goto fail; |
|
291 + } |
|
292 + PyTuple_SET_ITEM(t, 1, v); |
|
293 + break; |
|
294 |
|
295 + default: |
|
296 /* for everything else, we use the OpenSSL print form */ |
|
297 - |
|
298 + switch (gntype) { |
|
299 + /* check for new general name type */ |
|
300 + case GEN_OTHERNAME: |
|
301 + case GEN_X400: |
|
302 + case GEN_EDIPARTY: |
|
303 + case GEN_IPADD: |
|
304 + case GEN_RID: |
|
305 + break; |
|
306 + default: |
|
307 + if (PyErr_Warn(PyExc_RuntimeWarning, |
|
308 + "Unknown general name type") == -1) { |
|
309 + goto fail; |
|
310 + } |
|
311 + break; |
|
312 + } |
|
313 (void) BIO_reset(biobuf); |
|
314 GENERAL_NAME_print(biobuf, name); |
|
315 len = BIO_gets(biobuf, buf, sizeof(buf)-1); |
|
316 @@ -771,6 +828,7 @@ |
|
317 goto fail; |
|
318 } |
|
319 PyTuple_SET_ITEM(t, 1, v); |
|
320 + break; |
|
321 } |
|
322 |
|
323 /* and add that rendering to the list */ |