wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Configure, crypto/ec/ec.h, crypto/ec/ecp_nistp224.c, util/mkdef.pl:

Browse source 
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
This commit is contained in:
Richard Levitte 2011-03-25 09:29:46 +00:00
parent e775bbc464
commit 30fafdebf3
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Configure
View file

@ -696,6 +696,7 @@ my $fips=0;
# All of the following is disabled by default (RC5 was enabled before 0.9.8): # All of the following is disabled by default (RC5 was enabled before 0.9.8):
my %disabled = ( # "what" => "comment" [or special keyword "experimental"] my %disabled = ( # "what" => "comment" [or special keyword "experimental"]
"ec-nistp224-64-gcc-218" => "default",
"gmp" => "default", "gmp" => "default",
"jpake" => "experimental", "jpake" => "experimental",
"md2" => "default", "md2" => "default",
@ -1074,7 +1075,7 @@ foreach (sort (keys %disabled))
else else
{ {
my ($ALGO, $algo); my ($ALGO, $algo);
($ALGO = $algo = $_) =~ tr/[a-z]/[A-Z]/; ($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/) if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/)
{ {

2
crypto/ec/ec.h
View file

@ -151,7 +151,7 @@ const EC_METHOD *EC_GFp_mont_method(void);
*/ */
const EC_METHOD *EC_GFp_nist_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 /** Returns 64-bit optimized methods for nistp224
* \return EC_METHOD object * \return EC_METHOD object
*/ */

3
crypto/ec/ecp_nistp224.c
View file

@ -62,7 +62,8 @@
* Inspired by Daniel J. Bernstein's public domain nistp224 implementation * Inspired by Daniel J. Bernstein's public domain nistp224 implementation
* and Adam Langley's public domain 64-bit C implementation of curve25519 * 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 <stdint.h>
#include <string.h> #include <string.h>
#include <openssl/err.h> #include <openssl/err.h>

2
util/libeay.num
View file

@ -4218,7 +4218,7 @@ EVP_PKEY_meth_copy 4588 EXIST::FUNCTION:
ERR_add_error_vdata 4589 EXIST::FUNCTION: ERR_add_error_vdata 4589 EXIST::FUNCTION:
EVP_aes_128_ctr 4590 EXIST::FUNCTION:AES EVP_aes_128_ctr 4590 EXIST::FUNCTION:AES
EVP_aes_256_ctr 4591 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_selftest 4593 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_set_error_callbacks 4594 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_set_error_callbacks 4594 EXIST:OPENSSL_FIPS:FUNCTION:
FIPS_corrupt_drbg 4595 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_corrupt_drbg 4595 EXIST:OPENSSL_FIPS:FUNCTION:

2
util/mkdef.pl
View file

@ -86,6 +86,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"SHA256", "SHA512", "RIPEMD", "SHA256", "SHA512", "RIPEMD",
"MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M", "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
"HMAC", "AES", "CAMELLIA", "SEED", "GOST", "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
# ECP_NISTP224
"EC_NISTP224_64_GCC_128",
# Envelope "algorithms" # Envelope "algorithms"
"EVP", "X509", "ASN1_TYPEDEFS", "EVP", "X509", "ASN1_TYPEDEFS",
# Helper "algorithms" # Helper "algorithms"