Prevent infinite loop during configuration file parsing; OpenSSL PR #2985

via OpenSSL trunk.

2 files changed, 4 insertions, 4 deletions

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;
                                 }