[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Fri Jan 23 16:59:53 UTC 2015
The branch master has been updated
via 68b00c237298b2e7e382686ffd583847d57bbc0b (commit)
from 9b05cbc33e7895ed033b1119e300782d9e0cf23c (commit)
- Log -----------------------------------------------------------------
commit 68b00c237298b2e7e382686ffd583847d57bbc0b
Author: Rich Salz <rsalz at openssl.org>
Date: Fri Jan 23 11:58:26 2015 -0500
ifdef cleanup part 3: OPENSSL_SYSNAME
Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
Remove MS_STATIC; it's a relic from platforms <32 bits.
Reviewed-by: Andy Polyakov <appro at openssl.org>
Reviewed-by: Tim Hudson <tjh at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 2 ++
Configure | 28 +++++++++++++-------------
TABLE | 24 +++++++++++------------
apps/apps.c | 4 ++--
apps/apps.h | 2 +-
apps/ca.c | 2 +-
apps/openssl.c | 4 ++--
apps/req.c | 2 +-
apps/s_server.c | 2 +-
apps/s_time.c | 2 +-
crypto/bio/bio_cb.c | 2 +-
crypto/des/asm/des_enc.m4 | 48 ++++++++++++++++++++++-----------------------
crypto/o_str.c | 2 +-
crypto/objects/obj_dat.c | 2 +-
crypto/pkcs7/bio_pk7.c | 2 +-
crypto/rand/md_rand.c | 4 ++--
crypto/rand/randfile.c | 2 +-
crypto/ui/ui_openssl.c | 2 +-
e_os.h | 10 ----------
e_os2.h | 47 ++++++++++++++++----------------------------
ssl/ssltest.c | 4 ++--
util/pl/BC-32.pl | 2 +-
util/pl/VC-32.pl | 2 +-
util/pl/netware.pl | 2 +-
24 files changed, 91 insertions(+), 112 deletions(-)
diff --git a/CHANGES b/CHANGES
index 2cecbf6..9ebbe61 100644
--- a/CHANGES
+++ b/CHANGES
@@ -44,6 +44,8 @@
OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
Use setbuf() and remove OPENSSL_NO_SETVBUF_IONBF
+ Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
+ Remove MS_STATIC; it's a relic from platforms <32 bits.
[Rich Salz]
*) Experimental support for a new, fast, unbiased prime candidate generator,
diff --git a/Configure b/Configure
index 8d9abe7..c726478 100755
--- a/Configure
+++ b/Configure
@@ -212,8 +212,8 @@ my %table=(
"cc", "cc:-O::(unknown)::::::",
####VOS Configurations
-"vos-gcc","gcc:-O3 -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
-"debug-vos-gcc","gcc:-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::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
+"vos-gcc","gcc:-O3 -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
+"debug-vos-gcc","gcc:-O0 -g -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG::(unknown):VOS:-Wl,-map:BN_LLONG:${no_asm}:::::.so:",
#### Solaris x86 with GNU C setups
# -DOPENSSL_NO_INLINE_ASM switches off inline assembler. We have to do it
@@ -519,15 +519,15 @@ my %table=(
# Visual C targets
#
# Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
-"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
-"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
-"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
-"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o ia64-mont.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
+"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o:::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
+"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
# x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
# 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
-"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
# Unified CE target
-"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+"debug-VC-WIN32","cl:-W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
# Borland C++ 4.5
@@ -558,13 +558,13 @@ my %table=(
# netware-clib => legacy CLib c-runtime support
"netware-clib", "mwccnlm::::::${x86_gcc_opts}::",
"netware-clib-bsdsock", "mwccnlm::::::${x86_gcc_opts}::",
-"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
-"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
+"netware-clib-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
+"netware-clib-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall:::::${x86_gcc_opts}::",
# netware-libc => LibC/NKS support
"netware-libc", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
"netware-libc-bsdsock", "mwccnlm::::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
-"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
+"netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
+"netware-libc-bsdsock-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
# DJGPP
"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:",
@@ -1482,8 +1482,8 @@ if ($target =~ /^BSD\-/)
if ($sys_id ne "")
{
- #$cflags="-DOPENSSL_SYSNAME_$sys_id $cflags";
- $openssl_sys_defines="#define OPENSSL_SYSNAME_$sys_id\n";
+ #$cflags="-DOPENSSL_SYS_$sys_id $cflags";
+ $openssl_sys_defines="#define OPENSSL_SYS_$sys_id\n";
}
if ($ranlib eq "")
diff --git a/TABLE b/TABLE
index d5b5261..886fa62 100644
--- a/TABLE
+++ b/TABLE
@@ -682,7 +682,7 @@ $multilib =
*** VC-WIN32
$cc = cl
-$cflags = -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
+$cflags = -W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN32
@@ -716,7 +716,7 @@ $multilib =
*** VC-WIN64A
$cc = cl
-$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64A
@@ -750,7 +750,7 @@ $multilib =
*** VC-WIN64I
$cc = cl
-$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64I
@@ -1430,7 +1430,7 @@ $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
+$cflags = -W3 -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN32
@@ -1464,7 +1464,7 @@ $multilib =
*** debug-VC-WIN64A
$cc = cl
-$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64A
@@ -1498,7 +1498,7 @@ $multilib =
*** debug-VC-WIN64I
$cc = cl
-$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
+$cflags = -W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE
$unistd =
$thread_cflag =
$sys_id = WIN64I
@@ -2858,7 +2858,7 @@ $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
+$cflags = -O0 -g -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG
$unistd =
$thread_cflag = (unknown)
$sys_id = VOS
@@ -4898,7 +4898,7 @@ $multilib =
*** netware-clib-bsdsock-gcc
$cc = i586-netware-gcc
-$cflags = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall
+$cflags = -nostdinc -I/ndk/nwsdk/include/nlm -DNETWARE_BSDSOCK -DNETDB_USE_INTERNET -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
$unistd =
$thread_cflag =
$sys_id =
@@ -4932,7 +4932,7 @@ $multilib =
*** netware-clib-gcc
$cc = i586-netware-gcc
-$cflags = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYSNAME_NETWARE -O2 -Wall
+$cflags = -nostdinc -I/ndk/nwsdk/include/nlm -I/ndk/ws295sdk/include -DL_ENDIAN -DNETWARE_CLIB -DOPENSSL_SYS_NETWARE -O2 -Wall
$unistd =
$thread_cflag =
$sys_id =
@@ -5034,7 +5034,7 @@ $multilib =
*** netware-libc-bsdsock-gcc
$cc = i586-netware-gcc
-$cflags = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall
+$cflags = -nostdinc -I/ndk/libc/include -DNETWARE_BSDSOCK -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
$unistd =
$thread_cflag =
$sys_id =
@@ -5068,7 +5068,7 @@ $multilib =
*** netware-libc-gcc
$cc = i586-netware-gcc
-$cflags = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall
+$cflags = -nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYS_NETWARE -DTERMIO -O2 -Wall
$unistd =
$thread_cflag =
$sys_id =
@@ -6088,7 +6088,7 @@ $multilib =
*** vos-gcc
$cc = gcc
-$cflags = -O3 -Wall -DOPENSSL_SYSNAME_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
+$cflags = -O3 -Wall -DOPENSSL_SYS_VOS -D_POSIX_C_SOURCE=200112L -D_BSD -D_VOS_EXTENDED_NAMES -DB_ENDIAN
$unistd =
$thread_cflag = (unknown)
$sys_id = VOS
diff --git a/apps/apps.c b/apps/apps.c
index ccd2182..97f0c0e 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -119,7 +119,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(OPENSSL_SYSNAME_WINCE) && !defined(NETWARE_CLIB)
+#if !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && !defined(NETWARE_CLIB)
# include <strings.h>
#endif
#include <sys/types.h>
@@ -1631,7 +1631,7 @@ BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
{
BIO *in = NULL;
BIGNUM *ret = NULL;
- MS_STATIC char buf[1024];
+ char buf[1024];
ASN1_INTEGER *ai = NULL;
ai = ASN1_INTEGER_new();
diff --git a/apps/apps.h b/apps/apps.h
index 22c678a..3f53bc1 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -205,7 +205,7 @@ extern BIO *bio_err;
# endif
# endif
-# if defined(OPENSSL_SYSNAME_WIN32) || defined(OPENSSL_SYSNAME_WINCE)
+# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)
# define openssl_fdset(a,b) FD_SET((unsigned int)a, b)
# else
# define openssl_fdset(a,b) FD_SET(a, b)
diff --git a/apps/ca.c b/apps/ca.c
index a93c00e..a917112 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -323,7 +323,7 @@ int MAIN(int argc, char **argv)
STACK_OF(OPENSSL_STRING) *sigopts = NULL;
#undef BSIZE
#define BSIZE 256
- MS_STATIC char buf[3][BSIZE];
+ char buf[3][BSIZE];
char *randfile = NULL;
#ifndef OPENSSL_NO_ENGINE
char *engine = NULL;
diff --git a/apps/openssl.c b/apps/openssl.c
index d8848b5..b196285 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -221,8 +221,8 @@ int main(int Argc, char *ARGV[])
#define PROG_NAME_SIZE 39
char pname[PROG_NAME_SIZE + 1];
FUNCTION f, *fp;
- MS_STATIC const char *prompt;
- MS_STATIC char buf[1024];
+ const char *prompt;
+ char buf[1024];
char *to_free = NULL;
int n, i, ret = 0;
int argc;
diff --git a/apps/req.c b/apps/req.c
index 990c5bd..6d06ed7 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1354,7 +1354,7 @@ static int add_DN_object(X509_NAME *n, char *text, const char *def,
unsigned long chtype, int mval)
{
int i, ret = 0;
- MS_STATIC char buf[1024];
+ char buf[1024];
start:
if (!batch)
BIO_printf(bio_err, "%s [%s]:", text, def);
diff --git a/apps/s_server.c b/apps/s_server.c
index 94de734..4dae4d5 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2557,7 +2557,7 @@ static int init_ssl_connection(SSL *con)
const char *str;
X509 *peer;
long verify_error;
- MS_STATIC char buf[BUFSIZ];
+ char buf[BUFSIZ];
#ifndef OPENSSL_NO_KRB5
char *client_princ;
#endif
diff --git a/apps/s_time.c b/apps/s_time.c
index 3520408..972dccf 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -340,7 +340,7 @@ int MAIN(int argc, char **argv)
SSL *scon = NULL;
long finishtime = 0;
int ret = 1, i;
- MS_STATIC char buf[1024 * 8];
+ char buf[1024 * 8];
int ver;
apps_startup();
diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c
index 2a447c3..3607375 100644
--- a/crypto/bio/bio_cb.c
+++ b/crypto/bio/bio_cb.c
@@ -67,7 +67,7 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
int argi, long argl, long ret)
{
BIO *b;
- MS_STATIC char buf[256];
+ char buf[256];
char *p;
long r = 1;
size_t p_maxlen;
diff --git a/crypto/des/asm/des_enc.m4 b/crypto/des/asm/des_enc.m4
index c4b1e48..e732ba6 100644
--- a/crypto/des/asm/des_enc.m4
+++ b/crypto/des/asm/des_enc.m4
@@ -67,8 +67,8 @@
# define STPTR stx
# define ARG0 128
# define ARGSZ 8
-# ifndef OPENSSL_SYSNAME_ULTRASPARC
-# define OPENSSL_SYSNAME_ULTRASPARC
+# ifndef OPENSSL_SYS_ULTRASPARC
+# define OPENSSL_SYS_ULTRASPARC
# endif
#else
# define FRAME -96
@@ -429,7 +429,7 @@ $4:
xor $2, local1, $2 ! 1 finished
xor $2, local2, $2 ! 3 finished
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bne,pt %icc, $4
#else
bne $4
@@ -791,7 +791,7 @@ define(load_little_endian, {
! first in memory to rightmost in register
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
andcc $1, 3, global0
bne,pn %icc, $5
nop
@@ -854,7 +854,7 @@ define(load_little_endian_inc, {
! first in memory to rightmost in register
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
andcc $1, 3, global0
bne,pn %icc, $5
nop
@@ -989,7 +989,7 @@ define(store_little_endian, {
! rightmost in register to first in memory
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
andcc $1, 3, global0
bne,pn %icc, $5
nop
@@ -1195,7 +1195,7 @@ DES_encrypt1:
ld [in0], in5 ! left
cmp in2, 0 ! enc
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
be,pn %icc, .encrypt.dec ! enc/dec
#else
be .encrypt.dec
@@ -1287,7 +1287,7 @@ DES_encrypt2:
! we use our own stackframe
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
be,pn %icc, .encrypt2.dec ! decryption
#else
be .encrypt2.dec
@@ -1467,7 +1467,7 @@ DES_ncbc_encrypt:
cmp in5, 0 ! enc
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
be,pn %icc, .ncbc.dec
#else
be .ncbc.dec
@@ -1479,7 +1479,7 @@ DES_ncbc_encrypt:
addcc in2, -8, in2 ! bytes missing when first block done
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ncbc.enc.seven.or.less
#else
bl .ncbc.enc.seven.or.less
@@ -1507,7 +1507,7 @@ DES_ncbc_encrypt:
rounds_macro(in5, out5, 1, .ncbc.enc.1, in3, in4) ! include encryption ks in3
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ncbc.enc.next.block_fp
#else
bl .ncbc.enc.next.block_fp
@@ -1552,7 +1552,7 @@ DES_ncbc_encrypt:
addcc in2, -8, in2 ! bytes missing when next block done
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bpos,pt %icc, .ncbc.enc.next.block ! also jumps if 0
#else
bpos .ncbc.enc.next.block
@@ -1563,7 +1563,7 @@ DES_ncbc_encrypt:
cmp in2, -8
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
ble,pt %icc, .ncbc.enc.finish
#else
ble .ncbc.enc.finish
@@ -1594,7 +1594,7 @@ DES_ncbc_encrypt:
add in3, 120, in3
LDPTR IVEC, local7 ! ivec
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
ble,pn %icc, .ncbc.dec.finish
#else
ble .ncbc.dec.finish
@@ -1622,7 +1622,7 @@ DES_ncbc_encrypt:
! in2 is compared to 8 in the rounds
xor out5, in0, out4 ! iv xor
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ncbc.dec.seven.or.less
#else
bl .ncbc.dec.seven.or.less
@@ -1639,7 +1639,7 @@ DES_ncbc_encrypt:
add local7, 8, local7
addcc in2, -8, in2
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bg,pt %icc, .ncbc.dec.next.block
#else
bg .ncbc.dec.next.block
@@ -1694,7 +1694,7 @@ DES_ede3_cbc_encrypt:
LDPTR [%fp+BIAS+ARG0+6*ARGSZ], local4 ! ivec
cmp local3, 0 ! enc
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
be,pn %icc, .ede3.dec
#else
be .ede3.dec
@@ -1707,7 +1707,7 @@ DES_ede3_cbc_encrypt:
addcc in2, -8, in2 ! bytes missing after next block
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ede3.enc.seven.or.less
#else
bl .ede3.enc.seven.or.less
@@ -1741,7 +1741,7 @@ DES_ede3_cbc_encrypt:
call .des_enc ! ks3 in3 compares in2 to 8
nop
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ede3.enc.next.block_fp
#else
bl .ede3.enc.next.block_fp
@@ -1787,7 +1787,7 @@ DES_ede3_cbc_encrypt:
addcc in2, -8, in2 ! bytes missing when next block done
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bpos,pt %icc, .ede3.enc.next.block
#else
bpos .ede3.enc.next.block
@@ -1798,7 +1798,7 @@ DES_ede3_cbc_encrypt:
cmp in2, -8
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
ble,pt %icc, .ede3.enc.finish
#else
ble .ede3.enc.finish
@@ -1830,7 +1830,7 @@ DES_ede3_cbc_encrypt:
STPTR in3, KS1
cmp in2, 0
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
ble %icc, .ede3.dec.finish
#else
ble .ede3.dec.finish
@@ -1863,7 +1863,7 @@ DES_ede3_cbc_encrypt:
! in2 is compared to 8 in the rounds
xor out5, in0, out4
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bl,pn %icc, .ede3.dec.seven.or.less
#else
bl .ede3.dec.seven.or.less
@@ -1878,7 +1878,7 @@ DES_ede3_cbc_encrypt:
addcc in2, -8, in2
add local7, 8, local7
-#ifdef OPENSSL_SYSNAME_ULTRASPARC
+#ifdef OPENSSL_SYS_ULTRASPARC
bg,pt %icc, .ede3.dec.next.block
#else
bg .ede3.dec.next.block
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 4e2d096..16fd4e4 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -62,7 +62,7 @@
#include "o_str.h"
#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
- !defined(OPENSSL_SYSNAME_WIN32) && !defined(OPENSSL_SYSNAME_WINCE) && \
+ !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && \
!defined(NETWARE_CLIB)
# include <strings.h>
#endif
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 108c336..0b06ea4 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -722,7 +722,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base_, int num,
int OBJ_create_objects(BIO *in)
{
- MS_STATIC char buf[512];
+ char buf[512];
int i, num = 0;
char *o, *s, *l = NULL;
diff --git a/crypto/pkcs7/bio_pk7.c b/crypto/pkcs7/bio_pk7.c
index fae1c56..31aef83 100644
--- a/crypto/pkcs7/bio_pk7.c
+++ b/crypto/pkcs7/bio_pk7.c
@@ -57,7 +57,7 @@
#include <openssl/pkcs7.h>
#include <openssl/bio.h>
-#if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS)
+#if !defined(OPENSSL_SYS_NETWARE) && !defined(OPENSSL_SYS_VXWORKS)
# include <memory.h>
#endif
#include <stdio.h>
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 70743e1..ef43966 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -121,7 +121,7 @@
#include "e_os.h"
-#if !(defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYSNAME_DSPBIOS))
+#if !(defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_DSPBIOS))
# include <sys/time.h>
#endif
#if defined(OPENSSL_SYS_VXWORKS)
@@ -383,7 +383,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
#elif defined(OPENSSL_SYS_VXWORKS)
struct timespec tv;
clock_gettime(CLOCK_REALTIME, &ts);
-#elif defined(OPENSSL_SYSNAME_DSPBIOS)
+#elif defined(OPENSSL_SYS_DSPBIOS)
unsigned long long tv, OPENSSL_rdtsc();
tv = OPENSSL_rdtsc();
#else
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index b234be0..e154646 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -118,7 +118,7 @@ int RAND_load_file(const char *file, long bytes)
* if bytes == -1, read complete file.
*/
- MS_STATIC unsigned char buf[BUFSIZE];
+ unsigned char buf[BUFSIZE];
#ifndef OPENSSL_NO_POSIX_IO
struct stat sb;
#endif
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index c1d2753..b033a30 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -124,7 +124,7 @@
* sigaction and fileno included. -pedantic would be more appropriate for the
* intended purposes, but we can't prevent users from adding -ansi.
*/
-#if defined(OPENSSL_SYSNAME_VXWORKS)
+#if defined(OPENSSL_SYS_VXWORKS)
# include <sys/types.h>
#endif
diff --git a/e_os.h b/e_os.h
index 5549abe..0fbc33c 100644
--- a/e_os.h
+++ b/e_os.h
@@ -102,16 +102,6 @@ extern "C" {
/********************************************************************
The Microsoft section
********************************************************************/
-/*
- * The following is used because of the small stack in some Microsoft
- * operating systems
- */
-# if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
-# define MS_STATIC static
-# else
-# define MS_STATIC
-# endif
-
# if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
# define WIN32
# endif
diff --git a/e_os2.h b/e_os2.h
index ecc0202..12bad8a 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -71,7 +71,7 @@ extern "C" {
# define OPENSSL_SYS_UNIX
/* ---------------------- NetWare ----------------------------------------- */
-# if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
+# if defined(NETWARE) && !defined(OPENSSL_SYS_NETWARE)
# undef OPENSSL_SYS_UNIX
# define OPENSSL_SYS_NETWARE
# endif
@@ -82,34 +82,33 @@ extern "C" {
* Note that MSDOS actually denotes 32-bit environments running on top of
* MS-DOS, such as DJGPP one.
*/
-# if defined(OPENSSL_SYSNAME_MSDOS)
+# if defined(OPENSSL_SYS_MSDOS)
# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_MSDOS
# endif
/*
* For 32 bit environment, there seems to be the CygWin environment and then
* all the others that try to do the same thing Microsoft does...
*/
-# if defined(OPENSSL_SYSNAME_UWIN)
+# if defined(OPENSSL_SYS_UWIN)
# undef OPENSSL_SYS_UNIX
# define OPENSSL_SYS_WIN32_UWIN
# else
-# if defined(__CYGWIN__) || defined(OPENSSL_SYSNAME_CYGWIN)
+# if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
# undef OPENSSL_SYS_UNIX
# define OPENSSL_SYS_WIN32_CYGWIN
# else
-# if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
+# if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)
# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WIN32
+# if !defined(OPENSSL_SYS_WIN32)
+# define OPENSSL_SYS_WIN32
+# endif
# endif
-# if defined(OPENSSL_SYSNAME_WINNT)
+# if defined(OPENSSL_SYS_WINNT)
# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINNT
# endif
-# if defined(OPENSSL_SYSNAME_WINCE)
+# if defined(OPENSSL_SYS_WINCE)
# undef OPENSSL_SYS_UNIX
-# define OPENSSL_SYS_WINCE
# endif
# endif
# endif
@@ -138,8 +137,10 @@ extern "C" {
# endif
/* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-# undef OPENSSL_SYS_UNIX
+# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYS_VMS)
+# if !defined(OPENSSL_SYS_VMS)
+# undef OPENSSL_SYS_UNIX
+# endif
# define OPENSSL_SYS_VMS
# if defined(__DECC)
# define OPENSSL_SYS_VMS_DECC
@@ -159,25 +160,16 @@ extern "C" {
/* -------------------------------- Unix ---------------------------------- */
# ifdef OPENSSL_SYS_UNIX
-# if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
+# if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX)
# define OPENSSL_SYS_LINUX
# endif
-# ifdef OPENSSL_SYSNAME_SNI
-# define OPENSSL_SYS_SNI
-# endif
-# ifdef OPENSSL_SYSNAME_ULTRASPARC
-# define OPENSSL_SYS_ULTRASPARC
-# endif
-# ifdef OPENSSL_SYSNAME_MACOSX
-# define OPENSSL_SYS_MACOSX
-# endif
-# if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
+# if defined(_AIX) && !defined(OPENSSL_SYS_AIX)
# define OPENSSL_SYS_AIX
# endif
# endif
/* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) || defined(OPENSSL_SYSNAME_VOS)
+# if defined(__VOS__) && !defined(OPENSSL_SYS_VOS)
# define OPENSSL_SYS_VOS
# ifdef __HPPA__
# define OPENSSL_SYS_VOS_HPPA
@@ -187,11 +179,6 @@ extern "C" {
# endif
# endif
-/* ------------------------------ VxWorks --------------------------------- */
-# ifdef OPENSSL_SYSNAME_VXWORKS
-# define OPENSSL_SYS_VXWORKS
-# endif
-
/**
* That's it for OS-specific stuff
*****************************************************************************/
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 9290ca2..d217efa 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1890,7 +1890,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
{
/* CLIENT */
- MS_STATIC char cbuf[1024 * 8];
+ char cbuf[1024 * 8];
int i, r;
clock_t c_clock = clock();
@@ -1967,7 +1967,7 @@ int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,
{
/* SERVER */
- MS_STATIC char sbuf[1024 * 8];
+ char sbuf[1024 * 8];
int i, r;
clock_t s_clock = clock();
diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index ed28e65..b659227 100644
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -18,7 +18,7 @@ $out_def="out32";
$tmp_def="tmp32";
$inc_def="inc32";
#enable max error messages, disable most common warnings
-$cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYSNAME_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp ";
+$cflags="-DWIN32_LEAN_AND_MEAN -q -w-ccc -w-rch -w-pia -w-aus -w-par -w-inl -c -tWC -tWM -DOPENSSL_SYS_WIN32 -DL_ENDIAN -DDSO_WIN32 -D_stricmp=stricmp -D_strnicmp=strnicmp ";
if ($debug)
{
$cflags.="-Od -y -v -vi- -D_DEBUG";
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index f9749e4..309312c 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -122,7 +122,7 @@ elsif ($FLAVOR =~ /CE/)
}
$cc=($ENV{CC} or "cl");
- $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
+ $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYS_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
$base_cflags.=" $wcecdefs";
$base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'}));
$base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'}));
diff --git a/util/pl/netware.pl b/util/pl/netware.pl
index fe80a9b..4e6f876 100644
--- a/util/pl/netware.pl
+++ b/util/pl/netware.pl
@@ -222,7 +222,7 @@ else
}
# common defines
-$cflags.=" -DL_ENDIAN -DOPENSSL_SYSNAME_NETWARE -U_WIN32";
+$cflags.=" -DL_ENDIAN -DOPENSSL_SYS_NETWARE -U_WIN32";
# If LibC build add in NKS_LIBC define and set the entry/exit
# routines - The default entry/exit routines are for CLib and don't exist
More information about the openssl-commits
mailing list