diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-02-10 05:23:53 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-02-10 21:08:35 +0100 |
| commit | d0ff28f8a23f98876a979c932fe1cb016738b0c4 (patch) | |
| tree | 293974577fdacad6e067eca5d8ec0d27769a979b /ssl/ssl_ciph.c | |
| parent | Check index >= 0 as 0 is a valid index. (diff) | |
| download | openssl-d0ff28f8a23f98876a979c932fe1cb016738b0c4.tar.xz openssl-d0ff28f8a23f98876a979c932fe1cb016738b0c4.zip | |
Replace SSL_PKEY_RSA_ENC, SSL_PKEY_RSA_SIGN
The original intent of SSL_PKEY_RSA_SIGN and SSL_PKEY_RSA_ENC was to
support two different keys for RSA signing and decrypt. However this
was never implemented and we only ever set one key and the other was
always NULL. Replace with single SSL_PKEY_RSA type.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2587)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 3149c39f5f..d28b53df92 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1909,7 +1909,7 @@ int ssl_cipher_get_cert_index(const SSL_CIPHER *c) else if (alg_a & SSL_aDSS) return SSL_PKEY_DSA_SIGN; else if (alg_a & SSL_aRSA) - return SSL_PKEY_RSA_ENC; + return SSL_PKEY_RSA; else if (alg_a & SSL_aGOST12) return SSL_PKEY_GOST_EC; else if (alg_a & SSL_aGOST01) |