-----BEGIN PGP SIGNED MESSAGE-----
At 16:29 23.04.99 +0200, you wrote:
>Since there seems to be mostly agreement to the change to
><openssl/*.h> (including a "Yes, please!!!" sent via private mail -
:),
>I'll commit the appropriate changes tonight unless somone vetoes
very
>quickly. In addition to the actual #includes, many Makefile.ssl's
>need a tiny change, Makefile.org needs a couple of tiny changes; so
>does mk1mf.pl
BTW:
I messed a little with the makefile generation for M$
allowing to select between multi and single threading.
(and added code for BounceChecker...)
Perhaps I'll find why dll don't work...
Index: mk1mf.pl
===================================================================
RCS file: /usr/pcshare/tc//cvsroot/openssl/util/mk1mf.pl,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 mk1mf.pl
*** mk1mf.pl 1999/04/07 15:09:32 1.1.2.1
- --- mk1mf.pl 1999/04/23 13:39:19
***************
*** 28,33 ****
- --- 28,35 ----
);
$platform="";
+ $multithread=0;
+
foreach (@ARGV)
{
if (/^no-rc2$/) { $no_rc2=1; }
***************
*** 60,65 ****
- --- 62,69 ----
elsif (/^rsaref$/) { $rsaref=1; }
elsif (/^gcc$/) { $gcc=1; }
elsif (/^debug$/) { $debug=1; }
+ elsif (/^debugbc$/) { $debug=1; $bcheck=1; }
+ elsif (/^multithread$/) { $multithread=1; }
elsif (/^shlib$/) { $shlib=1; }
elsif (/^dll$/) { $shlib=1; }
elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
***************
*** 88,93 ****
- --- 92,99 ----
no-err - No error strings
dll/shlib - Build shared libraries (MS)
debug - Debug build
+ debugbc - Debug build with BoundsChecker(TM)
+(MS)
+ multithread - Multithreaded (MS)
gcc - Use Gcc (unix)
rsaref - Build to require RSAref
***************
*** 128,178 ****
- --- 134,194 ----
# $bin_dir.=$o causes a core dump on my sparc :-(
$NT=0;
+ $microsoft=0;
+ $outaddms="";
push(@INC,"util/pl","pl");
if ($platform eq "VC-MSDOS")
{
$asmbits=16;
$msdos=1;
+ $microsoft=1;
require 'VC-16.pl';
}
elsif ($platform eq "VC-W31-16")
{
$asmbits=16;
$msdos=1; $win16=1;
+ $microsoft=1;
require 'VC-16.pl';
}
elsif (($platform eq "VC-W31-32") || ($platform eq "VC-WIN16"))
{
$asmbits=32;
$msdos=1; $win16=1;
+ $microsoft=1;
require 'VC-16.pl';
}
elsif (($platform eq "VC-WIN32") || ($platform eq "VC-NT"))
{
$NT = 1 if $platform eq "VC-NT";
+ $microsoft=1;
require 'VC-32.pl';
}
elsif ($platform eq "BC-NT")
{
$bc=1;
+ $microsoft=1;
require 'BC-32.pl';
}
elsif ($platform eq "BC-W31")
{
$bc=1;
$msdos=1; $w16=1;
+ $microsoft=1;
require 'BC-16.pl';
}
elsif ($platform eq "BC-Q16")
{
$msdos=1; $w16=1; $shlib=0; $qw=1;
+ $microsoft=1;
require 'BC-16.pl';
}
elsif ($platform eq "BC-MSDOS")
{
$asmbits=16;
$msdos=1;
+ $microsoft=1;
require 'BC-16.pl';
}
elsif ($platform eq "FreeBSD")
***************
*** 200,209 ****
$cflags.=' -DTERMIO';
}
!
$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":
"");
!
$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":
"");
$inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
- -
$bin_dir=$bin_dir.$o unless ((substr($bin_dir,-1,1) eq $o) ||
($bin_dir eq ''));
$cflags.=" -DNO_IDEA" if $no_idea;
- --- 216,241 ----
$cflags.=' -DTERMIO';
}
! # BoundsChecker for MS
! if ($bcheck > 0)
! {
! $cc = 'nmcl.exe';
! $link = 'nmlink.exe';
! $ex_libs.= ' BCINTERF.LIB';
! }
!
! if ($microsoft > 0)
! {
!
$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?"dbg":"
").($bcheck?"bc":"").($multithread?"MT":"");
!
$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?"dbg":"
").($bcheck?"bc":"").($multithread?"MT":"");
! $cflags.=$outaddms.$out_dir."/OpenSSL" if !$outaddms eq "";
! }
! else
! {
!
$out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":
"");
!
$tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":
"");
! }
$inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
$bin_dir=$bin_dir.$o unless ((substr($bin_dir,-1,1) eq $o) ||
($bin_dir eq ''));
$cflags.=" -DNO_IDEA" if $no_idea;
Index: pl/VC-32.pl
===================================================================
RCS file: /usr/pcshare/tc//cvsroot/openssl/util/pl/VC-32.pl,v
retrieving revision 1.1.2.1
diff -c -r1.1.2.1 VC-32.pl
*** VC-32.pl 1999/04/07 15:09:34 1.1.2.1
- --- VC-32.pl 1999/04/23 13:33:02
***************
*** 12,19 ****
# C compiler stuff
$cc='cl';
! $cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32
- -DWIN32_LEAN_AND_MEAN -DL_ENDIAN';
! $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
$mlflags='';
$out_def="out32";
- --- 12,20 ----
# C compiler stuff
$cc='cl';
! #$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -
DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN';
! $cflags=' /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -
DWIN32_LEAN_AND_MEAN -DL_ENDIAN';
! $lflags=" /nologo /subsystem:console /machine:I386 /opt:ref";
$mlflags='';
$out_def="out32";
***************
*** 22,33 ****
if ($debug)
{
! $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -
D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG";
$lflags.=" /debug";
$mlflags.=' /debug';
}
$cflags .= " -DWINNT" if $NT == 1;
$obj='.obj';
$ofile="/Fo";
- --- 23,37 ----
if ($debug)
{
! # $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -
D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG";
! $cflags=" /W3 /WX /Zi /Yd /Od /nologo -DWINDOWS -DWIN32 -D_DEBUG -
DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG";
$lflags.=" /debug";
$mlflags.=' /debug';
}
$cflags .= " -DWINNT" if $NT == 1;
+ $cflags.=" /M".($multithread?"D":"L").($debug?"d":"");
+
$obj='.obj';
$ofile="/Fo";
***************
*** 93,99 ****
$tmp_def="tmp32dll";
}
! $cflags.=" /Fd$out_def";
sub do_lib_rule
{
- --- 97,104 ----
$tmp_def="tmp32dll";
}
! $outaddms=" /Fd";
! #$cflags.=" /Fd$out_def";
sub do_lib_rule
{
And here is my do_ms.bat:
perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl VC-MSDOS no-sock >ms\msdos.mak
rem perl util\mk1mf.pl VC-W31-32 >ms\w31.mak
rem perl util\mk1mf.pl VC-W31-32 dll >ms\w31dll.mak
perl util\mk1mf.pl VC-WIN32 no-asm >ms\nt.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm dll >ms\ntdll.mak
perl util\mk1mf.pl VC-WIN32 no-asm debug >ms\ntdbg.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm debug dll >ms\ntdbgdll.mak
perl util\mk1mf.pl VC-WIN32 no-asm debugbc >ms\ntdbgbc.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm debugbc dll >ms\ntdbgbcdll.mak
perl util\mk1mf.pl VC-WIN32 no-asm multithread >ms\nt.m.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm multithread dll
>ms\ntdll.m.mak
perl util\mk1mf.pl VC-WIN32 no-asm multithread debug >ms\ntdbg.m.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm multithread debug dll
>ms\ntdbgdll.m.mak
perl util\mk1mf.pl VC-WIN32 no-asm multithread debugbc
>ms\ntdbgbc.m.mak
rem perl util\mk1mf.pl VC-WIN32 no-asm multithread debugbc dll
>ms\ntdbgbcdll.m.mak
perl util\mkdef.pl 16 libeay > ms\libeay16.def
perl util\mkdef.pl 32 libeay > ms\libeay32.def
perl util\mkdef.pl 16 ssleay > ms\ssleay16.def
perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
hope it helps...
By
Goetz
-----BEGIN PGP SIGNATURE-----
Version: PGP for Personal Privacy 5.0ic
Charset: noconv
iQEVAwUBNyCmQ8ApCwQ4XNEHAQFQDwgAojE8IMm8vBiYnqofbwpoLL1qqAghA1bg
vyitH/wDJKpQhyGMD0pCdiLOL1V/1V3krR7uQ++ak9xyc6269ymDFQC1DcLd5EhI
yBugZG0Shze73kRL/pNdyL1kx0+EUI+GgLBZyGlIB3lTh9t8lMEEG++YjYnTAetN
EwzQA2Jpxq1ynf6ckUyiuAfbMcj2kXDBQCWPqdQCSTrjcd1AESMD1INj2DleOSX1
DspCwQSv55JNhJvEBIftvtkxxs49CvnRqx7xQMkb8MCCgizAiKPxfQciVWHOh7YB
KkId+39foxmpJE5YfEKR5l3U++xdJsEKqc5Lqh5zMOLbYE+GLhRdAg==
=OC5P
-----END PGP SIGNATURE-----
--
Goetz Babin-Ebell mailto:[EMAIL PROTECTED]
TC Trust Center for Security http://www.trustcenter.de
in Data Networks GmbH Tel.: +49-40-766 29 3301
Am Werder 1 / 21073 Hamburg / Germany Fax.: +49-40-766 29 577
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
