openssl headers update

git-svn-id: http://svn.miranda-ng.org/main/trunk@16500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 20 insertions, 7 deletions

diff --git a/include/openssl/opensslconf.h b/include/openssl/opensslconf.h
index a468f7650b..b9e0f904b0 100644
--- a/include/openssl/opensslconf.h
+++ b/include/openssl/opensslconf.h
@@ -23,6 +23,9 @@ extern "C" {
 #ifndef OPENSSL_NO_KRB5

 # define OPENSSL_NO_KRB5

 #endif

+#ifndef OPENSSL_NO_LIBUNBOUND

+# define OPENSSL_NO_LIBUNBOUND

+#endif

 #ifndef OPENSSL_NO_MD2

 # define OPENSSL_NO_MD2

 #endif

@@ -35,6 +38,9 @@ extern "C" {
 #ifndef OPENSSL_NO_SCTP

 # define OPENSSL_NO_SCTP

 #endif

+#ifndef OPENSSL_NO_SSL_TRACE

+# define OPENSSL_NO_SSL_TRACE

+#endif

 #ifndef OPENSSL_NO_STORE

 # define OPENSSL_NO_STORE

 #endif

@@ -47,6 +53,9 @@ extern "C" {
 #ifndef OPENSSL_THREADS

 # define OPENSSL_THREADS

 #endif

+#ifndef OPENSSL_NO_ASM

+# define OPENSSL_NO_ASM

+#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

@@ -65,6 +74,9 @@ extern "C" {
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)

 #  define NO_KRB5

 # endif

+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)

+#  define NO_LIBUNBOUND

+# endif

 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)

 #  define NO_MD2

 # endif

@@ -77,6 +89,9 @@ extern "C" {
 # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)

 #  define NO_SCTP

 # endif

+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)

+#  define NO_SSL_TRACE

+# endif

 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)

 #  define NO_STORE

 # endif

@@ -85,8 +100,6 @@ extern "C" {
 # endif

 #endif

 

-#define OPENSSL_CPUID_OBJ

-

 /* crypto/opensslconf.h.in */

 

 /* Generate 80386 code? */

@@ -94,8 +107,8 @@ extern "C" {
 

 #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 "D:\\opensource\\openssl-dist-1.0.2f-vs2013\\openssl-x86-shared-release-vs2013/lib/engines"

+#define OPENSSLDIR "D:\\opensource\\openssl-dist-1.0.2f-vs2013\\openssl-x86-shared-release-vs2013/ssl"

 #endif

 #endif

 

@@ -191,7 +204,7 @@ extern "C" {
 #endif

 

 #if defined(DES_RISC1) && defined(DES_RISC2)

-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!

+#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!

 #endif

 

 /* Unroll the inner loop, this sometimes helps, sometimes hinders.

@@ -209,8 +222,8 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
    even newer MIPS CPU's, but at the moment one size fits all for

    optimization options.  Older Sparc's work better with only UNROLL, but

    there's no way to tell at compile time what it is you're running on */

-

-#if defined( sun )		/* Newer Sparc's */

+ 

+#if defined( __sun ) || defined ( sun )		/* Newer Sparc's */

 #  define DES_PTR

 #  define DES_RISC1

 #  define DES_UNROLL