diff options
| author | Richard Levitte <levitte@openssl.org> | 2011-03-25 10:29:46 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2011-03-25 10:29:46 +0100 |
| commit | 30fafdebf34ba8823bc3e528e0a310fc0384b188 (patch) | |
| tree | 7846e4e2203ba2e9c311d711e26442ee2d72f192 /crypto | |
| parent | * fips/cmac/fips_cmac_selftest.c: Because the examples in SP_800-38B (diff) | |
| download | openssl-30fafdebf34ba8823bc3e528e0a310fc0384b188.tar.xz openssl-30fafdebf34ba8823bc3e528e0a310fc0384b188.zip | |
* 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 'crypto')
| -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 3ea033356e..69d78642cc 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> |