generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Have EC_NISTP224_64_GCC_128 treated like any algorithm, and have disabled by

Browse Source 
default. If we don't do it this way, it screws up libeay.num.
(update from HEAD, original from levitte).
This commit is contained in:
Dr. Stephen Henson 2011-05-12 13:10:27 +00:00
parent 7f9ef5621a
commit e24b01cc6f
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

@ -667,6 +667,7 @@ my $perl;
# All of the following is disabled by default (RC5 was enabled before 0.9.8):
my %disabled = ( # "what" => "comment" [or special keyword "experimental"]
"ec-nistp224-64-gcc-218" => "default",
"gmp" => "default",
"jpake" => "experimental",
"md2" => "default",
@ -1001,7 +1002,7 @@ foreach (sort (keys %disabled))
else
{
my ($ALGO, $algo);
($ALGO = $algo = $_) =~ tr/[a-z]/[A-Z]/;
($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
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);
#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
*/

3
crypto/ec/ecp_nistp224.c
View File

@ -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>

2
util/libeay.num
View File

@ -4218,4 +4218,4 @@ 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::FUNCTION:EC
EC_GFp_nistp224_method 4592 EXIST::FUNCTION:EC,EC_NISTP224_64_GCC_128

2
util/mkdef.pl
View File

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