From e58fb502ca02fb2bd4f85e5725abd1189d26921c Mon Sep 17 00:00:00 2001
From: miod <>
Date: Thu, 7 Aug 2014 20:02:23 +0000
Subject: Oops, revert changes commited by mistake. The previous commit was
 supposed to only apply to s23_srvr.c.

---
 src/lib/libssl/d1_clnt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 165f9441f6..c9ec32173b 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.32 2014/08/07 19:46:31 miod Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.33 2014/08/07 20:02:23 miod Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -778,9 +778,8 @@ dtls1_client_hello(SSL *s)
 
 		/* if client_random is initialized, reuse it, we are
 		 * required to use same upon reply to HelloVerify */
-		for (i = 0; i < sizeof(s->s3->client_random); i++)
-			if (p[i] != '\0')
-				break;
+		for (i = 0; p[i]=='\0' && i < sizeof(s->s3->client_random); i++)
+			;
 		if (i == sizeof(s->s3->client_random))
 			RAND_pseudo_bytes(p, sizeof(s->s3->client_random));
 
@@ -1339,6 +1338,7 @@ dtls1_send_client_certificate(SSL *s)
 		/* If we get an error, we need to
 		 * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
 		 * We then get retied later */
+		i = 0;
 		i = ssl_do_client_cert_cb(s, &x509, &pkey);
 		if (i < 0) {
 			s->rwstate = SSL_X509_LOOKUP;
-- 
cgit v1.2.3-55-g6feb