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 /nss_engine_cipher.h | |
| 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 'nss_engine_cipher.h')
| -rw-r--r-- | nss_engine_cipher.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nss_engine_cipher.h b/nss_engine_cipher.h index 2cd103b..2213f5d 100644 --- a/nss_engine_cipher.h +++ b/nss_engine_cipher.h @@ -70,7 +70,8 @@ typedef struct #define SSL_AES128GCM 0x04000000L #define SSL_AES256GCM 0x08000000L #define SSL_SHA256 0x10000000L -#define SSL_AEAD 0x20000000L +#define SSL_SHA384 0x20000000L +#define SSL_AEAD 0x40000000L #define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) #define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) @@ -83,7 +84,11 @@ typedef struct /* the table itself is defined in nss_engine_cipher.c */ #ifdef NSS_ENABLE_ECC -#define ciphernum 49 +# ifdef ENABLE_SHA384 +# define ciphernum 54 +# else +# define ciphernum 49 +# endif #else #define ciphernum 20 #endif |