|
@@ -1,193 +0,0 @@
|
|
|
---- openssl-1.0.1i.orig/crypto/opensslconf.h 2014-08-06 23:18:45.000000000 +0200
|
|
|
-+++ openssl-1.0.1i/crypto/opensslconf.h 2014-08-07 10:03:55.000000000 +0200
|
|
|
-@@ -5,12 +5,27 @@
|
|
|
- #ifndef OPENSSL_DOING_MAKEDEPEND
|
|
|
-
|
|
|
-
|
|
|
-+#ifndef OPENSSL_NO_AES192
|
|
|
-+# define OPENSSL_NO_AES192
|
|
|
-+#endif
|
|
|
-+#ifndef OPENSSL_NO_CAMELLIA
|
|
|
-+# define OPENSSL_NO_CAMELLIA
|
|
|
-+#endif
|
|
|
-+#ifndef OPENSSL_NO_CAST
|
|
|
-+# define OPENSSL_NO_CAST
|
|
|
-+#endif
|
|
|
- #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
|
|
|
- # define OPENSSL_NO_EC_NISTP_64_GCC_128
|
|
|
- #endif
|
|
|
-+#ifndef OPENSSL_NO_ENGINES
|
|
|
-+# define OPENSSL_NO_ENGINES
|
|
|
-+#endif
|
|
|
- #ifndef OPENSSL_NO_GMP
|
|
|
- # define OPENSSL_NO_GMP
|
|
|
- #endif
|
|
|
-+#ifndef OPENSSL_NO_IDEA
|
|
|
-+# define OPENSSL_NO_IDEA
|
|
|
-+#endif
|
|
|
- #ifndef OPENSSL_NO_JPAKE
|
|
|
- # define OPENSSL_NO_JPAKE
|
|
|
- #endif
|
|
|
-@@ -20,15 +35,27 @@
|
|
|
- #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_RIPEMD
|
|
|
-+# define OPENSSL_NO_RIPEMD
|
|
|
-+#endif
|
|
|
- #ifndef OPENSSL_NO_SCTP
|
|
|
- # define OPENSSL_NO_SCTP
|
|
|
- #endif
|
|
|
-+#ifndef OPENSSL_NO_SHA0
|
|
|
-+# define OPENSSL_NO_SHA0
|
|
|
-+#endif
|
|
|
-+#ifndef OPENSSL_NO_SMIME
|
|
|
-+# define OPENSSL_NO_SMIME
|
|
|
-+#endif
|
|
|
- #ifndef OPENSSL_NO_STORE
|
|
|
- # define OPENSSL_NO_STORE
|
|
|
- #endif
|
|
|
-@@ -38,8 +65,14 @@
|
|
|
-
|
|
|
- #endif /* OPENSSL_DOING_MAKEDEPEND */
|
|
|
-
|
|
|
--#ifndef OPENSSL_NO_DYNAMIC_ENGINE
|
|
|
--# define OPENSSL_NO_DYNAMIC_ENGINE
|
|
|
-+#ifndef OPENSSL_THREADS
|
|
|
-+# define OPENSSL_THREADS
|
|
|
-+#endif
|
|
|
-+#ifndef OPENSSL_NO_ERR
|
|
|
-+# define OPENSSL_NO_ERR
|
|
|
-+#endif
|
|
|
-+#ifndef OPENSSL_NO_STATIC_ENGINE
|
|
|
-+# define OPENSSL_NO_STATIC_ENGINE
|
|
|
- #endif
|
|
|
-
|
|
|
- /* The OPENSSL_NO_* macros are also defined as NO_* if the application
|
|
|
-@@ -47,12 +80,27 @@
|
|
|
- who haven't had the time to do the appropriate changes in their
|
|
|
- applications. */
|
|
|
- #ifdef OPENSSL_ALGORITHM_DEFINES
|
|
|
-+# if defined(OPENSSL_NO_AES192) && !defined(NO_AES192)
|
|
|
-+# define NO_AES192
|
|
|
-+# endif
|
|
|
-+# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
|
|
|
-+# define NO_CAMELLIA
|
|
|
-+# endif
|
|
|
-+# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST)
|
|
|
-+# define NO_CAST
|
|
|
-+# 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_ENGINES) && !defined(NO_ENGINES)
|
|
|
-+# define NO_ENGINES
|
|
|
-+# endif
|
|
|
- # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
|
|
|
- # define NO_GMP
|
|
|
- # endif
|
|
|
-+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
|
|
|
-+# define NO_IDEA
|
|
|
-+# endif
|
|
|
- # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
|
|
|
- # define NO_JPAKE
|
|
|
- # endif
|
|
|
-@@ -62,15 +110,27 @@
|
|
|
- # 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_RIPEMD) && !defined(NO_RIPEMD)
|
|
|
-+# define NO_RIPEMD
|
|
|
-+# endif
|
|
|
- # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
|
|
|
- # define NO_SCTP
|
|
|
- # endif
|
|
|
-+# if defined(OPENSSL_NO_SHA0) && !defined(NO_SHA0)
|
|
|
-+# define NO_SHA0
|
|
|
-+# endif
|
|
|
-+# if defined(OPENSSL_NO_SMIME) && !defined(NO_SMIME)
|
|
|
-+# define NO_SMIME
|
|
|
-+# endif
|
|
|
- # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
|
|
|
- # define NO_STORE
|
|
|
- # endif
|
|
|
-@@ -86,8 +146,8 @@
|
|
|
-
|
|
|
- #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
|
|
- #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
|
|
--#define ENGINESDIR "/usr/local/ssl/lib/engines"
|
|
|
--#define OPENSSLDIR "/usr/local/ssl"
|
|
|
-+#define ENGINESDIR "/usr/lib/engines"
|
|
|
-+#define OPENSSLDIR "/etc/ssl"
|
|
|
- #endif
|
|
|
- #endif
|
|
|
-
|
|
|
-@@ -118,14 +178,14 @@
|
|
|
- * - Intel P6 because partial register stalls are very expensive;
|
|
|
- * - elder Alpha because it lacks byte load/store instructions;
|
|
|
- */
|
|
|
--#define RC4_INT unsigned int
|
|
|
-+#define RC4_INT unsigned char
|
|
|
- #endif
|
|
|
- #if !defined(RC4_CHUNK)
|
|
|
- /*
|
|
|
- * This enables code handling data aligned at natural CPU word
|
|
|
- * boundary. See crypto/rc4/rc4_enc.c for further details.
|
|
|
- */
|
|
|
--#undef RC4_CHUNK
|
|
|
-+#define RC4_CHUNK unsigned long
|
|
|
- #endif
|
|
|
- #endif
|
|
|
-
|
|
|
-@@ -133,13 +193,13 @@
|
|
|
- /* 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 long
|
|
|
-+#define DES_LONG unsigned int
|
|
|
- #endif
|
|
|
- #endif
|
|
|
-
|
|
|
- #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
|
|
|
- #define CONFIG_HEADER_BN_H
|
|
|
--#undef BN_LLONG
|
|
|
-+#define BN_LLONG
|
|
|
-
|
|
|
- /* Should we define BN_DIV2W here? */
|
|
|
-
|
|
|
-@@ -158,7 +218,7 @@
|
|
|
-
|
|
|
- #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
|
|
|
- #define CONFIG_HEADER_BF_LOCL_H
|
|
|
--#undef BF_PTR
|
|
|
-+#define BF_PTR
|
|
|
- #endif /* HEADER_BF_LOCL_H */
|
|
|
-
|
|
|
- #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
|
|
|
-@@ -188,7 +248,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND D
|
|
|
- /* Unroll the inner loop, this sometimes helps, sometimes hinders.
|
|
|
- * Very mucy CPU dependant */
|
|
|
- #ifndef DES_UNROLL
|
|
|
--#undef DES_UNROLL
|
|
|
-+#define DES_UNROLL
|
|
|
- #endif
|
|
|
-
|
|
|
- /* These default values were supplied by
|