[src/trunk]: src/crypto/external/bsd/openssl/dist fix some define and cleanli...

[spz <spz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9db62cbfb8cd
branches:  trunk
changeset: 766967:9db62cbfb8cd
user:      spz <spz%NetBSD.org@localhost>
date:      Tue Jul 05 10:29:22 2011 +0000

description:
fix some define and cleanliness issues relevant when test compiling
in dist (which we normally don't do)

diffstat:

 crypto/external/bsd/openssl/dist/Configure             |  5 +++--
 crypto/external/bsd/openssl/dist/crypto/des/des.h      |  1 +
 crypto/external/bsd/openssl/dist/crypto/des/rand_key.c |  1 +
 crypto/external/bsd/openssl/dist/crypto/opensslconf.h  |  7 ++++++-
 crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h      |  6 ++++++
 crypto/external/bsd/openssl/dist/crypto/sha/sha.h      |  4 +++-
 6 files changed, 20 insertions(+), 4 deletions(-)

diffs (117 lines):

diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure        Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure        Tue Jul 05 10:29:22 2011 +0000
@@ -123,11 +123,11 @@
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
-my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes-586.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o 
wp-mmx.o:cmll-x86.o";
+my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes-586.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o 
sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o";
 
 my $x86_elf_asm="$x86_asm:elf";
 
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o";
+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o aesni-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o 
cmll_misc.o";
 my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void";
 my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o 
sha512-sparcv9.o:::::::void";
 my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void";
@@ -1448,6 +1448,7 @@
 if ($aes_obj =~ /\.o$/)
        {
        $cflags.=" -DAES_ASM";
+       $aes_obj =~ s/\s*aesni\-x86\.o// if ($no_sse2);
        }
 else   {
        $aes_obj=$aes_enc;
diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/crypto/des/des.h
--- a/crypto/external/bsd/openssl/dist/crypto/des/des.h Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/des/des.h Tue Jul 05 10:29:22 2011 +0000
@@ -109,6 +109,7 @@
 #define DES_LONG uint32_t
 #define DES_KEY_SZ     8 /* (sizeof(DES_cblock)) */
 #define DES_SCHEDULE_SZ 128 /* (sizeof(DES_key_schedule)) */
+#define OPENSSL_DISABLE_OLD_DES_SUPPORT
 #endif
 
 #define DES_ENCRYPT    1
diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/crypto/des/rand_key.c
--- a/crypto/external/bsd/openssl/dist/crypto/des/rand_key.c    Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/des/rand_key.c    Tue Jul 05 10:29:22 2011 +0000
@@ -53,6 +53,7 @@
  *
  */
 
+#include <sys/types.h>
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/crypto/opensslconf.h
--- a/crypto/external/bsd/openssl/dist/crypto/opensslconf.h     Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/opensslconf.h     Tue Jul 05 10:29:22 2011 +0000
@@ -4,7 +4,9 @@
 /* OpenSSL was configured with the following options: */
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
-
+#ifndef OPENSSL_NO_EC_NISTP224_64_GCC_128
+# define OPENSSL_NO_EC_NISTP224_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
@@ -62,6 +64,9 @@
    who haven't had the time to do the appropriate changes in their
    applications.  */
 #ifdef OPENSSL_ALGORITHM_DEFINES
+# if defined(OPENSSL_NO_EC_NISTP224_64_GCC_128) && !defined(NO_EC_NISTP224_64_GCC_128)
+#  define NO_EC_NISTP224_64_GCC_128
+# endif
 # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
 #  define NO_CAMELLIA
 # endif
diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h
--- a/crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/rc2/rc2.h Tue Jul 05 10:29:22 2011 +0000
@@ -85,8 +85,14 @@
 void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
 void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key,
                     int enc);
+#ifndef __NetBSD__
+void RC2_encrypt(unsigned long *data,RC2_KEY *key);
+void RC2_decrypt(unsigned long *data,RC2_KEY *key);
+#else
+#include <sys/types.h>
 void RC2_encrypt(uint32_t *data,RC2_KEY *key);
 void RC2_decrypt(uint32_t *data,RC2_KEY *key);
+#endif
 void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
        RC2_KEY *ks, unsigned char *iv, int enc);
 void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
diff -r beebb3846209 -r 9db62cbfb8cd crypto/external/bsd/openssl/dist/crypto/sha/sha.h
--- a/crypto/external/bsd/openssl/dist/crypto/sha/sha.h Tue Jul 05 10:25:45 2011 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/sha/sha.h Tue Jul 05 10:29:22 2011 +0000
@@ -92,7 +92,7 @@
 #endif
 #else
 #include <sys/types.h>
-#define SHA_LONG u_int32_t
+#define SHA_LONG uint32_t
 #endif
 
 #define SHA_LBLOCK     16
@@ -142,6 +142,7 @@
        SHA_LONG h[8];
        SHA_LONG Nl,Nh;
        SHA_LONG data[SHA_LBLOCK];
+       unsigned int num,md_len;
        } SHA256_CTX;
 
 #ifndef OPENSSL_NO_SHA256
@@ -191,6 +192,7 @@
                SHA_LONG64      d[SHA_LBLOCK];
                unsigned char   p[SHA512_CBLOCK];
        } u;
+       unsigned int num,md_len;
        } SHA512_CTX;
 #endif