diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-04-02 04:08:10 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-04-02 04:08:10 (GMT) |
| commit | 4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc (patch) | |
| tree | abbf915b5f6ab0194959ebb6ad1f1e5de7824c0e /Lib/test | |
| parent | ff444e828e412d52325f3363e8cbcf4806c45d73 (diff) | |
| parent | a7eaf56a6d1de20a7a36fde03b3512fa5f9f395d (diff) | |
| download | cpython-4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc.zip cpython-4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc.tar.gz cpython-4b9df0d33ba5f35e7c8b15cb9298b7706b1a9bdc.tar.bz2 | |
merge 3.4 (#23844)
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/dh1024.pem | 7 | ||||
| -rw-r--r-- | Lib/test/dh512.pem | 9 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Lib/test/dh1024.pem b/Lib/test/dh1024.pem new file mode 100644 index 0000000..a391176 --- /dev/null +++ b/Lib/test/dh1024.pem @@ -0,0 +1,7 @@ +-----BEGIN DH PARAMETERS----- +MIGHAoGBAIbzw1s9CT8SV5yv6L7esdAdZYZjPi3qWFs61CYTFFQnf2s/d09NYaJt +rrvJhIzWavqnue71qXCf83/J3nz3FEwUU/L0mGyheVbsSHiI64wUo3u50wK5Igo0 +RNs/LD0irs7m0icZ//hijafTU+JOBiuA8zMI+oZfU7BGuc9XrUprAgEC +-----END DH PARAMETERS----- + +Generated with: openssl dhparam -out dh1024.pem 1024 diff --git a/Lib/test/dh512.pem b/Lib/test/dh512.pem deleted file mode 100644 index 200d16c..0000000 --- a/Lib/test/dh512.pem +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN DH PARAMETERS----- -MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak -XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC ------END DH PARAMETERS----- - -These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols" -(http://www.skip-vpn.org/spec/numbers.html). -See there for how they were generated. -Note that g is not a generator, but this is not a problem since p is a safe prime. diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 15d6b82..9140fc1 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -64,7 +64,7 @@ BADKEY = data_file("badkey.pem") NOKIACERT = data_file("nokia.pem") NULLBYTECERT = data_file("nullbytecert.pem") -DHFILE = data_file("dh512.pem") +DHFILE = data_file("dh1024.pem") BYTES_DHFILE = os.fsencode(DHFILE) |