From f2976b51e8bb83a0a74861d08e15c15cd71b124b Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 1 Mar 2017 14:01:24 +0000
Subject: Convert ssl3_{get,send}_server_key_exchange() to EVP_md5_sha1().

ok inoguchi@
---
 src/lib/libssl/ssl_clnt.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'src/lib/libssl/ssl_clnt.c')

diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index da4b966bc6..223190c0a0 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.6 2017/02/28 14:08:49 jsing Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.7 2017/03/01 14:01:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1472,29 +1472,20 @@ ssl3_get_server_key_exchange(SSL *s)
 		}
 
 		if (pkey->type == EVP_PKEY_RSA && !SSL_USE_SIGALGS(s)) {
-			int num;
-
 			j = 0;
 			q = md_buf;
-			for (num = 2; num > 0; num--) {
-				if (!EVP_DigestInit_ex(&md_ctx,
-				    (num == 2) ? EVP_md5() : EVP_sha1(),
-				    NULL)) {
-					al = SSL_AD_INTERNAL_ERROR;
-					goto f_err;
-				}
-				EVP_DigestUpdate(&md_ctx,
-				    s->s3->client_random,
-				    SSL3_RANDOM_SIZE);
-				EVP_DigestUpdate(&md_ctx,
-				    s->s3->server_random,
-				    SSL3_RANDOM_SIZE);
-				EVP_DigestUpdate(&md_ctx, param, param_len);
-				EVP_DigestFinal_ex(&md_ctx, q,
-				    (unsigned int *)&i);
-				q += i;
-				j += i;
+			if (!EVP_DigestInit_ex(&md_ctx, EVP_md5_sha1(), NULL)) {
+				al = SSL_AD_INTERNAL_ERROR;
+				goto f_err;
 			}
+			EVP_DigestUpdate(&md_ctx, s->s3->client_random,
+			    SSL3_RANDOM_SIZE);
+			EVP_DigestUpdate(&md_ctx, s->s3->server_random,
+			    SSL3_RANDOM_SIZE);
+			EVP_DigestUpdate(&md_ctx, param, param_len);
+			EVP_DigestFinal_ex(&md_ctx, q, (unsigned int *)&i);
+			q += i;
+			j += i;
 			i = RSA_verify(NID_md5_sha1, md_buf, j,
 			    p, n, pkey->pkey.rsa);
 			if (i < 0) {
-- 
cgit v1.2.3-55-g6feb