diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 16:25:00 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 16:25:00 +0000 |
commit | fe41d9853c38b578d601e27a7508e69f70b91005 (patch) | |
tree | 88a3b607f20626b05d3cbb94682df89c5fcc1c6d | |
parent | d07692cd96f8a65453f9a6ad1ed6d980328b84ea (diff) |
Make no-ec work
-rwxr-xr-x | Configure | 5 | ||||
-rw-r--r-- | apps/ec.c | 6 | ||||
-rw-r--r-- | apps/ecparam.c | 6 | ||||
-rw-r--r-- | crypto/evp/pmeth_lib.c | 2 |
4 files changed, 19 insertions, 0 deletions
@@ -918,6 +918,11 @@ if (defined($disabled{"tls1"})) $disabled{"tlsext"} = "forced"; } +if (defined($disabled{"ec"})) + { + $disabled{"gost"} = "forced"; + } + if ($target eq "TABLE") { foreach $target (sort keys %table) { print_table_entry($target); @@ -400,4 +400,10 @@ end: apps_shutdown(); OPENSSL_EXIT(ret); } +#else /* !OPENSSL_NO_EC */ + +# if PEDANTIC +static void *dummy=&dummy; +# endif + #endif diff --git a/apps/ecparam.c b/apps/ecparam.c index 4e1fc837ed..e9aa0a184a 100644 --- a/apps/ecparam.c +++ b/apps/ecparam.c @@ -725,4 +725,10 @@ static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var, BIO_printf(out, "\n\t};\n\n"); return 1; } +#else /* !OPENSSL_NO_EC */ + +# if PEDANTIC +static void *dummy=&dummy; +# endif + #endif diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index 9a85f60737..51f0b6ad63 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -80,7 +80,9 @@ static const EVP_PKEY_METHOD *standard_methods[] = &rsa_pkey_meth, &dh_pkey_meth, &dsa_pkey_meth, +#ifndef OPENSSL_NO_EC &ec_pkey_meth, +#endif &hmac_pkey_meth, }; |