diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-18 11:33:21 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-18 17:14:50 -0500 |
| commit | d63a5e5e7d96f173e2bbf711e3f1f813bf0df05e (patch) | |
| tree | 6e7edc889b0c944a4f43c467b9733cc838b046e4 /ssl/ssl_lib.c | |
| parent | 1bd8bc558d7c0b41286d276e62088d7186bd5c34 (diff) | |
Remove outdated DEBUG flags.
Add -DBIO_DEBUG to --strict-warnings.
Remove comments about outdated debugging ifdef guards.
Remove md_rand ifdef guarding an assert; it doesn't seem used.
Remove the conf guards in conf_api since we use OPENSSL_assert, not assert.
For pkcs12 stuff put OPENSSL_ in front of the macro name.
Merge TLS_DEBUG into SSL_DEBUG.
Various things just turned on/off asserts, mainly for checking non-NULL
arguments, which is now removed: camellia, bn_ctx, crypto/modes.
Remove some old debug code, that basically just printed things to stderr:
DEBUG_PRINT_UNKNOWN_CIPHERSUITES, DEBUG_ZLIB, OPENSSL_RI_DEBUG,
RL_DEBUG, RSA_DEBUG, SCRYPT_DEBUG.
Remove OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index c10ab8656d..fecd39200e 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2648,15 +2648,6 @@ CERT_PKEY *ssl_get_server_send_pkey(SSL *s) return NULL; ssl_set_masks(s, s->s3->tmp.new_cipher); -#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL - /* - * Broken protocol test: return last used certificate: which may mismatch - * the one expected. - */ - if (c->cert_flags & SSL_CERT_FLAG_BROKEN_PROTOCOL) - return c->key; -#endif - i = ssl_get_server_cert_index(s); /* This may or may not be an error. */ @@ -2677,16 +2668,6 @@ EVP_PKEY *ssl_get_sign_pkey(SSL *s, const SSL_CIPHER *cipher, alg_a = cipher->algorithm_auth; c = s->cert; -#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL - /* - * Broken protocol test: use last key: which may mismatch the one - * expected. - */ - if (c->cert_flags & SSL_CERT_FLAG_BROKEN_PROTOCOL) - idx = c->key - c->pkeys; - else -#endif - if ((alg_a & SSL_aDSS) && (c->pkeys[SSL_PKEY_DSA_SIGN].privatekey != NULL)) idx = SSL_PKEY_DSA_SIGN; |