Drop redundant and outdated __CYGWIN32__ tests. (3577e014) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

Configure

+2 −5

Original line number	Diff line number	Diff line
		@@ -183,7 +183,6 @@ my %table=(
		"debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
		"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
		"debug-bodo", "gcc:$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
		"debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
		"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
		@@ -589,10 +588,8 @@ my %table=(
		"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",

		# Cygwin
		"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",
		"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
		"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
		"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
		"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",
		"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a",

		# NetWare from David Ward (dsward@novell.com)
		# requires either MetroWerks NLM development tools, or gcc / nlmconv

TABLE

+2 −104

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ $cc = gcc
		$cflags = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
		$unistd =
		$thread_cflag =
		$sys_id = CYGWIN32
		$sys_id = CYGWIN
		$lflags =
		$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
		$cpuid_obj = x86cpuid.o
		@@ -374,46 +374,12 @@ $ranlib =
		$arflags =
		$multilib =

		*** Cygwin-pre1.3
		$cc = gcc
		$cflags = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall
		$unistd =
		$thread_cflag = (unknown)
		$sys_id = CYGWIN32
		$lflags =
		$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
		$cpuid_obj =
		$bn_obj =
		$ec_obj =
		$des_obj =
		$aes_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$modes_obj =
		$engines_obj =
		$perlasm_scheme = void
		$dso_scheme = win32
		$shared_target=
		$shared_cflag =
		$shared_ldflag =
		$shared_extension =
		$ranlib =
		$arflags =
		$multilib =

		*** Cygwin-x86_64
		$cc = gcc
		$cflags = -DTERMIOS -DL_ENDIAN -O3 -Wall
		$unistd =
		$thread_cflag =
		$sys_id = CYGWIN32
		$sys_id = CYGWIN
		$lflags =
		$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL
		$cpuid_obj = x86_64cpuid.o
		@@ -1666,40 +1632,6 @@ $ranlib =
		$arflags =
		$multilib =

		*** debug-Cygwin
		$cc = gcc
		$cflags = -DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror
		$unistd =
		$thread_cflag =
		$sys_id = CYGWIN32
		$lflags =
		$bn_ops =
		$cpuid_obj =
		$bn_obj =
		$ec_obj =
		$des_obj =
		$aes_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$modes_obj =
		$engines_obj =
		$perlasm_scheme = void
		$dso_scheme = dlfcn
		$shared_target= cygwin-shared
		$shared_cflag = -D_WINDLL
		$shared_ldflag = -shared
		$shared_extension = .dll.a
		$ranlib =
		$arflags =
		$multilib =

		*** debug-VC-WIN32
		$cc = cl
		$cflags = -W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
		@@ -3060,40 +2992,6 @@ $ranlib =
		$arflags =
		$multilib =

		*** debug-ulf
		$cc = gcc
		$cflags = -DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations
		$unistd =
		$thread_cflag =
		$sys_id = CYGWIN32
		$lflags =
		$bn_ops =
		$cpuid_obj =
		$bn_obj =
		$ec_obj =
		$des_obj =
		$aes_obj =
		$bf_obj =
		$md5_obj =
		$sha1_obj =
		$cast_obj =
		$rc4_obj =
		$rmd160_obj =
		$rc5_obj =
		$wp_obj =
		$cmll_obj =
		$modes_obj =
		$engines_obj =
		$perlasm_scheme = void
		$dso_scheme = win32
		$shared_target= cygwin-shared
		$shared_cflag =
		$shared_ldflag =
		$shared_extension = .dll
		$ranlib =
		$arflags =
		$multilib =

		*** debug-vos-gcc
		$cc = gcc
		$cflags = -O0 -g -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG

crypto/des/read_pwd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@
		# include <sys/ioctl.h>
		#endif

		#if defined(OPENSSL_SYS_MSDOS) && !defined(__CYGWIN32__) && !defined(OPENSSL_SYS_WINCE)
		#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WINCE)
		# include <conio.h>
		# define fgets(a,b,c) noecho_fgets(a,b,c)
		#endif

e_os2.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ extern "C" {
		# undef OPENSSL_SYS_UNIX
		# define OPENSSL_SYS_WIN32_UWIN
		# else
		# if defined(__CYGWIN32__) \|\| defined(OPENSSL_SYSNAME_CYGWIN32)
		# if defined(__CYGWIN__) \|\| defined(OPENSSL_SYSNAME_CYGWIN)
		# undef OPENSSL_SYS_UNIX
		# define OPENSSL_SYS_WIN32_CYGWIN
		# else

Admin message