OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
24-Apr-2006 15:32:58
Branch: OpenSSL_0_9_7-stable Handle:
2006042414325503
Modified files: (Branch: OpenSSL_0_9_7-stable)
openssl Configure Makefile.org
openssl/util mk1mf.pl
Log:
Add new --with-baseaddr command line option to allow the
FIPS base address of
libeay32.dll to be explicitly specified.
Summary:
Revision Changes Path
1.314.2.132 +6 -0 openssl/Configure
1.154.2.113 +5 -0 openssl/Makefile.org
1.41.2.29 +6 -1 openssl/util/mk1mf.pl
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/Configure
============================================================
================
$ cvs diff -u -r1.314.2.131 -r1.314.2.132 Configure
--- openssl/Configure 3 Apr 2006 09:15:27
-0000 1.314.2.131
+++ openssl/Configure 24 Apr 2006 13:32:55
-0000 1.314.2.132
-622,6 +622,7
my $exe_ext="";
my $install_prefix="";
my $fipslibdir="/usr/local/ssl/lib";
+my $baseaddr="0xFB00000";
my $no_threads=0;
my $no_shared=1;
my $zlib=0;
-874,6 +875,10
{
$fipslibdir="$1";
}
+ elsif (/^--with-baseaddr=(.*)$/)
+ {
+ $baseaddr="$1";
+ }
elsif (/^--with-zlib-include=(.*)$/)
{
$withargs{"zlib-include"}="-I$1"
;
-1339,6 +1344,7
s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
+ s/^BASEADDR=.*/BASEADDR=$baseaddr/;
s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-inclu
de"}/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
.
patch -p0 <<' .'
Index: openssl/Makefile.org
============================================================
================
$ cvs diff -u -r1.154.2.112 -r1.154.2.113 Makefile.org
--- openssl/Makefile.org 28 Mar 2006 12:10:35
-0000 1.154.2.112
+++ openssl/Makefile.org 24 Apr 2006 13:32:57
-0000 1.154.2.113
-185,6 +185,11
FIPSLIBDIR=/usr/local/ssl/lib
+# Shared library base address. Currently only used on
Windows.
+#
+
+BASEADDR=
+
# When we're prepared to use shared libraries in the
programs we link here
# we might set SHLIB_MARK to '$(SHARED_LIBS)'.
SHLIB_MARK=
.
patch -p0 <<' .'
Index: openssl/util/mk1mf.pl
============================================================
================
$ cvs diff -u -r1.41.2.28 -r1.41.2.29 mk1mf.pl
--- openssl/util/mk1mf.pl 8 Feb 2006 00:47:30
-0000 1.41.2.28
+++ openssl/util/mk1mf.pl 24 Apr 2006 13:32:58
-0000 1.41.2.29
-19,6 +19,7
my $fips_sha1_exe_path = "";
my $fipslibdir = "";
+my $baseaddr = "";
my $ex_l_libs = "";
-362,6 +363,9
if ($key eq "FIPSLIBDIR")
{ $fipslibdir=$val;}
+ if ($key eq "BASEADDR")
+ { $baseaddr=$val;}
+
if (!($_=<IN>))
{ $_="RELATIVE_DIRECTORY=FINISHED\n"; }
}
-514,6 +518,7
E_PREMAIN_DSO=fips_premain_dso
FIPSLIB_D=$fipslibdir
+BASEADDR=$baseaddr
FIPS_PREMAIN_SRC=$fips_premain_c_path
O_FIPSCANISTER=$fips_canister_path
FIPS_SHA1_EXE=$fips_sha1_exe_path
-783,7 +788,7
$rules.= &do_lib_rule("\$(CRYPTOOBJ)
\$(O_FIPSCANISTER)",
"\$(O_CRYPTO)",
"$crypto",
- $shlib, "\$(SO_CRYPTO)",
"0xFB00000");
+ $shlib, "\$(SO_CRYPTO)",
"\$(BASEADDR)");
}
else
{
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|