diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-02-23 01:11:01 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-02-23 01:11:01 +0000 |
commit | 3142c86d65a7da76d60622dcf1c177479d1bc9de (patch) | |
tree | 9c2f6932de1df175c32cbeb55d52da011fde96ed /ssl | |
parent | 4b42658082a3d6224d25f10de8fdb605d30015a9 (diff) |
Allow ADH to be used but not present in the default cipher
list.
Allow CERTIFICATE to be used in PEM headers for PKCS#7 structures:
some CAs do this.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl.h | 5 | ||||
-rw-r--r-- | ssl/ssl_lib.c | 2 |
2 files changed, 0 insertions, 7 deletions
@@ -134,12 +134,7 @@ extern "C" { /* 'DEFAULT' at the start of the cipher list insert the following string * in addition to this being the default cipher string */ -#ifndef NO_RSA #define SSL_DEFAULT_CIPHER_LIST "ALL:!ADH:RC4+RSA:+SSLv2:@STRENGTH" -#else -#define SSL_ALLOW_ADH -#define SSL_DEFAULT_CIPHER_LIST "ALL:ADH+3DES:ADH+RC4:ADH+DES:@STRENGTH" -#endif /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */ #define SSL_SENT_SHUTDOWN 1 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index f09e46c346..5af71b5545 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1367,10 +1367,8 @@ void ssl_set_cert_masks(CERT *c, SSL_CIPHER *cipher) emask|=SSL_aDSS; } -#ifdef SSL_ALLOW_ADH mask|=SSL_aNULL; emask|=SSL_aNULL; -#endif c->mask=mask; c->export_mask=emask; |