diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-05-05 23:44:27 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-05-05 23:44:27 +0000 |
| commit | a4f576a3780b2f1a1f59dbdfc06a7bd0f9d120bb (patch) | |
| tree | a6662955e1a1fdf24206e70e7f65835581d1ff36 /ssl/ssl_ciph.c | |
| parent | 3def5a010e8202a6836bbb42d81dbacabea0705c (diff) | |
disable AES ciphersuites unless explicitly requested
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index a7e2ef65a5..cdd8dde128 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -100,8 +100,9 @@ typedef struct cipher_order_st } CIPHER_ORDER; static const SSL_CIPHER cipher_aliases[]={ - /* Don't include eNULL unless specifically enabled */ - {0,SSL_TXT_ALL, 0,SSL_ALL & ~SSL_eNULL, SSL_ALL ,0,0,0,SSL_ALL,SSL_ALL}, /* must be first */ + /* Don't include eNULL unless specifically enabled. + * Similarly, don't include AES in ALL because these ciphers are not yet official. */ + {0,SSL_TXT_ALL, 0,SSL_ALL & ~SSL_eNULL & ~SSL_AES, SSL_ALL ,0,0,0,SSL_ALL,SSL_ALL}, /* must be first */ {0,SSL_TXT_kKRB5,0,SSL_kKRB5,0,0,0,0,SSL_MKEY_MASK,0}, /* VRS Kerberos5 */ {0,SSL_TXT_kRSA,0,SSL_kRSA, 0,0,0,0,SSL_MKEY_MASK,0}, {0,SSL_TXT_kDHr,0,SSL_kDHr, 0,0,0,0,SSL_MKEY_MASK,0}, @@ -998,10 +999,10 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) case SSL_AES: switch(cipher->strength_bits) { - case 128: enc="AES(128)"; break; - case 192: enc="AES(192)"; break; - case 256: enc="AES(256)"; break; - default: enc="AES(?""?""?)"; break; + case 128: enc="AESdraft(128)"; break; + case 192: enc="AESdraft(192)"; break; + case 256: enc="AESdraft(256)"; break; + default: enc="AESdraft(?""?""?)"; break; } break; default: |