diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 92271486513eb405e08e67460bc1dafd5343610a..c36627c955f9565e369fe8dc0905070b43061931 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1617,16 +1617,8 @@ int ssl3_get_key_exchange(SSL *s)
         }
 
 /* We must check if there is a certificate */
-# ifndef OPENSSL_NO_RSA
-        if (alg_a & SSL_aRSA)
+        if (alg_a & (SSL_aRSA|SSL_aDSS))
             pkey = X509_get_pubkey(s->session->peer);
-# else
-        if (0) ;
-# endif
-# ifndef OPENSSL_NO_DSA
-        else if (alg_a & SSL_aDSS)
-            pkey = X509_get_pubkey(s->session->peer);
-# endif
     } else
 #endif                          /* !OPENSSL_NO_SRP */
 #ifndef OPENSSL_NO_RSA
@@ -1774,16 +1766,8 @@ int ssl3_get_key_exchange(SSL *s)
             SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_DH_KEY_TOO_SMALL);
             goto f_err;
         }
-# ifndef OPENSSL_NO_RSA
-        if (alg_a & SSL_aRSA)
+        if (alg_a & (SSL_aRSA|SSL_aDSS))
             pkey = X509_get_pubkey(s->session->peer);
-# else
-        if (0) ;
-# endif
-# ifndef OPENSSL_NO_DSA
-        else if (alg_a & SSL_aDSS)
-            pkey = X509_get_pubkey(s->session->peer);
-# endif
         /* else anonymous DH, so no certificate or pkey. */
 
         s->s3->peer_dh_tmp = dh;