From cedaabbf47d82e83c060fc736f23c938412ed50c Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 11 Jul 2014 15:38:03 +0000
Subject: Prevent infinite loop during configuration file parsing; OpenSSL PR
 #2985 via OpenSSL trunk.

---
 src/lib/libcrypto/conf/conf_def.c         | 4 ++--
 src/lib/libssl/src/crypto/conf/conf_def.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index e5bff15f7a..c437aeb457 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_def.c,v 1.27 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: conf_def.c,v 1.28 2014/07/11 15:38:03 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -313,7 +313,7 @@ again:
 			end = eat_alpha_numeric(conf, ss);
 			p = eat_ws(conf, end);
 			if (*p != ']') {
-				if (*p != '\0') {
+				if (*p != '\0' && ss != p) {
 					ss = p;
 					goto again;
 				}
diff --git a/src/lib/libssl/src/crypto/conf/conf_def.c b/src/lib/libssl/src/crypto/conf/conf_def.c
index e5bff15f7a..c437aeb457 100644
--- a/src/lib/libssl/src/crypto/conf/conf_def.c
+++ b/src/lib/libssl/src/crypto/conf/conf_def.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_def.c,v 1.27 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: conf_def.c,v 1.28 2014/07/11 15:38:03 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -313,7 +313,7 @@ again:
 			end = eat_alpha_numeric(conf, ss);
 			p = eat_ws(conf, end);
 			if (*p != ']') {
-				if (*p != '\0') {
+				if (*p != '\0' && ss != p) {
 					ss = p;
 					goto again;
 				}
-- 
cgit v1.2.3-55-g6feb