diff options
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 3ab652a6a4..37fff3a38f 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1978,13 +1978,9 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
1978 | 1978 | ||
1979 | kl = SSL_C_EXPORT_PKEYLENGTH(cipher); | 1979 | kl = SSL_C_EXPORT_PKEYLENGTH(cipher); |
1980 | 1980 | ||
1981 | #ifndef OPENSSL_NO_RSA | ||
1982 | rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); | 1981 | rsa_tmp = (c->rsa_tmp != NULL || c->rsa_tmp_cb != NULL); |
1983 | rsa_tmp_export = (c->rsa_tmp_cb != NULL || | 1982 | rsa_tmp_export = (c->rsa_tmp_cb != NULL || |
1984 | (rsa_tmp && RSA_size(c->rsa_tmp)*8 <= kl)); | 1983 | (rsa_tmp && RSA_size(c->rsa_tmp)*8 <= kl)); |
1985 | #else | ||
1986 | rsa_tmp = rsa_tmp_export = 0; | ||
1987 | #endif | ||
1988 | #ifndef OPENSSL_NO_DH | 1984 | #ifndef OPENSSL_NO_DH |
1989 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); | 1985 | dh_tmp = (c->dh_tmp != NULL || c->dh_tmp_cb != NULL); |
1990 | dh_tmp_export = (c->dh_tmp_cb != NULL || | 1986 | dh_tmp_export = (c->dh_tmp_cb != NULL || |
@@ -2990,7 +2986,6 @@ SSL_want(const SSL *s) | |||
2990 | * \param cb the callback | 2986 | * \param cb the callback |
2991 | */ | 2987 | */ |
2992 | 2988 | ||
2993 | #ifndef OPENSSL_NO_RSA | ||
2994 | void | 2989 | void |
2995 | SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl, | 2990 | SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl, |
2996 | int is_export, | 2991 | int is_export, |
@@ -3006,7 +3001,6 @@ int keylength)) | |||
3006 | { | 3001 | { |
3007 | SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb); | 3002 | SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb); |
3008 | } | 3003 | } |
3009 | #endif | ||
3010 | 3004 | ||
3011 | #ifdef DOXYGEN | 3005 | #ifdef DOXYGEN |
3012 | /*! | 3006 | /*! |