always build in RSA and DSA. ok deraadt miod

1 files changed, 0 insertions, 12 deletions

diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index cf5cfb97f6..a823c16edf 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -163,13 +163,9 @@ static void
 ssl_cert_set_default_md(CERT *cert)
 {
         /* Set digest values to defaults */
-#ifndef OPENSSL_NO_DSA
         cert->pkeys[SSL_PKEY_DSA_SIGN].digest = EVP_sha1();
-#endif
-#ifndef OPENSSL_NO_RSA
         cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
         cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
-#endif
 #ifndef OPENSSL_NO_ECDSA
         cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1();
 #endif
@@ -217,13 +213,11 @@ CERT
         ret->export_mask_k = cert->export_mask_k;
         ret->export_mask_a = cert->export_mask_a;
 
-#ifndef OPENSSL_NO_RSA
         if (cert->rsa_tmp != NULL) {
                 RSA_up_ref(cert->rsa_tmp);
                 ret->rsa_tmp = cert->rsa_tmp;
         }
         ret->rsa_tmp_cb = cert->rsa_tmp_cb;
-#endif
 
 #ifndef OPENSSL_NO_DH
         if (cert->dh_tmp != NULL) {
@@ -319,10 +313,8 @@ CERT
 #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_ECDH)
 err:
 #endif
-#ifndef OPENSSL_NO_RSA
         if (ret->rsa_tmp != NULL)
                 RSA_free(ret->rsa_tmp);
-#endif
 #ifndef OPENSSL_NO_DH
         if (ret->dh_tmp != NULL)
                 DH_free(ret->dh_tmp);
@@ -355,10 +347,8 @@ ssl_cert_free(CERT *c)
         if (i > 0)
                 return;
 
-#ifndef OPENSSL_NO_RSA
         if (c->rsa_tmp)
                 RSA_free(c->rsa_tmp);
-#endif
 #ifndef OPENSSL_NO_DH
         if (c->dh_tmp)
                 DH_free(c->dh_tmp);
@@ -452,10 +442,8 @@ ssl_sess_cert_free(SESS_CERT *sc)
 #endif
         }
 
-#ifndef OPENSSL_NO_RSA
         if (sc->peer_rsa_tmp != NULL)
                 RSA_free(sc->peer_rsa_tmp);
-#endif
 #ifndef OPENSSL_NO_DH
         if (sc->peer_dh_tmp != NULL)
                 DH_free(sc->peer_dh_tmp);