diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-04 16:34:31 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-18 23:38:34 +0100 |
| commit | d7e498ac55f12bc2f4e7f948cbb8de2e3eeafc74 (patch) | |
| tree | 755ca6bcbcd3b85d0371713d754b26f4a9d70250 /ssl/statem | |
| parent | b24d6c335d3beb431f8f9847623d4db39ae1f96b (diff) | |
Deprecate RSA harder
This deprecates all functions that deal with the types RSA and RSA_METHOD
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13096)
Diffstat (limited to 'ssl/statem')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 3 | ||||
| -rw-r--r-- | ssl/statem/statem_lib.c | 1 | ||||
| -rw-r--r-- | ssl/statem/statem_srvr.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 5b7b7cd5f5..277998f954 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -20,6 +20,7 @@ #include <openssl/evp.h> #include <openssl/md5.h> #include <openssl/dh.h> +#include <openssl/rsa.h> #include <openssl/bn.h> #include <openssl/engine.h> #include <openssl/trace.h> @@ -2824,7 +2825,7 @@ static int tls_construct_cke_rsa(SSL *s, WPACKET *pkt) } pkey = X509_get0_pubkey(s->session->peer); - if (EVP_PKEY_get0_RSA(pkey) == NULL) { + if (!EVP_PKEY_is_a(pkey, "RSA")) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); return 0; } diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 2dd3bf1fbc..0773b42e0e 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -18,6 +18,7 @@ #include <openssl/buffer.h> #include <openssl/objects.h> #include <openssl/evp.h> +#include <openssl/rsa.h> #include <openssl/x509.h> #include <openssl/trace.h> diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index c478c5a7e8..16bd24d103 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -20,6 +20,7 @@ #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/dh.h> +#include <openssl/rsa.h> #include <openssl/bn.h> #include <openssl/md5.h> #include <openssl/trace.h> |