From: Matt Caswell Date: Thu, 27 Nov 2014 11:06:43 +0000 (+0000) Subject: Remove redundant checks in ssl_cert_dup. This was causing spurious error messages... X-Git-Tag: OpenSSL_1_0_0p~50 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3b125151809e4da36f2535848572d6adaf37f729;p=oweals%2Fopenssl.git Remove redundant checks in ssl_cert_dup. This was causing spurious error messages when using GOST PR#3613 Reviewed-by: Richard Levitte (cherry picked from commit fc3968a25ce0c16cab8730ec0d68a59856158029) --- diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 27256eea81..c26b10b7ce 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -271,35 +271,6 @@ CERT *ssl_cert_dup(CERT *cert) ret->pkeys[i].privatekey = cert->pkeys[i].privatekey; CRYPTO_add(&ret->pkeys[i].privatekey->references, 1, CRYPTO_LOCK_EVP_PKEY); - - switch(i) - { - /* If there was anything special to do for - * certain types of keys, we'd do it here. - * (Nothing at the moment, I think.) */ - - case SSL_PKEY_RSA_ENC: - case SSL_PKEY_RSA_SIGN: - /* We have an RSA key. */ - break; - - case SSL_PKEY_DSA_SIGN: - /* We have a DSA key. */ - break; - - case SSL_PKEY_DH_RSA: - case SSL_PKEY_DH_DSA: - /* We have a DH key. */ - break; - - case SSL_PKEY_ECC: - /* We have an ECC key */ - break; - - default: - /* Can't happen. */ - SSLerr(SSL_F_SSL_CERT_DUP, SSL_R_LIBRARY_BUG); - } } }