diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-10 19:09:27 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-11 09:29:37 -0400 |
| commit | 10bf4fc2c3da332a54247da1f3c0dcb44944f7ff (patch) | |
| tree | c2f597e901f98829266ec4045492195cefdd958c /util | |
| parent | ac5a110621ca48f0bebd5b4d76d081de403da29e (diff) | |
| download | openssl-10bf4fc2c3da332a54247da1f3c0dcb44944f7ff.tar.gz | |
Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC
Suggested by John Foley <foleyj@cisco.com>.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 809e9b3d14..d3379d2a16 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -142,8 +142,6 @@ and [options] can be one of no-krb5 - No KRB5 no-srp - No SRP no-ec - No EC - no-ecdsa - No ECDSA - no-ecdh - No ECDH no-engine - No engine no-hw - No hw nasm - Use NASM for x86 asm @@ -298,8 +296,6 @@ $cflags.=" -DOPENSSL_NO_CMS" if $no_cms; $cflags.=" -DOPENSSL_NO_ERR" if $no_err; $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; $cflags.=" -DOPENSSL_NO_EC" if $no_ec; -$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa; -$cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh; $cflags.=" -DOPENSSL_NO_GOST" if $no_gost; $cflags.=" -DOPENSSL_NO_ENGINE" if $no_engine; $cflags.=" -DOPENSSL_NO_HW" if $no_hw; @@ -1427,8 +1423,6 @@ sub read_options "no-sock" => \$no_sock, "no-krb5" => \$no_krb5, "no-ec" => \$no_ec, - "no-ecdsa" => \$no_ecdsa, - "no-ecdh" => \$no_ecdh, "no-gost" => \$no_gost, "no-engine" => \$no_engine, "no-hw" => \$no_hw, |