* 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

diff --git a/Configure b/Configure
index ad3e51f01ca920ebe3ad5b3c8a6087471f91349e..16fcadb6006aa7ff5e74e83d394a85820adfb03a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -696,6 +696,7 @@ my $fips=0;
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
 
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
 # 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",
                 "gmp"            => "default",
                  "jpake"          => "experimental",
                  "md2"            => "default",


@@ -1074,7 +1075,7 @@ foreach (sort (keys %disabled))
        else
                {
                my ($ALGO, $algo);
        else
                {
                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-/)
                        {

diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 3ea033356e371e61ed27dd1e4b6f528679599348..69d78642ccbc8b657a8a82d5f65efdc93bb25a04 100644 (file)
--- 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);
 
  */
 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
  */
 /** 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 e0ca2dca17118609c43c4e291d955f145c397903..90c3589bdfc4d4d45c0b167d3447627545e26767 100644 (file)
--- 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
  */
  * 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>
 #include <stdint.h>
 #include <string.h>
 #include <openssl/err.h>

diff --git a/util/libeay.num b/util/libeay.num
index 9046bcab46f8c59b0a8cc4f7fa784b519741b0a2..a23555333de08a14810a3ce78ce0e1d0d4661d40 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -4218,7 +4218,7 @@ 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
 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:!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_set_error_callbacks                4594   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_corrupt_drbg                       4595   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_selftest                           4593   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_set_error_callbacks                4594   EXIST:OPENSSL_FIPS:FUNCTION:
 FIPS_corrupt_drbg                       4595   EXIST:OPENSSL_FIPS:FUNCTION:

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 4a01fcb1c81b91f773a2eb5a33742157c0a77d0b..9d53046278d127e6e39fa659f91e878d10b97aea 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -86,6 +86,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                         "SHA256", "SHA512", "RIPEMD",
                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
                         "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
                         "SHA256", "SHA512", "RIPEMD",
                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
                         "HMAC", "AES", "CAMELLIA", "SEED", "GOST",

+                        # ECP_NISTP224
+                        "EC_NISTP224_64_GCC_128",

                         # Envelope "algorithms"
                         "EVP", "X509", "ASN1_TYPEDEFS",
                         # Helper "algorithms"
                         # Envelope "algorithms"
                         "EVP", "X509", "ASN1_TYPEDEFS",
                         # Helper "algorithms"