diff options
| author | Emilia Kasper <emilia@openssl.org> | 2017-02-28 14:13:40 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2017-03-01 10:44:49 +0100 |
| commit | 2f0ca54c32299638e5a1d7577112a7fc07774f00 (patch) | |
| tree | a58e3dc0178e943d22447d4eb15feb7df18a05eb /ssl/ssl_ciph.c | |
| parent | 06611d0a1623a1ce06275b6cdd7a270d9704bf37 (diff) | |
| download | openssl-2f0ca54c32299638e5a1d7577112a7fc07774f00.zip openssl-2f0ca54c32299638e5a1d7577112a7fc07774f00.tar.gz openssl-2f0ca54c32299638e5a1d7577112a7fc07774f00.tar.bz2 | |
Remove some obsolete/obscure internal define switches:
- FLAT_INC
- PKCS1_CHECK (the SSL_OP_PKCS1_CHECK options have been
no-oped)
- PKCS_TESTVECT (debugging leftovers)
- SSL_AD_MISSING_SRP_USERNAME (unfinished feature)
- DTLS_AD_MISSING_HANDSHAKE_MESSAGE (unfinished feature)
- USE_OBJ_MAC (note this removes a define from the public header but
very unlikely someone would be depending on it)
- SSL_FORBID_ENULL
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 5fe2117..be33ff3 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -388,9 +388,6 @@ void ssl_load_ciphers(void) disabled_enc_mask |= t->mask; } } -#ifdef SSL_FORBID_ENULL - disabled_enc_mask |= SSL_eNULL; -#endif disabled_mac_mask = 0; for (i = 0, t = ssl_cipher_table_mac; i < SSL_MD_NUM_IDX; i++, t++) { const EVP_MD *md = EVP_get_digestbynid(t->nid); |