From 3ad9227df9edaac3e94f314891deeb4d52d16b4a Mon Sep 17 00:00:00 2001 From: djm <> Date: Sat, 13 Oct 2012 21:31:56 +0000 Subject: Makefile and header changes for OpenSSL-1.0.1c major cranks --- src/lib/libssl/crypto/arch/alpha/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/amd64/opensslconf.h | 29 ++++++++++++++++-------- src/lib/libssl/crypto/arch/arm/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/hppa/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/hppa64/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/i386/opensslconf.h | 28 +++++++++++++++++------ src/lib/libssl/crypto/arch/m68k/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/m88k/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/mips64/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/powerpc/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/sh/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/sparc/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/sparc64/opensslconf.h | 26 ++++++++++++++++----- src/lib/libssl/crypto/arch/vax/bn_asm_vax.S | 2 +- src/lib/libssl/crypto/arch/vax/opensslconf.h | 26 ++++++++++++++++----- 15 files changed, 282 insertions(+), 89 deletions(-) (limited to 'src/lib/libssl/crypto/arch') diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h index 3dfec8c8b7..30f6acfbb1 100644 --- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h +++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h index 6a6029013f..f969fd75e4 100644 --- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif @@ -163,9 +177,6 @@ /* Should we define BN_DIV2W here? */ /* Only one for the following should be defined */ -/* The prime number generation stuff may not work when - * EIGHT_BIT but I don't care since I've only used this mode - * for debuging the bignum libraries */ #define SIXTY_FOUR_BIT_LONG #undef SIXTY_FOUR_BIT #undef THIRTY_TWO_BIT diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/arm/opensslconf.h +++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h +++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h index 7199268572..f8f478ff52 100644 --- a/src/lib/libssl/crypto/arch/hppa64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/hppa64/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h index b9e4249fed..f7b5a6dc38 100644 --- a/src/lib/libssl/crypto/arch/i386/opensslconf.h +++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif @@ -152,7 +166,7 @@ /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a * %20 speed up (longs are 8 bytes, int's are 4). */ #ifndef DES_LONG -#define DES_LONG unsigned int +#define DES_LONG unsigned long #endif #endif diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h +++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h +++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h index e481da68bf..e55282fd63 100644 --- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h +++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/sh/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h index e481da68bf..e55282fd63 100644 --- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h +++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif diff --git a/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S b/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S index bd067a55d3..f1e46b2010 100644 --- a/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S +++ b/src/lib/libssl/crypto/arch/vax/bn_asm_vax.S @@ -1,4 +1,4 @@ -# $OpenBSD: bn_asm_vax.S,v 1.1 2003/11/18 12:39:05 markus Exp $ +# $OpenBSD: bn_asm_vax.S,v 1.2 2012/10/13 21:31:56 djm Exp $ # $NetBSD: bn_asm_vax.S,v 1.1 2003/11/03 10:22:28 ragge Exp $ #include diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h index 7c7015c9b7..fc5ea38470 100644 --- a/src/lib/libssl/crypto/arch/vax/opensslconf.h +++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h @@ -4,9 +4,13 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND + #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 +# define OPENSSL_NO_EC_NISTP_64_GCC_128 +#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif @@ -25,18 +29,21 @@ #ifndef OPENSSL_NO_MD2 # define OPENSSL_NO_MD2 #endif -#ifndef OPENSSL_NO_MDC2 -# define OPENSSL_NO_MDC2 -#endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 #endif #ifndef OPENSSL_NO_RFC3779 # define OPENSSL_NO_RFC3779 #endif +#ifndef OPENSSL_NO_SCTP +# define OPENSSL_NO_SCTP +#endif #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_SRP +# define OPENSSL_NO_SRP +#endif #ifndef OPENSSL_NO_SSL2 # define OPENSSL_NO_SSL2 #endif @@ -45,6 +52,7 @@ #endif #endif /* OPENSSL_DOING_MAKEDEPEND */ + #ifndef OPENSSL_THREADS # define OPENSSL_THREADS #endif @@ -60,6 +68,9 @@ # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) # define NO_CAMELLIA # endif +# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) +# define NO_EC_NISTP_64_GCC_128 +# endif # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) # define NO_CMS # endif @@ -78,18 +89,21 @@ # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) # define NO_MD2 # endif -# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) -# define NO_MDC2 -# endif # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) # define NO_RC5 # endif # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) # define NO_RFC3779 # endif +# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) +# define NO_SCTP +# endif # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif +# if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) +# define NO_SRP +# endif # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) # define NO_SSL2 # endif -- cgit v1.2.3-55-g6feb