diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-12 13:10:27 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-12 13:10:27 +0000 |
| commit | e24b01cc6f090ba9c6ac9c9d1a094c2e4a42114b (patch) | |
| tree | a30805a90b48092b5ae4717e85aaf252e88a5efb /crypto/ec | |
| parent | 7f9ef5621a77afd0d7923649af085de09af9f786 (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 'crypto/ec')
| -rw-r--r-- | crypto/ec/ec.h | 2 | ||||
| -rw-r--r-- | crypto/ec/ecp_nistp224.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 6409eee1b3..c95285e597 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -151,7 +151,7 @@ const EC_METHOD *EC_GFp_mont_method(void); */ const EC_METHOD *EC_GFp_nist_method(void); -#ifdef EC_NISTP224_64_GCC_128 +#ifndef OPENSSL_NO_EC_NISTP224_64_GCC_128 /** Returns 64-bit optimized methods for nistp224 * \return EC_METHOD object */ diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c index e0ca2dca17..90c3589bdf 100644 --- a/crypto/ec/ecp_nistp224.c +++ b/crypto/ec/ecp_nistp224.c @@ -62,7 +62,8 @@ * Inspired by Daniel J. Bernstein's public domain nistp224 implementation * and Adam Langley's public domain 64-bit C implementation of curve25519 */ -#ifdef EC_NISTP224_64_GCC_128 +#include <openssl/opensslconf.h> +#ifndef OPENSSL_NO_EC_NISTP224_64_GCC_128 #include <stdint.h> #include <string.h> #include <openssl/err.h> |