aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_conf.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-12-06 21:53:05 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-12-06 21:53:05 +0000
commitf1f5c70a04d3fadbafe2e160bdf7efb84937a681 (patch)
tree22b066de85ec41ba07752890c86418832eccb559 /ssl/ssl_conf.c
parent0090a686c0620e5f7d72aef2e74f4a0e01c53e3e (diff)
downloadopenssl-f1f5c70a04d3fadbafe2e160bdf7efb84937a681.tar.gz
fix handling of "automatic" in file mode
Diffstat (limited to 'ssl/ssl_conf.c')
-rw-r--r--ssl/ssl_conf.c7
1 files changed, 6 insertions, 1 deletions
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)