X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fssl_conf.c;h=fc6caa9b6ca628875fb6368d052f13937e01045f;hp=90d77fa0344049f5908583187ff9110955f6071a;hb=44314cf64d1e51c7493799e77b14ae4e94a4c8cf;hpb=abf840e4f71c3a8795428c213fd37ece2a910443

diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index 90d77fa034..fc6caa9b6c 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -62,6 +62,9 @@
 #include "ssl_locl.h"
 #include <openssl/conf.h>
 #include <openssl/objects.h>
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
 
 /* structure holding name tables. This is used for pemitted elements in
  * lists such as TLSv1 and single command line switches such as no_tls1
@@ -200,9 +203,9 @@ static int ctrl_str_option(SSL_CONF_CTX *cctx, const char *cmd)
 		SSL_FLAG_TBL("no_tls1", SSL_OP_NO_TLSv1),
 		SSL_FLAG_TBL("no_tls1_1", SSL_OP_NO_TLSv1_1),
 		SSL_FLAG_TBL("no_tls1_2", SSL_OP_NO_TLSv1_2),
-		SSL_FLAG_TBL("no_tls1_2", SSL_OP_NO_TLSv1_2),
 		SSL_FLAG_TBL("bugs", SSL_OP_ALL),
 		SSL_FLAG_TBL("no_comp", SSL_OP_NO_COMPRESSION),
+		SSL_FLAG_TBL_SRV("ecdh_single", SSL_OP_SINGLE_ECDH_USE),
 #ifndef OPENSSL_NO_TLSEXT
 		SSL_FLAG_TBL("no_ticket", SSL_OP_NO_TICKET),
 #endif
@@ -388,7 +391,39 @@ static int cmd_PrivateKey(SSL_CONF_CTX *cctx, const char *value)
 		rv = SSL_use_PrivateKey_file(cctx->ssl, value, SSL_FILETYPE_PEM);
 	return rv > 0;
 	}
-
+#ifndef OPENSSL_NO_DH
+static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)
+	{
+	int rv = 0;
+	DH *dh = NULL;
+	BIO *in = NULL;
+	if (!(cctx->flags & SSL_CONF_FLAG_CERTIFICATE))
+		return -2;
+	if (cctx->ctx || cctx->ssl)
+		{
+		in = BIO_new(BIO_s_file_internal());
+		if (!in)
+			goto end;
+		if (BIO_read_filename(in, value) <= 0)
+			goto end;
+		dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);
+		if (!dh)
+			goto end;
+		}
+	else
+		return 1;
+	if (cctx->ctx)
+		rv = SSL_CTX_set_tmp_dh(cctx->ctx, dh);
+	if (cctx->ssl)
+		rv = SSL_set_tmp_dh(cctx->ssl, dh);
+	end:
+	if (dh)
+		DH_free(dh);
+	if (in)
+		BIO_free(in);
+	return rv > 0;
+	}
+#endif
 typedef struct
 	{
 	int (*cmd)(SSL_CONF_CTX *cctx, const char *value);
@@ -416,7 +451,10 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {
 	SSL_CONF_CMD_STRING(Protocol, NULL),
 	SSL_CONF_CMD_STRING(Options, NULL),
 	SSL_CONF_CMD(Certificate, "cert", SSL_CONF_TYPE_FILE),
-	SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE)
+	SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE),
+#ifndef OPENSSL_NO_DH
+	SSL_CONF_CMD(DHParameters, "dhparam", SSL_CONF_TYPE_FILE)
+#endif
 };
 
 static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)