From e1423b93bd3553efa320e96178feb2e4fbf950d1 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Wed, 15 Jul 2015 21:52:02 +0000
Subject: test for n<0 before use in CBS_init - mostly to shut up coverity.
 reluctant ok miod@

---
 src/lib/libssl/s3_both.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c
index 5db0a11618..a19ce74380 100644
--- a/src/lib/libssl/s3_both.c
+++ b/src/lib/libssl/s3_both.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_both.c,v 1.41 2015/07/14 05:41:07 doug Exp $ */
+/* $OpenBSD: s3_both.c,v 1.42 2015/07/15 21:52:02 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -242,9 +242,15 @@ ssl3_get_finished(SSL *s, int a, int b)
 
 	md_len = s->method->ssl3_enc->finish_mac_length;
 
+	if (n < 0) {
+		al = SSL_AD_DECODE_ERROR;
+		SSLerr(SSL_F_SSL3_GET_FINISHED, SSL_R_BAD_DIGEST_LENGTH);
+		goto f_err;
+	}
+
 	CBS_init(&cbs, s->init_msg, n);
 
-	if (n < 0 || s->s3->tmp.peer_finish_md_len != md_len ||
+	if (s->s3->tmp.peer_finish_md_len != md_len ||
 	    CBS_len(&cbs) != md_len) {
 		al = SSL_AD_DECODE_ERROR;
 		SSLerr(SSL_F_SSL3_GET_FINISHED, SSL_R_BAD_DIGEST_LENGTH);
-- 
cgit v1.2.3-55-g6feb