summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-05-12 13:10:27 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-05-12 13:10:27 +0000
commite24b01cc6f090ba9c6ac9c9d1a094c2e4a42114b (patch)
treea30805a90b48092b5ae4717e85aaf252e88a5efb /util
parent7f9ef5621a77afd0d7923649af085de09af9f786 (diff)
Have EC_NISTP224_64_GCC_128 treated like any algorithm, and have disabled by
default. If we don't do it this way, it screws up libeay.num. (update from HEAD, original from levitte).
Diffstat (limited to 'util')
-rwxr-xr-xutil/libeay.num2
-rwxr-xr-xutil/mkdef.pl2
2 files changed, 3 insertions, 1 deletions
diff --git a/util/libeay.num b/util/libeay.num
index 104b187280..c675b03308 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4218,4 +4218,4 @@ EVP_PKEY_meth_copy 4588 EXIST::FUNCTION:
ERR_add_error_vdata 4589 EXIST::FUNCTION:
EVP_aes_128_ctr 4590 EXIST::FUNCTION:AES
EVP_aes_256_ctr 4591 EXIST::FUNCTION:AES
-EC_GFp_nistp224_method 4592 EXIST::FUNCTION:EC
+EC_GFp_nistp224_method 4592 EXIST::FUNCTION:EC,EC_NISTP224_64_GCC_128
diff --git a/util/mkdef.pl b/util/mkdef.pl
index dcd622429f..6a107c1b3c 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -86,6 +86,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"SHA256", "SHA512", "RIPEMD",
"MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA",
"HMAC", "AES", "CAMELLIA", "SEED", "GOST",
+ # ECP_NISTP224
+ "EC_NISTP224_64_GCC_128",
# Envelope "algorithms"
"EVP", "X509", "ASN1_TYPEDEFS",
# Helper "algorithms"