Commit 32ef82a2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove dhparam from SSL_CONF list. 



Avoid duplicate assertion by removing dhparam from SSL_CONF parameter list:
dhparam is handled manually by s_server.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4408)
parent ae386c98

apps/apps.h

+1 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        OPT_S_SERVERPREF, OPT_S_LEGACYRENEG, OPT_S_LEGACYCONN, \

        OPT_S_ONRESUMP, OPT_S_NOLEGACYCONN, OPT_S_STRICT, OPT_S_SIGALGS, \

        OPT_S_CLIENTSIGALGS, OPT_S_CURVES, OPT_S_NAMEDCURVE, OPT_S_CIPHER, \

        OPT_S_DHPARAM, OPT_S_DEBUGBROKE, OPT_S_COMP, \

        OPT_S_DEBUGBROKE, OPT_S_COMP, \

        OPT_S__LAST



# define OPT_S_OPTIONS \
@@ -248,8 +248,6 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        {"named_curve", OPT_S_NAMEDCURVE, 's', \

            "Elliptic curve used for ECDHE (server-side only)" }, \

        {"cipher", OPT_S_CIPHER, 's', "Specify cipher list to be used"}, \

        {"dhparam", OPT_S_DHPARAM, '<', \

            "DH parameter file to use, in cert file if not specified"}, \

        {"debug_broken_protocol", OPT_S_DEBUGBROKE, '-', \

            "Perform all sorts of protocol violations for testing purposes"}
@@ -274,7 +272,6 @@ int set_cert_times(X509 *x, const char *startdate, const char *enddate, 
        case OPT_S_CURVES: \

        case OPT_S_NAMEDCURVE: \

        case OPT_S_CIPHER: \

        case OPT_S_DHPARAM: \

        case OPT_S_DEBUGBROKE



#define IS_NO_PROT_FLAG(o) \