From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 6 Dec 2012 21:53:05 +0000 (+0000)
Subject: fix handling of "automatic" in file mode
X-Git-Tag: master-post-reformat~1539
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f1f5c70a04d3fadbafe2e160bdf7efb84937a681;p=oweals%2Fopenssl.git

fix handling of "automatic" in file mode
---

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 23754739bb..940d5a88dd 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -272,7 +272,12 @@ static int cmd_ecdhparam(SSL_CONF_CTX *cctx, const char *value)
 			onoff = 0;
 			value++;
 			}
-		if (strcasecmp(value, "automatic"))
+		if (!strcasecmp(value, "automatic"))
+			{
+			if (onoff != -1)
+				onoff = 1;
+			}
+		else if (onoff != -1)
 			return 0;
 		}
 	else if (cctx->flags & SSL_CONF_FLAG_CMDLINE)