1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 6b457569a3..fb29e4f5f6 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_clnt.c,v 1.66 2020/05/10 14:17:47 jsing Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.67 2020/05/19 16:35:20 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1264,7 +1264,7 @@ ssl3_get_server_kex_dhe(SSL *s, EVP_PKEY **pkey, CBS *cbs)
         }
 
         if (alg_a & SSL_aRSA)
-                *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA].x509);
         else
                 /* XXX - Anonymous DH, so no certificate or pkey. */
                 *pkey = NULL;
@@ -1397,7 +1397,7 @@ ssl3_get_server_kex_ecdhe(SSL *s, EVP_PKEY **pkey, CBS *cbs)
          * and ECDSA.
          */
         if (alg_a & SSL_aRSA)
-                *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA].x509);
         else if (alg_a & SSL_aECDSA)
                 *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_ECC].x509);
         else
@@ -1933,7 +1933,7 @@ ssl3_send_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, CBB *cbb)
          * RSA-Encrypted Premaster Secret Message - RFC 5246 section 7.4.7.1.
          */
 
-        pkey = X509_get_pubkey(sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+        pkey = X509_get_pubkey(sess_cert->peer_pkeys[SSL_PKEY_RSA].x509);
         if (pkey == NULL || pkey->type != EVP_PKEY_RSA ||
             pkey->pkey.rsa == NULL) {
                 SSLerror(s, ERR_R_INTERNAL_ERROR);