From 30fafdebf34ba8823bc3e528e0a310fc0384b188 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 25 Mar 2011 09:29:46 +0000 Subject: * 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 --- crypto/ec/ec.h | 2 +- crypto/ec/ecp_nistp224.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'crypto') 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 +#ifndef OPENSSL_NO_EC_NISTP224_64_GCC_128 #include #include #include -- cgit v1.2.3