first round of static config. ok miod

diff --git a/lib/libcrypto/arch/alpha/opensslconf.h b/lib/libcrypto/arch/alpha/opensslconf.h
index b749b60..720892c 100644 (file)
--- a/lib/libcrypto/arch/alpha/opensslconf.h
+++ b/lib/libcrypto/arch/alpha/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/amd64/opensslconf.h b/lib/libcrypto/arch/amd64/opensslconf.h
index eba5113..40dced4 100644 (file)
--- a/lib/libcrypto/arch/amd64/opensslconf.h
+++ b/lib/libcrypto/arch/amd64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/arm/opensslconf.h b/lib/libcrypto/arch/arm/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/arm/opensslconf.h
+++ b/lib/libcrypto/arch/arm/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/hppa/opensslconf.h b/lib/libcrypto/arch/hppa/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/hppa/opensslconf.h
+++ b/lib/libcrypto/arch/hppa/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/hppa64/opensslconf.h b/lib/libcrypto/arch/hppa64/opensslconf.h
index 943ba27..d95a1b0 100644 (file)
--- a/lib/libcrypto/arch/hppa64/opensslconf.h
+++ b/lib/libcrypto/arch/hppa64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/i386/opensslconf.h b/lib/libcrypto/arch/i386/opensslconf.h
index d3d2175..9a8c448 100644 (file)
--- a/lib/libcrypto/arch/i386/opensslconf.h
+++ b/lib/libcrypto/arch/i386/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/m88k/opensslconf.h b/lib/libcrypto/arch/m88k/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/m88k/opensslconf.h
+++ b/lib/libcrypto/arch/m88k/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/mips64/opensslconf.h b/lib/libcrypto/arch/mips64/opensslconf.h
index ebeab5c..9f0273b 100644 (file)
--- a/lib/libcrypto/arch/mips64/opensslconf.h
+++ b/lib/libcrypto/arch/mips64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/powerpc/opensslconf.h b/lib/libcrypto/arch/powerpc/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/powerpc/opensslconf.h
+++ b/lib/libcrypto/arch/powerpc/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/sh/opensslconf.h b/lib/libcrypto/arch/sh/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/sh/opensslconf.h
+++ b/lib/libcrypto/arch/sh/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/sparc/opensslconf.h b/lib/libcrypto/arch/sparc/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/sparc/opensslconf.h
+++ b/lib/libcrypto/arch/sparc/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/sparc64/opensslconf.h b/lib/libcrypto/arch/sparc64/opensslconf.h
index ebeab5c..9f0273b 100644 (file)
--- a/lib/libcrypto/arch/sparc64/opensslconf.h
+++ b/lib/libcrypto/arch/sparc64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/arch/vax/opensslconf.h b/lib/libcrypto/arch/vax/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/arch/vax/opensslconf.h
+++ b/lib/libcrypto/arch/vax/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/alpha/opensslconf.h b/lib/libcrypto/crypto/arch/alpha/opensslconf.h
index b749b60..720892c 100644 (file)
--- a/lib/libcrypto/crypto/arch/alpha/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/alpha/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/amd64/opensslconf.h b/lib/libcrypto/crypto/arch/amd64/opensslconf.h
index eba5113..40dced4 100644 (file)
--- a/lib/libcrypto/crypto/arch/amd64/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/amd64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/arm/opensslconf.h b/lib/libcrypto/crypto/arch/arm/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/arm/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/arm/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/hppa/opensslconf.h b/lib/libcrypto/crypto/arch/hppa/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/hppa/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/hppa/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/hppa64/opensslconf.h b/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
index 943ba27..d95a1b0 100644 (file)
--- a/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/hppa64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/i386/opensslconf.h b/lib/libcrypto/crypto/arch/i386/opensslconf.h
index d3d2175..9a8c448 100644 (file)
--- a/lib/libcrypto/crypto/arch/i386/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/i386/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/m88k/opensslconf.h b/lib/libcrypto/crypto/arch/m88k/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/m88k/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/m88k/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/mips64/opensslconf.h b/lib/libcrypto/crypto/arch/mips64/opensslconf.h
index ebeab5c..9f0273b 100644 (file)
--- a/lib/libcrypto/crypto/arch/mips64/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/mips64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/powerpc/opensslconf.h b/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/powerpc/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/sh/opensslconf.h b/lib/libcrypto/crypto/arch/sh/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/sh/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/sh/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/sparc/opensslconf.h b/lib/libcrypto/crypto/arch/sparc/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/sparc/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/sparc/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/sparc64/opensslconf.h b/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
index ebeab5c..9f0273b 100644 (file)
--- a/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/sparc64/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those

diff --git a/lib/libcrypto/crypto/arch/vax/opensslconf.h b/lib/libcrypto/crypto/arch/vax/opensslconf.h
index 1cbc1e5..da51a83 100644 (file)
--- a/lib/libcrypto/crypto/arch/vax/opensslconf.h
+++ b/lib/libcrypto/crypto/arch/vax/opensslconf.h
@@ -1,64 +1,21 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* 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
-#ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_GOST
 # define OPENSSL_NO_GOST
-#endif
-#ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
 # define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
-#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
-#ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
 
-#ifndef OPENSSL_THREADS
 # define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
 
 /* The OPENSSL_NO_* macros are also defined as NO_* if the application
    asks for it.  This is a transient feature that is provided for those