[Python-checkins] r59141 - in external/openssl-0.9.8g: crypto/opensslconf_amd64.h crypto/opensslconf_x86.h ms/nt.mak ms/nt64.mak

[christian.heimes]

Author: christian.heimes
Date: Fri Nov 23 18:30:24 2007
New Revision: 59141

Modified:
   external/openssl-0.9.8g/crypto/opensslconf_amd64.h
   external/openssl-0.9.8g/crypto/opensslconf_x86.h
   external/openssl-0.9.8g/ms/nt.mak
   external/openssl-0.9.8g/ms/nt64.mak
Log:
Implemented request from Marc-Andre Lemburg
For license reasons Python must not ship with IDEA, RC5 and MDC2. The latter are disabled by default but IDEA is enabled by default.

Modified: external/openssl-0.9.8g/crypto/opensslconf_amd64.h
==============================================================================
--- external/openssl-0.9.8g/crypto/opensslconf_amd64.h	(original)
+++ external/openssl-0.9.8g/crypto/opensslconf_amd64.h	Fri Nov 23 18:30:24 2007
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_RC5
 # define OPENSSL_NO_RC5
 #endif
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif

Modified: external/openssl-0.9.8g/crypto/opensslconf_x86.h
==============================================================================
--- external/openssl-0.9.8g/crypto/opensslconf_x86.h	(original)
+++ external/openssl-0.9.8g/crypto/opensslconf_x86.h	Fri Nov 23 18:30:24 2007
@@ -22,6 +22,9 @@
 #ifndef OPENSSL_NO_RC5
 # define OPENSSL_NO_RC5
 #endif
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif

Modified: external/openssl-0.9.8g/ms/nt.mak
==============================================================================
--- external/openssl-0.9.8g/ms/nt.mak	(original)
+++ external/openssl-0.9.8g/ms/nt.mak	Fri Nov 23 18:30:24 2007
@@ -16,7 +16,7 @@
 # Set your compiler options
 PLATFORM=VC-WIN32
 CC=cl
-CFLAG= /MD /Ox /O2 /Ob2 /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DRMD160_ASM /Fdout32 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE    
+CFLAG= /MD /Ox /O2 /Ob2 /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DAES_ASM -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM -DRMD160_ASM /Fdout32 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_NO_IDEA 
 APP_CFLAG=
 LIB_CFLAG=
 SHLIB_CFLAG=

Modified: external/openssl-0.9.8g/ms/nt64.mak
==============================================================================
--- external/openssl-0.9.8g/ms/nt64.mak	(original)
+++ external/openssl-0.9.8g/ms/nt64.mak	Fri Nov 23 18:30:24 2007
@@ -16,7 +16,7 @@
 # Set your compiler options
 PLATFORM=VC-WIN64A
 CC=cl
-CFLAG= /MD /Ox /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE /Fdout32 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE    
+CFLAG= /MD /Ox /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE /Fdout32 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_TLSEXT -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DOPENSSL_NO_IDEA 
 APP_CFLAG=
 LIB_CFLAG=
 SHLIB_CFLAG=