summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2011-03-25 09:29:46 +0000
committerRichard Levitte <levitte@openssl.org>2011-03-25 09:29:46 +0000
commit30fafdebf34ba8823bc3e528e0a310fc0384b188 (patch)
tree7846e4e2203ba2e9c311d711e26442ee2d72f192 /util
parente775bbc46476b2808ce48eed598c874d8676340e (diff)
* Configure, crypto/ec/ec.h, crypto/ec/ecp_nistp224.c, util/mkdef.pl:
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. * util/libeay.num: make update
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 9046bcab46..a23555333d 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4218,7 +4218,7 @@ 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:!WIN32:FUNCTION:EC
+EC_GFp_nistp224_method 4592 EXIST:!WIN32:FUNCTION:EC,EC_NISTP224_64_GCC_128
FIPS_selftest 4593 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_set_error_callbacks 4594 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_corrupt_drbg 4595 EXIST:OPENSSL_FIPS:FUNCTION:
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 4a01fcb1c8..9d53046278 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", "EC2M",
"HMAC", "AES", "CAMELLIA", "SEED", "GOST",
+ # ECP_NISTP224
+ "EC_NISTP224_64_GCC_128",
# Envelope "algorithms"
"EVP", "X509", "ASN1_TYPEDEFS",
# Helper "algorithms"