Make no-ec work

diff --git a/Configure b/Configure
index b2a5d33b0034b0554bff9350030b10006c2271fd..c3ebcda3f4b5c6b341b1cd1308dc1a9d9a5f5a5d 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -918,6 +918,11 @@ if (defined($disabled{"tls1"}))
        $disabled{"tlsext"} = "forced";
        }
 
        $disabled{"tlsext"} = "forced";
        }
 

+if (defined($disabled{"ec"}))
+       {
+       $disabled{"gost"} = "forced";
+       }
+

 if ($target eq "TABLE") {
        foreach $target (sort keys %table) {
                print_table_entry($target);
 if ($target eq "TABLE") {
        foreach $target (sort keys %table) {
                print_table_entry($target);

diff --git a/apps/ec.c b/apps/ec.c
index 771e15f3577c176031a24f5f5c6581802071082e..31194b48df7dd99a02bea9dc7275659b6209af82 100644 (file)
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -400,4 +400,10 @@ end:
        apps_shutdown();
        OPENSSL_EXIT(ret);
 }
        apps_shutdown();
        OPENSSL_EXIT(ret);
 }

+#else /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+

 #endif
 #endif

diff --git a/apps/ecparam.c b/apps/ecparam.c
index 4e1fc837ed6aca2366287bf9e25bd616d7512130..e9aa0a184ae7a38868d1bd3753c5cbdc6fe06cc7 100644 (file)
--- 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;
        }
        BIO_printf(out, "\n\t};\n\n");
        return 1;
        }

+#else /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+

 #endif
 #endif

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9a85f60737258021e5a06da9fe76df65b46345d9..51f0b6ad63c9bad30ad8f455118fbf184a978d06 100644 (file)
--- 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,
        &rsa_pkey_meth,
        &dh_pkey_meth,
        &dsa_pkey_meth,

+#ifndef OPENSSL_NO_EC

        &ec_pkey_meth,
        &ec_pkey_meth,

+#endif

        &hmac_pkey_meth,
        };
 
        &hmac_pkey_meth,
        };