[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r7438 - in trunk/Thirdparty/openssl: . crypto ms
From:       svn_fdo () osgeo ! org
Date:       2015-12-10 14:29:13
Message-ID: 20151210142913.117FF3901A2 () trac ! osgeo ! org
[Download RAW message or body]

Author: kwi
Date: 2015-12-10 06:29:12 -0800 (Thu, 10 Dec 2015)
New Revision: 7438

Modified:
   trunk/Thirdparty/openssl/Makefile
   trunk/Thirdparty/openssl/crypto/buildinf.h
   trunk/Thirdparty/openssl/crypto/opensslconf.h
   trunk/Thirdparty/openssl/ms/nt.mak
   trunk/Thirdparty/openssl/ms/ntdll.mak
Log:
RFC #70: VS 2015 - merge sandbox to trunk: thirdparty\openssl
sync files manually

Modified: trunk/Thirdparty/openssl/Makefile
===================================================================
--- trunk/Thirdparty/openssl/Makefile	2015-12-10 14:08:13 UTC (rev 7437)
+++ trunk/Thirdparty/openssl/Makefile	2015-12-10 14:29:12 UTC (rev 7438)
@@ -12,9 +12,9 @@
 SHLIB_MAJOR=1
 SHLIB_MINOR=0.0
 SHLIB_EXT=
-PLATFORM=VC-WIN32
+PLATFORM=VC-WIN64A
 OPTIONS= no-asm no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-libunbound no-md2 \
no-rc5 no-rfc3779 no-sctp no-shared no-ssl-trace no-ssl3 no-store no-unit-test \
                no-zlib no-zlib-dynamic
-CONFIGURE_ARGS=no-asm no-ssl3 VC-WIN32
+CONFIGURE_ARGS=no-asm no-ssl3 VC-WIN64A
 SHLIB_TARGET=
 
 # HERE indicates where this Makefile lives.  This can be used to indicate
@@ -60,7 +60,7 @@
 # PKCS1_CHECK - pkcs1 tests.
 
 CC= cl
-CFLAG= -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo \
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE \
+CFLAG= -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 \
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE  \
DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE \
-DOPENSSL_NO_LIBUNBOUND -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 \
-DOPENSSL_NO_SCTP -DOPENSSL_NO_SSL_TRACE -DOPENSSL_NO_SSL3 -DOPENSSL_NO_STORE \
-DOPENSSL_NO_UNIT_TEST  PEX_LIBS= 
 EX_LIBS= 
@@ -104,7 +104,7 @@
 CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
 MODES_ASM_OBJ= 
 ENGINES_ASM_OBJ= 
-PERLASM_SCHEME= win32n
+PERLASM_SCHEME= auto
 
 # KRB5 stuff
 KRB5_INCLUDES=

Modified: trunk/Thirdparty/openssl/crypto/buildinf.h
===================================================================
--- trunk/Thirdparty/openssl/crypto/buildinf.h	2015-12-10 14:08:13 UTC (rev 7437)
+++ trunk/Thirdparty/openssl/crypto/buildinf.h	2015-12-10 14:29:12 UTC (rev 7438)
@@ -3,11 +3,11 @@
    * for Unix builds, crypto/Makefile.ssl generates functional definitions;
    * Windows builds (and other mk1mf builds) compile cversion.c with
    * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
-  #error "Windows builds (PLATFORM=VC-WIN32) use mk1mf.pl-created Makefiles"
+  #error "Windows builds (PLATFORM=VC-WIN64A) use mk1mf.pl-created Makefiles"
 #endif
-#ifdef MK1MF_PLATFORM_VC_WIN32
+#ifdef MK1MF_PLATFORM_VC_WIN64A
   /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
-  #define CFLAGS "compiler: cl  /MD /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 \
-Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN \
-D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 \
-DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE \
                -DOPENSSL_NO_STATIC_ENGINE    "
-  #define PLATFORM "VC-WIN32"
-  #define DATE "Wed Dec  9 17:07:08 2015"
+  #define CFLAGS "compiler: cl  /MD /Ox -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -Gy \
-nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE \
-D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 \
-DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE \
-DOPENSSL_NO_STATIC_ENGINE    " +  #define PLATFORM "VC-WIN64A"
+  #define DATE "Wed Jul  1 06:30:35 2015"
 #endif

Modified: trunk/Thirdparty/openssl/crypto/opensslconf.h
===================================================================
--- trunk/Thirdparty/openssl/crypto/opensslconf.h	2015-12-10 14:08:13 UTC (rev 7437)
+++ trunk/Thirdparty/openssl/crypto/opensslconf.h	2015-12-10 14:29:12 UTC (rev 7438)
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 /* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_SYSNAME_WIN32
-# define OPENSSL_SYSNAME_WIN32
+#ifndef OPENSSL_SYSNAME_WIN64A
+# define OPENSSL_SYSNAME_WIN64A
 #endif
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
@@ -153,7 +153,7 @@
  * 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 long
 #endif
 #endif
 
@@ -161,27 +161,27 @@
 /* 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
-#define BN_LLONG
+#undef BN_LLONG
 
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
 #undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
+#define SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
 #endif
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
 #define CONFIG_HEADER_RC4_LOCL_H
 /* if this is defined data[i] is used instead of *data, this is a %20
  * speedup on x86 */
-#define RC4_INDEX
+#undef RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)

Modified: trunk/Thirdparty/openssl/ms/nt.mak
===================================================================
--- trunk/Thirdparty/openssl/ms/nt.mak	2015-12-10 14:08:13 UTC (rev 7437)
+++ trunk/Thirdparty/openssl/ms/nt.mak	2015-12-10 14:29:12 UTC (rev 7438)
@@ -16,9 +16,9 @@
 OPENSSLDIR=\usr\local\ssl
 
 # Set your compiler options
-PLATFORM=VC-WIN32
+PLATFORM=VC-WIN64A
 CC=cl
-CFLAG= /MT /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo \
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE \
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_KRB5 \
-DOPENSSL_NO_JPAKE -DOPENSSL_NO_DYNAMIC_ENGINE     +CFLAG= /MT /Ox -DOPENSSL_THREADS  \
-DDSO_WIN32 -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN \
-DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -DOPENSSL_NO_RC5 \
-DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE \
-DOPENSSL_NO_DYNAMIC_ENGINE      APP_CFLAG= /Zi /Fd$(TMP_D)/app
 LIB_CFLAG=/Zl /Zi /Fd$(TMP_D)/lib
 SHLIB_CFLAG=
@@ -50,7 +50,7 @@
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
 MLFLAGS=
-ASM=ml /nologo /Cp /coff /c /Cx /Zi
+ASM=ml64 /c /Cp /Cx /Zi
 
 # FIPS validated module and support file locations
 
@@ -1362,7 +1362,7 @@
 	$(CC) /Fo$(OBJ_D)\mem_dbg.obj  $(LIB_CFLAGS) -c $(SRC_D)\crypto\mem_dbg.c
 
 $(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
-	$(CC) /Fo$(OBJ_D)\cversion.obj  $(LIB_CFLAGS) -DMK1MF_BUILD \
-DMK1MF_PLATFORM_VC_WIN32 -c $(SRC_D)\crypto\cversion.c +	$(CC) \
/Fo$(OBJ_D)\cversion.obj  $(LIB_CFLAGS) -DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN64A -c \
$(SRC_D)\crypto\cversion.c  
 $(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
 	$(CC) /Fo$(OBJ_D)\ex_data.obj  $(LIB_CFLAGS) -c $(SRC_D)\crypto\ex_data.c

Modified: trunk/Thirdparty/openssl/ms/ntdll.mak
===================================================================
--- trunk/Thirdparty/openssl/ms/ntdll.mak	2015-12-10 14:08:13 UTC (rev 7437)
+++ trunk/Thirdparty/openssl/ms/ntdll.mak	2015-12-10 14:29:12 UTC (rev 7438)
@@ -16,9 +16,9 @@
 OPENSSLDIR=\usr\local\ssl
 
 # Set your compiler options
-PLATFORM=VC-WIN32
+PLATFORM=VC-WIN64A
 CC=cl
-CFLAG= /MD /Ox /O2 /Ob2 -DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -GF -Gy -nologo \
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE \
-DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 \
-DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE     +CFLAG= /MD /Ox \
-DOPENSSL_THREADS  -DDSO_WIN32 -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 \
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE \
-DOPENSSL_USE_APPLINK -I. -DOPENSSL_NO_RC5 -DOPENSSL_NO_MD2 -DOPENSSL_NO_SSL3 \
-DOPENSSL_NO_KRB5 -DOPENSSL_NO_JPAKE -DOPENSSL_NO_STATIC_ENGINE      APP_CFLAG= /Zi \
/Fd$(TMP_D)/app  LIB_CFLAG= /Zi /Fd$(TMP_D)/lib -D_WINDLL
 SHLIB_CFLAG=
@@ -50,7 +50,7 @@
 MKDIR=$(PERL) util/mkdir-p.pl
 MKLIB=lib /nologo
 MLFLAGS= /nologo /subsystem:console /opt:ref /debug /dll
-ASM=ml /nologo /Cp /coff /c /Cx /Zi
+ASM=ml64 /c /Cp /Cx /Zi
 
 # FIPS validated module and support file locations
 
@@ -455,6 +455,7 @@
 
 LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
 CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
+CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ)
 
 
 $(TMP_D):
@@ -1429,7 +1430,7 @@
 	$(CC) /Fo$(OBJ_D)\mem_dbg.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c \
$(SRC_D)\crypto\mem_dbg.c  
 $(OBJ_D)\cversion.obj: $(SRC_D)\crypto\cversion.c
-	$(CC) /Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO \
-DMK1MF_BUILD -DMK1MF_PLATFORM_VC_WIN32 -c $(SRC_D)\crypto\cversion.c +	$(CC) \
/Fo$(OBJ_D)\cversion.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -DMK1MF_BUILD \
-DMK1MF_PLATFORM_VC_WIN64A -c $(SRC_D)\crypto\cversion.c  
 $(OBJ_D)\ex_data.obj: $(SRC_D)\crypto\ex_data.c
 	$(CC) /Fo$(OBJ_D)\ex_data.obj  $(SHLIB_CFLAGS) -DOPENSSL_BUILD_SHLIBCRYPTO -c \
$(SRC_D)\crypto\ex_data.c

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic