Improve on code from the previous commit.

ok bcook@

1 files changed, 5 insertions, 7 deletions

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 59a90d4b8e..3596315166 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.117 2016/09/20 04:25:09 bcook Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.118 2016/09/22 12:34:59 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2848,6 +2848,7 @@ SSL_CTX *
 SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
 {
         CERT *ocert = ssl->cert;
+
         if (ssl->ctx == ctx)
                 return (ssl->ctx);
         if (ctx == NULL)
@@ -2855,12 +2856,9 @@ SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx)
         ssl->cert = ssl_cert_dup(ctx->cert);
         if (ocert != NULL) {
                 int i;
-                /* Copy negotiated digests from original */
-                for (i = 0; i < SSL_PKEY_NUM; i++) {
-                        CERT_PKEY *cpk = ocert->pkeys + i;
-                        CERT_PKEY *rpk = ssl->cert->pkeys + i;
-                        rpk->digest = cpk->digest;
-                }
+                /* Copy negotiated digests from original certificate. */
+                for (i = 0; i < SSL_PKEY_NUM; i++)
+                        ssl->cert->pkeys[i].digest = ocert->pkeys[i].digest;
                 ssl_cert_free(ocert);
         }
         CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX);