diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2015-09-24 15:10:12 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2015-10-02 16:51:56 -0400 |
| commit | 76ef17a7dc33ef94a18741d3ff6021bccf2bc360 (patch) | |
| tree | 1da49d7d70c507c7e4ec5d4063da96778d64b89c /test | |
| parent | 2341ceb7936b9e46d1fe00722ccbd4af44091907 (diff) | |
| download | mod_nss-76ef17a7dc33ef94a18741d3ff6021bccf2bc360.tar.gz mod_nss-76ef17a7dc33ef94a18741d3ff6021bccf2bc360.tar.xz mod_nss-76ef17a7dc33ef94a18741d3ff6021bccf2bc360.zip | |
NSS added support for some SHA384 ciphers, add them
I don't want to assume these ciphers are available in
every distro so I'm bending over backwards a bit to
check for availablility and get the defines right
for the python cipher tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_cipher.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/test_cipher.py b/test/test_cipher.py index 3f1f344..2c27796 100644 --- a/test/test_cipher.py +++ b/test/test_cipher.py @@ -4,8 +4,8 @@ import os import nose from nose.tools import make_decorator -# As of now there are 47 ciphers including ECC -WITH_ECC=47 +# This file is auto-generated by configure +from variable import ENABLE_SHA384 cwd = os.getcwd() srcdir = os.path.dirname(cwd) @@ -19,6 +19,10 @@ CIPHERS_NOT_IN_NSS = ['ECDH-RSA-AES128-SHA256', 'ECDH-ECDSA-AES128-SHA256', 'ECDH-RSA-AES128-GCM-SHA256', 'EXP-DES-CBC-SHA', + 'ECDH-RSA-AES256-GCM-SHA384', + 'ECDH-ECDSA-AES256-SHA384', + 'ECDH-RSA-AES256-SHA384', + 'ECDH-ECDSA-AES256-GCM-SHA384', ] def assert_equal_openssl(nss_ciphers, ossl_ciphers): @@ -38,7 +42,7 @@ def assert_equal_openssl(nss_ciphers, ossl_ciphers): # output. t = list() for o in ossl_list: - if 'SHA384' in o: + if not ENABLE_SHA384 and 'SHA384' in o: continue if o in CIPHERS_NOT_IN_NSS: continue |