SUBMISSION TYPE: TSU
SUBMITTED BY: Tim Rice
SUBMITTED FOR:
POINT OF CONTACT: [EMAIL PROTECTED]
PHONE and/or FAX:
MANUFACTURER: (if relevant)
PRODUCT NAME/MODEL #: openssl-0.9.7
ECCN: 5D002
NOTIFICATION: The attached patch applies to openssl-0.9.7. The source
code is at ftp.openssl.org and its worldwide mirrors. Code submitted
to the mailing list at [EMAIL PROTECTED]
This patch corrects build problems on SCO OpenServer and adds support
for ASM modules on both OpenServer and UnixWare.
--
Tim Rice
[EMAIL PROTECTED]
--- openssl-0.9.7/Configure.orig 2002-12-08 09:53:26.276000016 -0800
+++ openssl-0.9.7/Configure 2002-12-09 15:52:55.729280046 -0800
@@ -111,6 +111,9 @@
my $x86_elf_asm="asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o
asm/yx86-elf.o:asm/bx86-elf.o:asm/mx86-elf.o:asm/sx86-elf.o:asm/cx86-elf.o:asm/rx86-elf.o:asm/rm86-elf.o:asm/r586-elf.o";
my $x86_out_asm="asm/bn86-out.o asm/co86-out.o:asm/dx86-out.o
asm/yx86-out.o:asm/bx86-out.o:asm/mx86-out.o:asm/sx86-out.o:asm/cx86-out.o:asm/rx86-out.o:asm/rm86-out.o:asm/r586-out.o";
my $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o
asm/yx86bsdi.o:asm/bx86bsdi.o:asm/mx86bsdi.o:asm/sx86bsdi.o:asm/cx86bsdi.o:asm/rx86bsdi.o:asm/rm86bsdi.o:asm/r586bsdi.o";
+my $x86_coff_asm="asm/bn86coff.o asm/co86coff.o:asm/dx86coff.o
+asm/yx86coff.o:asm/bx86coff.o:asm/mx86coff.o:asm/sx86coff.o:asm/cx86coff.o:asm/rx86coff.o:asm/rm86coff.o:asm/r586coff.o";
+
+my $x86_sco5_asm="asm/bn86sco5.o asm/co86sco5.o:asm/dx86sco5.o
+asm/yx86sco5.o:asm/bx86sco5.o:asm/mx86sco5.o:asm/sx86sco5.o:asm/cx86sco5.o:asm/rx86sco5.o:asm/rm86sco5.o:asm/r586sco5.o";
+
+my $x86_svr4_asm="asm/bn86svr4.o asm/co86svr4.o:asm/dx86svr4.o
+asm/yx86svr4.o:asm/bx86svr4.o:asm/mx86svr4.o:asm/sx86svr4.o:asm/cx86svr4.o:asm/rx86svr4.o:asm/rm86svr4.o:asm/r586svr4.o";
+
my $mips3_irix_asm="asm/mips3.o::::::::";
# There seems to be boundary faults in asm/alpha.s.
@@ -416,24 +419,24 @@
# UnixWare 2.0x fails destest with -O
"unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv
-lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-2.0-pentium","cc:-DFILIO_H -DNO_STRINGS_H -Kpentium::-Kthread::-lsocket
-lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
+"unixware-2.0-pentium","cc:-DFILIO_H -DNO_STRINGS_H -Kpentium
+-DUSE_BN_ASM::-Kthread::-lsocket -lnsl -lresolv -lx:MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}::",
# UnixWare 2.1
-"unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des}
${x86_gcc_opts}:::",
-"unixware-2.1-pentium","cc:-O -DFILIO_H -Kpentium::-Kthread::-lsocket -lnsl -lresolv
-lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
-"unixware-2.1-p6","cc:-O -DFILIO_H -Kp6::-Kthread::-lsocket -lnsl -lresolv
-lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
+"unixware-2.1","cc:-O -DFILIO_H -DUSE_BN_ASM::-Kthread::-lsocket -lnsl -lresolv
+-lx:${x86_gcc_des} ${x86_gcc_opts}:${x86_svr4_asm}::",
+"unixware-2.1-pentium","cc:-O -DFILIO_H -Kpentium -DUSE_BN_ASM::-Kthread::-lsocket
+-lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_svr4_asm}:",
+"unixware-2.1-p6","cc:-O -DFILIO_H -Kp6 -DUSE_BN_ASM::-Kthread::-lsocket -lnsl
+-lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_svr4_asm}:",
# UnixWare 7
-"unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR
RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"unixware-7-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium::-Kthread::-lsocket
-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"unixware-7-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro::-Kthread::-lsocket
-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"unixware-7","cc:-O -DFILIO_H -Kalloca -DUSE_BN_ASM::-Kthread::-lsocket
+-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+"unixware-7-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium
+-DUSE_BN_ASM::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+"unixware-7-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro
+-DUSE_BN_ASM::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486
-Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# OpenUNIX 8
-"OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR
RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenUNIX-8","cc:-O -DFILIO_H -Kalloca -DUSE_BN_ASM::-Kthread::-lsocket
+-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
"OpenUNIX-8-gcc","gcc:-O -DFILIO_H -fomit-frame-pointer::-pthread::-lsocket
-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenUNIX-8-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium::-Kthread::-lsocket
-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenUNIX-8-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro::-Kthread::-lsocket
-lnsl:BN_LLONG MD2_CHAR RC4_INDEX
${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenUNIX-8-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium
+-DUSE_BN_ASM::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+"OpenUNIX-8-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro
+-DUSE_BN_ASM::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX
+${x86_gcc_des}:${x86_svr4_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
# IBM's AIX.
"aix-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
@@ -474,13 +477,13 @@
"dgux-R4-x86-gcc", "gcc:-O3 -fomit-frame-pointer -DL_ENDIAN::(unknown)::-lnsl
-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
# SCO 3 - Tim Rice <[EMAIL PROTECTED]>
-"sco3-gcc", "gcc:-O3 -fomit-frame-pointer -Dssize_t=int
-DNO_SYS_UN_H::(unknown)::-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the
SCO assembler doesn't seem to like our assembler files ...
+"sco3-gcc", "gcc:-O3 -fomit-frame-pointer -Dssize_t=int
+-DNO_SYS_UN_H::(unknown)::-lsocket:BN_LLONG ${x86_gcc_des}
+${x86_gcc_opts}:${x86_coff_asm}::::::true::",
# SCO 5 - Ben Laurie <[EMAIL PROTECTED]> says the -O breaks the
# SCO cc.
-"sco5-cc", "cc:-belf::(unknown)::-lsocket -lresolv -lnsl:${x86_gcc_des}
${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-Kpic", # des options?
-"sco5-cc-pentium", "cc:-Kpentium::(unknown)::-lsocket:${x86_gcc_des}
${x86_gcc_opts}:::", # des options?
-"sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lresolv
-lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-fPIC",
# the SCO assembler doesn't seem to like our assembler files ...
+"sco5-cc", "cc:-belf::(unknown)::-lsocket -lresolv -lnsl:${x86_gcc_des}
+${x86_gcc_opts}:${x86_sco5_asm}:dlfcn:svr3-shared:-Kpic", # des options?
+"sco5-cc-pentium", "cc:-Kpentium -belf::(unknown)::-lsocket:${x86_gcc_des}
+${x86_gcc_opts}:${x86_sco5_asm}:dlfcn:svr3-shared:-Kpic", # des options?
+"sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lresolv
+-lnsl:BN_LLONG ${x86_gcc_des}
+${x86_gcc_opts}:${x86_sco5_asm}:dlfcn:svr3-shared:-fPIC",
# Sinix/ReliantUNIX RM400
# NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer
problem. Better use -g */
--- openssl-0.9.7/crypto/bf/Makefile.ssl.orig 2002-10-09 06:18:06.000000000 -0700
+++ openssl-0.9.7/crypto/bf/Makefile.ssl 2002-12-09 15:53:55.769280006 -0800
@@ -58,6 +58,24 @@
as -o asm/bx86-sol.o asm/bx86-sol.s
rm -f asm/bx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/bx86svr4.o: asm/bx86unix.cpp
+ $(CPP) -DELF asm/bx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/bx86svr4.s
+ as -o asm/bx86svr4.o asm/bx86svr4.s
+ rm -f asm/bx86svr4.s
+
+# SCO elf
+asm/bx86sco5.o: asm/bx86unix.cpp
+ $(CPP) -DELF asm/bx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/bx86sco5.s
+ as -b elf -o asm/bx86sco5.o asm/bx86sco5.s
+ rm -f asm/bx86sco5.s
+
+# SCO coff
+asm/bx86coff.o: asm/bx86unix.cpp
+ $(CPP) -DCOFF asm/bx86unix.cpp | sed 's/ :/:/' > asm/bx86coff.s
+ as -o asm/bx86coff.o asm/bx86coff.s
+ rm -f asm/bx86coff.s
+
# a.out
asm/bx86-out.o: asm/bx86unix.cpp
$(CPP) -DOUT asm/bx86unix.cpp | as -o asm/bx86-out.o
--- openssl-0.9.7/crypto/bn/Makefile.ssl.orig 2002-10-09 06:18:15.000000000 -0700
+++ openssl-0.9.7/crypto/bn/Makefile.ssl 2002-12-09 15:54:03.679280021 -0800
@@ -90,6 +90,39 @@
as -o asm/co86-sol.o asm/co86-sol.s
rm -f asm/co86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/bn86svr4.o: asm/bn86unix.cpp
+ $(CPP) -DELF asm/bn86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/bn86svr4.s
+ as -o asm/bn86svr4.o asm/bn86svr4.s
+ rm -f asm/bn86svr4.s
+
+asm/co86svr4.o: asm/co86unix.cpp
+ $(CPP) -DELF asm/co86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/co86svr4.s
+ as -o asm/co86svr4.o asm/co86svr4.s
+ rm -f asm/co86svr4.s
+
+# SCO elf
+asm/bn86sco5.o: asm/bn86unix.cpp
+ $(CPP) -DELF asm/bn86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/bn86sco5.s
+ as -b elf -o asm/bn86sco5.o asm/bn86sco5.s
+ rm -f asm/bn86sco5.s
+
+asm/co86sco5.o: asm/co86unix.cpp
+ $(CPP) -DELF asm/co86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/co86sco5.s
+ as -b elf -o asm/co86sco5.o asm/co86sco5.s
+ rm -f asm/co86sco5.s
+
+# SCO coff
+asm/bn86coff.o: asm/bn86unix.cpp
+ $(CPP) -DCOFF asm/bn86unix.cpp | sed 's/ :/:/' > asm/bn86coff.s
+ as -o asm/bn86coff.o asm/bn86coff.s
+ rm -f asm/bn86coff.s
+
+asm/co86coff.o: asm/co86unix.cpp
+ $(CPP) -DCOFF asm/co86unix.cpp | sed 's/ :/:/' > asm/co86coff.s
+ as -o asm/co86coff.o asm/co86coff.s
+ rm -f asm/co86coff.s
+
# a.out
asm/bn86-out.o: asm/bn86unix.cpp
$(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o
--- openssl-0.9.7/crypto/bn/bn_mul.c.orig 2002-06-13 13:40:11.000000000 -0700
+++ openssl-0.9.7/crypto/bn/bn_mul.c 2002-12-08 21:25:57.073200031 -0800
@@ -66,7 +66,7 @@
#include "cryptlib.h"
#include "bn_lcl.h"
-#if defined(OPENSSL_NO_ASM) || !(defined(__i386) || defined(__i386__)) ||
defined(__DJGPP__) /* Assembler implementation exists only for x86 */
+#if defined(OPENSSL_NO_ASM) || !(defined(__i386) || defined(__i386__) ||
+defined(USE_BN_ASM)) || defined(__DJGPP__) /* Assembler implementation exists only
+for x86 */
/* Here follows specialised variants of bn_add_words() and
bn_sub_words(). They have the property performing operations on
arrays of different sizes. The sizes of those arrays is expressed through
--- openssl-0.9.7/crypto/cast/Makefile.ssl.orig 2002-10-09 06:18:29.000000000 -0700
+++ openssl-0.9.7/crypto/cast/Makefile.ssl 2002-12-09 15:54:37.969280006 -0800
@@ -22,7 +22,10 @@
#CAST_ENC=asm/cx86-elf.o
#CAST_ENC=asm/cx86-out.o
#CAST_ENC=asm/cx86-sol.o
-#CAST_ENC=asm/cx86bdsi.o
+#CAST_ENC=asm/cx86bsdi.o
+#CAST_ENC=asm/cx86svr4.o
+#CAST_ENC=asm/cx86sco5.o
+#CAST_ENC=asm/cx86coff.o
CFLAGS= $(INCLUDES) $(CFLAG)
@@ -61,6 +64,24 @@
as -o asm/cx86-sol.o asm/cx86-sol.s
rm -f asm/cx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/cx86svr4.o: asm/cx86unix.cpp
+ $(CPP) -DELF asm/cx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/cx86svr4.s
+ as -o asm/cx86svr4.o asm/cx86svr4.s
+ rm -f asm/cx86svr4.s
+
+# SCO elf
+asm/cx86sco5.o: asm/cx86unix.cpp
+ $(CPP) -DELF asm/cx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/cx86sco5.s
+ as -b elf -o asm/cx86sco5.o asm/cx86sco5.s
+ rm -f asm/cx86sco5.s
+
+# SCO coff
+asm/cx86coff.o: asm/cx86unix.cpp
+ $(CPP) -DCOFF asm/cx86unix.cpp | sed 's/ :/:/' > asm/cx86coff.s
+ as -o asm/cx86coff.o asm/cx86coff.s
+ rm -f asm/cx86coff.s
+
# a.out
asm/cx86-out.o: asm/cx86unix.cpp
$(CPP) -DOUT asm/cx86unix.cpp | as -o asm/cx86-out.o
--- openssl-0.9.7/crypto/des/Makefile.ssl.orig 2002-12-08 17:17:35.374480019 -0800
+++ openssl-0.9.7/crypto/des/Makefile.ssl 2002-12-09 15:54:45.819280020 -0800
@@ -83,6 +83,39 @@
as -o asm/yx86-sol.o asm/yx86-sol.s
rm -f asm/yx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/dx86svr4.o: asm/dx86unix.cpp
+ $(CPP) -DELF asm/dx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/dx86svr4.s
+ as -o asm/dx86svr4.o asm/dx86svr4.s
+ rm -f asm/dx86svr4.s
+
+asm/yx86svr4.o: asm/yx86unix.cpp
+ $(CPP) -DELF asm/yx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/yx86svr4.s
+ as -o asm/yx86svr4.o asm/yx86svr4.s
+ rm -f asm/yx86svr4.s
+
+# SCO elf
+asm/dx86sco5.o: asm/dx86unix.cpp
+ $(CPP) -DELF asm/dx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/dx86sco5.s
+ as -b elf -o asm/dx86sco5.o asm/dx86sco5.s
+ rm -f asm/dx86sco5.s
+
+asm/yx86sco5.o: asm/yx86unix.cpp
+ $(CPP) -DELF asm/yx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/yx86sco5.s
+ as -b elf -o asm/yx86sco5.o asm/yx86sco5.s
+ rm -f asm/yx86sco5.s
+
+# SCO coff
+asm/dx86coff.o: asm/dx86unix.cpp
+ $(CPP) -DCOFF asm/dx86unix.cpp | sed 's/ :/:/' > asm/dx86coff.s
+ as -o asm/dx86coff.o asm/dx86coff.s
+ rm -f asm/dx86coff.s
+
+asm/yx86coff.o: asm/yx86unix.cpp
+ $(CPP) -DCOFF asm/yx86unix.cpp | sed 's/ :/:/' > asm/yx86coff.s
+ as -o asm/yx86coff.o asm/yx86coff.s
+ rm -f asm/yx86coff.s
+
# a.out
asm/dx86-out.o: asm/dx86unix.cpp
$(CPP) -DOUT asm/dx86unix.cpp | as -o asm/dx86-out.o
--- openssl-0.9.7/crypto/md5/Makefile.ssl.orig 2002-12-06 06:56:49.000000000 -0800
+++ openssl-0.9.7/crypto/md5/Makefile.ssl 2002-12-09 15:54:53.369280030 -0800
@@ -64,6 +64,24 @@
as -o asm/mx86-sol.o asm/mx86-sol.s
rm -f asm/mx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/mx86svr4.o: asm/mx86unix.cpp
+ $(CPP) -DELF asm/mx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/mx86svr4.s
+ as -o asm/mx86svr4.o asm/mx86svr4.s
+ rm -f asm/mx86svr4.s
+
+# SCO elf
+asm/mx86sco5.o: asm/mx86unix.cpp
+ $(CPP) -DELF asm/mx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/mx86sco5.s
+ as -b elf -o asm/mx86sco5.o asm/mx86sco5.s
+ rm -f asm/mx86sco5.s
+
+# SCO coff
+asm/mx86coff.o: asm/mx86unix.cpp
+ $(CPP) -DCOFF asm/mx86unix.cpp | sed 's/ :/:/' > asm/mx86coff.s
+ as -o asm/mx86coff.o asm/mx86coff.s
+ rm -f asm/mx86coff.s
+
# a.out
asm/mx86-out.o: asm/mx86unix.cpp
$(CPP) -DOUT asm/mx86unix.cpp | as -o asm/mx86-out.o
--- openssl-0.9.7/crypto/rc4/Makefile.ssl.orig 2002-10-09 06:20:21.000000000 -0700
+++ openssl-0.9.7/crypto/rc4/Makefile.ssl 2002-12-09 15:55:06.299280006 -0800
@@ -22,7 +22,10 @@
#RC4_ENC=asm/rx86-elf.o
#RC4_ENC=asm/rx86-out.o
#RC4_ENC=asm/rx86-sol.o
-#RC4_ENC=asm/rx86bdsi.o
+#RC4_ENC=asm/rx86bsdi.o
+#RC4_ENC=asm/rx86svr4.o
+#RC4_ENC=asm/rx86sco5.o
+#RC4_ENC=asm/rx86coff.o
CFLAGS= $(INCLUDES) $(CFLAG)
@@ -61,6 +64,24 @@
as -o asm/rx86-sol.o asm/rx86-sol.s
rm -f asm/rx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/rx86svr4.o: asm/rx86unix.cpp
+ $(CPP) -DELF asm/rx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/rx86svr4.s
+ as -o asm/rx86svr4.o asm/rx86svr4.s
+ rm -f asm/rx86svr4.s
+
+# SCO elf
+asm/rx86sco5.o: asm/rx86unix.cpp
+ $(CPP) -DELF asm/rx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/rx86sco5.s
+ as -b elf -o asm/rx86sco5.o asm/rx86sco5.s
+ rm -f asm/rx86sco5.s
+
+# SCO coff
+asm/rx86coff.o: asm/rx86unix.cpp
+ $(CPP) -DCOFF asm/rx86unix.cpp | sed 's/ :/:/' > asm/rx86coff.s
+ as -o asm/rx86coff.o asm/rx86coff.s
+ rm -f asm/rx86coff.s
+
# a.out
asm/rx86-out.o: asm/rx86unix.cpp
$(CPP) -DOUT asm/rx86unix.cpp | as -o asm/rx86-out.o
--- openssl-0.9.7/crypto/rc5/Makefile.ssl.orig 2002-10-09 06:20:24.000000000 -0700
+++ openssl-0.9.7/crypto/rc5/Makefile.ssl 2002-12-09 15:55:15.279280006 -0800
@@ -58,6 +58,24 @@
as -o asm/r586-sol.o asm/r586-sol.s
rm -f asm/r586-sol.s
+# UnixWare elf (svr4/svr5)
+asm/r586svr4.o: asm/r586unix.cpp
+ $(CPP) -DELF asm/r586unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/r586svr4.s
+ as -o asm/r586svr4.o asm/r586svr4.s
+ rm -f asm/r586svr4.s
+
+# SCO elf
+asm/r586sco5.o: asm/r586unix.cpp
+ $(CPP) -DELF asm/r586unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/r586sco5.s
+ as -b elf -o asm/r586sco5.o asm/r586sco5.s
+ rm -f asm/r586sco5.s
+
+# SCO coff
+asm/r586coff.o: asm/r586unix.cpp
+ $(CPP) -DCOFF asm/r586unix.cpp | sed 's/ :/:/' > asm/r586coff.s
+ as -o asm/r586coff.o asm/r586coff.s
+ rm -f asm/r586coff.s
+
# a.out
asm/r586-out.o: asm/r586unix.cpp
$(CPP) -DOUT asm/r586unix.cpp | as -o asm/r586-out.o
--- openssl-0.9.7/crypto/ripemd/Makefile.ssl.orig 2002-12-06 06:56:54.000000000
-0800
+++ openssl-0.9.7/crypto/ripemd/Makefile.ssl 2002-12-09 15:55:22.119280006 -0800
@@ -56,6 +56,24 @@
as -o asm/rm86-sol.o asm/rm86-sol.s
rm -f asm/rm86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/rm86svr4.o: asm/rm86unix.cpp
+ $(CPP) -DELF asm/rm86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/rm86svr4.s
+ as -o asm/rm86svr4.o asm/rm86svr4.s
+ rm -f asm/rm86svr4.s
+
+# SCO elf
+asm/rm86sco5.o: asm/rm86unix.cpp
+ $(CPP) -DELF asm/rm86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/rm86sco5.s
+ as -b elf -o asm/rm86sco5.o asm/rm86sco5.s
+ rm -f asm/rm86sco5.s
+
+# SCO coff
+asm/rm86coff.o: asm/rm86unix.cpp
+ $(CPP) -DCOFF asm/rm86unix.cpp | sed 's/ :/:/' > asm/rm86coff.s
+ as -o asm/rm86coff.o asm/rm86coff.s
+ rm -f asm/rm86coff.s
+
# a.out
asm/rm86-out.o: asm/rm86unix.cpp
$(CPP) -DOUT asm/rm86unix.cpp | as -o asm/rm86-out.o
--- openssl-0.9.7/crypto/sha/Makefile.ssl.orig 2002-12-06 06:56:55.000000000 -0800
+++ openssl-0.9.7/crypto/sha/Makefile.ssl 2002-12-09 15:55:42.519280006 -0800
@@ -56,6 +56,24 @@
as -o asm/sx86-sol.o asm/sx86-sol.s
rm -f asm/sx86-sol.s
+# UnixWare elf (svr4/svr5)
+asm/sx86svr4.o: asm/sx86unix.cpp
+ $(CPP) -DELF asm/sx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/sx86svr4.s
+ as -o asm/sx86svr4.o asm/sx86svr4.s
+ rm -f asm/sx86svr4.s
+
+# SCO elf
+asm/sx86sco5.o: asm/sx86unix.cpp
+ $(CPP) -DELF asm/sx86unix.cpp | sed -e 's/\. /./g' -e 's/@ /@/' >
+asm/sx86sco5.s
+ as -b elf -o asm/sx86sco5.o asm/sx86sco5.s
+ rm -f asm/sx86sco5.s
+
+# SCO coff
+asm/sx86coff.o: asm/sx86unix.cpp
+ $(CPP) -DCOFF asm/sx86unix.cpp | sed 's/ :/:/' > asm/sx86coff.s
+ as -o asm/sx86coff.o asm/sx86coff.s
+ rm -f asm/sx86coff.s
+
# a.out
asm/sx86-out.o: asm/sx86unix.cpp
$(CPP) -DOUT asm/sx86unix.cpp | as -o asm/sx86-out.o
--- openssl-0.9.7/crypto/perlasm/x86asm.pl.orig 2002-07-18 05:38:03.000000000 -0700
+++ openssl-0.9.7/crypto/perlasm/x86asm.pl 2002-12-09 12:58:42.069520005 -0800
@@ -52,7 +52,7 @@
&comment("Don't even think of reading this code");
&comment("It was automatically generated by $filename");
&comment("Which is a perl program used to generate the x86 assember for");
-&comment("any of elf, a.out, BSDI, Win32, gaswin (for GNU as on Win32) or Solaris");
+&comment("any of elf, a.out, BSDI, coff, Win32, gaswin (for GNU as on Win32) or
+Solaris");
&comment("eric <eay\@cryptsoft.com>");
&comment("");
@@ -75,6 +75,7 @@
* OUT - a.out object files,
* BSDI - BSDI style a.out object files
* SOL - Solaris style elf
+ * COFF - COFF object files
*/
#define TYPE(a,b) .type a,b
@@ -95,7 +96,7 @@
#endif /* __CYGWIN || __DJGPP */
#endif
-#if defined(BSDI) && !defined(ELF)
+#if (defined(BSDI) && !defined(ELF)) || defined(COFF)
#define OK 1
#define ALIGN 4
#undef SIZE
@@ -115,6 +116,7 @@
OUT - a.out systems - linux-a.out and FreeBSD
SOL - solaris systems, which are elf with strange comment lines
BSDI - a.out with a very primative version of as.
+COFF - coff systems - SCO Unix
#endif
/* Let the Assembler begin :-) */
