Make no-ec work
authorDr. Stephen Henson <steve@openssl.org>
Thu, 23 Apr 2009 16:25:00 +0000 (16:25 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 23 Apr 2009 16:25:00 +0000 (16:25 +0000)
Configure
apps/ec.c
apps/ecparam.c
crypto/evp/pmeth_lib.c

index b2a5d33..c3ebcda 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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);
index 771e15f..31194b4 100644 (file)
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -400,4 +400,10 @@ end:
        apps_shutdown();
        OPENSSL_EXIT(ret);
 }
+#else /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif
index 4e1fc83..e9aa0a1 100644 (file)
@@ -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
index 9a85f60..51f0b6a 100644 (file)
@@ -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,
        };