Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

[CVS] OpenSSL: OpenSSL-fips-0_9_7-stable: openssl/ Configure Makefile....: msg#00025

encryption.openssl.cvs

Subject: [CVS] OpenSSL: OpenSSL-fips-0_9_7-stable: openssl/ Configure Makefile....

OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________________________

Server: cvs.openssl.org Name: Richard Levitte
Root: /e/openssl/cvs Email: levitte@xxxxxxxxxxx
Module: openssl Date: 11-Aug-2003 12:24:53
Branch: OpenSSL-fips-0_9_7-stable Handle: 2003081111244705

Modified files: (Branch: OpenSSL-fips-0_9_7-stable)
openssl Configure Makefile.org
openssl/apps Makefile.ssl
openssl/crypto/sha sha1dgst.c
openssl/fips Makefile.ssl
openssl/fips/aes Makefile.ssl
openssl/fips/des Makefile.ssl fingerprint.sha1
openssl/fips/sha1 Makefile.ssl
openssl/test Makefile.ssl
openssl/util libeay.num

Log:
- Add a configuration keyword "fips" to compile with FIPS
implementations.
- Reorder the build so the standalone FIPS SHA1 checker is built
first.
- Add necessary defines to avoid symbol clashes between FIPS and
non-FIPS implementations.
- Change necessary signatures.
- Correct bugs in FIPS build Makefiles.
- make update

Summary:
Revision Changes Path
1.314.2.85.2.1+9 -1 openssl/Configure
1.154.2.71.2.1+2 -2 openssl/Makefile.org
1.100.2.23.2.1+1 -1 openssl/apps/Makefile.ssl
1.21.8.1 +7 -0 openssl/crypto/sha/sha1dgst.c
1.1.2.5.2.1 +3 -2 openssl/fips/Makefile.ssl
1.1.2.4.2.1 +1 -1 openssl/fips/aes/Makefile.ssl
1.1.2.2.2.1 +1 -1 openssl/fips/des/Makefile.ssl
1.1.2.1.2.1 +1 -1 openssl/fips/des/fingerprint.sha1
1.1.2.2.2.1 +11 -8 openssl/fips/sha1/Makefile.ssl
1.84.2.30.2.1+62 -34 openssl/test/Makefile.ssl
1.173.2.15.2.1+3 -3 openssl/util/libeay.num
____________________________________________________________________________

patch -p0 <<'@@ .'
Index: openssl/Configure
============================================================================
$ cvs diff -u -r1.314.2.85 -r1.314.2.85.2.1 Configure
--- openssl/Configure 27 Jul 2003 17:00:09 -0000 1.314.2.85
+++ openssl/Configure 11 Aug 2003 10:24:47 -0000 1.314.2.85.2.1
@@ -630,6 +630,7 @@
my $processor="";
my $default_ranlib;
my $perl;
+my $fips=0;

my $no_ssl2=0;
my $no_ssl3=0;
@@ -803,6 +804,8 @@
}
elsif (/^386$/)
{ $processor=386; }
+ elsif (/^fips$/)
+ { $fips=1; }
elsif (/^rsaref$/)
{
# No RSAref support any more since it's not needed.
@@ -1138,7 +1141,12 @@

$bn_obj = $bn_asm unless $bn_obj ne "";

-$des_obj=$des_enc unless ($des_obj =~ /\.o$/);
+if ($fips)
+ {
+ $des_obj=$sha1_obj="";
+ $cflags.=" -DFIPS";
+ }
+$des_obj=$des_enc unless (!$fips && $des_obj =~ /\.o$/);
$bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
$cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/);
$rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/);
@@ .
patch -p0 <<'@@ .'
Index: openssl/Makefile.org
============================================================================
$ cvs diff -u -r1.154.2.71 -r1.154.2.71.2.1 Makefile.org
--- openssl/Makefile.org 31 Jul 2003 21:30:07 -0000 1.154.2.71
+++ openssl/Makefile.org 11 Aug 2003 10:24:47 -0000 1.154.2.71.2.1
@@ -173,7 +173,7 @@
# we might set SHLIB_MARK to '$(SHARED_LIBS)'.
SHLIB_MARK=

-DIRS= crypto fips ssl $(SHLIB_MARK) apps test tools
+DIRS= fips crypto ssl $(SHLIB_MARK) apps test tools
SHLIBDIRS= fips crypto ssl

# dirs in crypto to build
@@ -184,7 +184,7 @@
buffer bio stack lhash rand err \
evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

-FDIRS= rand sha1 des aes dsa
+FDIRS= sha1 rand des aes dsa

# tests to perform. "alltests" is a special word indicating that all tests
# should be performed.
@@ .
patch -p0 <<'@@ .'
Index: openssl/apps/Makefile.ssl
============================================================================
$ cvs diff -u -r1.100.2.23 -r1.100.2.23.2.1 Makefile.ssl
--- openssl/apps/Makefile.ssl 9 Apr 2003 06:50:39 -0000 1.100.2.23
+++ openssl/apps/Makefile.ssl 11 Aug 2003 10:24:48 -0000 1.100.2.23.2.1
@@ -145,7 +145,7 @@

$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
$(RM) $(PROGRAM)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS)
$(DLIBSSL) $(LIBKRB5) $(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ .
patch -p0 <<'@@ .'
Index: openssl/crypto/sha/sha1dgst.c
============================================================================
$ cvs diff -u -r1.21 -r1.21.8.1 sha1dgst.c
--- openssl/crypto/sha/sha1dgst.c 19 Feb 2001 16:02:36 -0000 1.21
+++ openssl/crypto/sha/sha1dgst.c 11 Aug 2003 10:24:49 -0000 1.21.8.1
@@ -63,11 +63,18 @@

#include <openssl/opensslv.h>

+#ifndef FIPS
const char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;

/* The implementation is in ../md32_common.h */

#include "sha_locl.h"
+
+#else /* ndef FIPS */
+
+static void *dummy=&dummy;
+
+#endif /* ndef FIPS */

#endif

@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/Makefile.ssl
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.5.2.1 Makefile.ssl
--- openssl/fips/Makefile.ssl 4 Aug 2003 13:26:12 -0000 1.1.2.5
+++ openssl/fips/Makefile.ssl 11 Aug 2003 10:24:50 -0000 1.1.2.5.2.1
@@ -26,7 +26,7 @@

LIBS=

-FDIRS=rand sha1 des aes dsa
+FDIRS=sha1 rand des aes dsa

GENERAL=Makefile README fips-lib.com install.com

@@ -45,7 +45,8 @@
top:
@(cd ..; $(MAKE) DIRS=$(DIR) all)

-all: check lib subdirs shared
+all: subdirs lib check shared
+ ls -l $(LIB) $(LIBOBJ)

check:
TOP=`pwd`/$(TOP) ./fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/aes/Makefile.ssl
============================================================================
$ cvs diff -u -r1.1.2.4 -r1.1.2.4.2.1 Makefile.ssl
--- openssl/fips/aes/Makefile.ssl 30 Jul 2003 18:30:11 -0000 1.1.2.4
+++ openssl/fips/aes/Makefile.ssl 11 Aug 2003 10:24:50 -0000
1.1.2.4.2.1
@@ -36,7 +36,7 @@
top:
(cd ../..; $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)

-all: check lib fips_aesavs
+all: check lib

check:
TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/des/Makefile.ssl
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.2.2.1 Makefile.ssl
--- openssl/fips/des/Makefile.ssl 4 Aug 2003 13:26:13 -0000 1.1.2.2
+++ openssl/fips/des/Makefile.ssl 11 Aug 2003 10:24:51 -0000
1.1.2.2.2.1
@@ -19,7 +19,7 @@
CFLAGS= $(INCLUDES) $(CFLAG) -g

GENERAL=Makefile
-TEST=
+TEST= fips_desmovs.c
APPS=

LIB=$(TOP)/libcrypto.a
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/des/fingerprint.sha1
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.1.2.1 fingerprint.sha1
--- openssl/fips/des/fingerprint.sha1 30 Jul 2003 18:30:12 -0000 1.1.2.1
+++ openssl/fips/des/fingerprint.sha1 11 Aug 2003 10:24:51 -0000
1.1.2.1.2.1
@@ -1,2 +1,2 @@
-SHA1(fips_des_enc.c)= 1661dde9506404376f9565d8c6f49c205a468995
+SHA1(fips_des_enc.c)= a4b88bb16782604a298d74de04a8b3bc3a204c5a
SHA1(fips_des_locl.h)= 5e5128f074485e72d6fdee00d22d46a694bd5abe
@@ .
patch -p0 <<'@@ .'
Index: openssl/fips/sha1/Makefile.ssl
============================================================================
$ cvs diff -u -r1.1.2.2 -r1.1.2.2.2.1 Makefile.ssl
--- openssl/fips/sha1/Makefile.ssl 4 Aug 2003 13:26:13 -0000 1.1.2.2
+++ openssl/fips/sha1/Makefile.ssl 11 Aug 2003 10:24:51 -0000
1.1.2.2.2.1
@@ -21,12 +21,13 @@
GENERAL=Makefile
TEST= fips_sha1test.c sha1vectors.txt sha1hashes.txt
APPS=
+EXE= fips_standalone_sha1

LIB=$(TOP)/libcrypto.a
LIBSRC=fips_sha1dgst.c
LIBOBJ=fips_sha1dgst.o

-SRC= $(LIBSRC)
+SRC= $(LIBSRC) fips_standalone_sha1.c

EXHEADER=
HEADER= $(EXHEADER) fips_sha_locl.h fips_md32_common.h
@@ -36,10 +37,10 @@
top:
(cd ../..; $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)

-all: check lib fips_standalone_sha1
+all: fips_standalone_sha1 check lib

check:
- TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
+ TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(LIBSRC) $(HEADER)

lib: $(LIBOBJ)
$(AR) $(LIB) $(LIBOBJ)
@@ -49,9 +50,7 @@
fips_standalone_sha1: fips_standalone_sha1.o fips_sha1dgst.o
$(CC) -o fips_standalone_sha1 $(CFLAGS) fips_standalone_sha1.o \
fips_sha1dgst.o
- TOP=`pwd`/$(TOP) ../fips_check_sha1 standalone.sha1 \
- fips_standalone_sha1.c fips_sha1dgst.c fips_sha_locl.h \
- fips_md32_common.h
+ TOP=`pwd`/$(TOP) ../fips_check_sha1 standalone.sha1 $(SRC) $(HEADER)

files:
$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -78,14 +77,18 @@
lint -DLINT $(INCLUDES) $(SRC)>fluff

depend:
- $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+ $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(SRC)

dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}'
$(MAKEFILE) >Makefile.new
mv -f Makefile.new $(MAKEFILE)

clean:
- rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+ rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
+
# DO NOT DELETE THIS LINE -- make depend depends on it.

fips_sha1dgst.o: ../../include/openssl/opensslv.h fips_sha1dgst.c
+fips_standalone_sha1.o: ../../include/openssl/e_os2.h
+fips_standalone_sha1.o: ../../include/openssl/opensslconf.h
+fips_standalone_sha1.o: ../../include/openssl/sha.h fips_standalone_sha1.c
@@ .
patch -p0 <<'@@ .'
Index: openssl/test/Makefile.ssl
============================================================================
$ cvs diff -u -r1.84.2.30 -r1.84.2.30.2.1 Makefile.ssl
--- openssl/test/Makefile.ssl 28 Jul 2003 15:08:00 -0000 1.84.2.30
+++ openssl/test/Makefile.ssl 11 Aug 2003 10:24:52 -0000 1.84.2.30.2.1
@@ -53,6 +53,7 @@
BFTEST= bftest
CASTTEST= casttest
DESTEST= destest
+FIPS_DESTEST= fips_desmovs
RANDTEST= randtest
FIPS_RANDTEST= fips_randtest
DHTEST= dhtest
@@ -69,7 +70,7 @@

EXE= $(BNTEST) $(ECTEST) $(IDEATEST) $(MD2TEST) $(MD4TEST) $(MD5TEST)
$(HMACTEST) \
$(RC2TEST) $(RC4TEST) $(RC5TEST) \
- $(DESTEST) $(SHATEST) $(SHA1TEST) $(FIPS_SHA1TEST) $(MDC2TEST)
$(RMDTEST) \
+ $(DESTEST) $(FIPS_DESTEST) $(SHATEST) $(SHA1TEST) $(FIPS_SHA1TEST)
$(MDC2TEST) $(RMDTEST) \
$(RANDTEST) $(FIPS_RANDTEST) $(DHTEST) $(ENGINETEST) \
$(BFTEST) $(CASTTEST) $(SSLTEST) $(EXPTEST) $(DSATEST) $(FIPS_DSATEST)
$(RSATEST) \
$(EVPTEST) $(FIPS_AESTEST)
@@ -79,14 +80,14 @@
OBJ= $(BNTEST).o $(ECTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o
$(MD5TEST).o \
$(HMACTEST).o \
$(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
- $(DESTEST).o $(SHATEST).o $(SHA1TEST).o $(FIPS_SHA1TEST).o
$(MDC2TEST).o $(RMDTEST).o \
+ $(DESTEST).o $(FIPS_DESTEST).o $(SHATEST).o $(SHA1TEST).o
$(FIPS_SHA1TEST).o $(MDC2TEST).o $(RMDTEST).o \
$(RANDTEST).o $(FIPS_RANDTEST).o $(DHTEST).o $(ENGINETEST).o
$(CASTTEST).o \
$(BFTEST).o $(SSLTEST).o $(DSATEST).o $(FIPS_DSATEST).o $(EXPTEST).o
$(RSATEST).o \
$(EVPTEST).o $(FIPS_AESTEST).o
SRC= $(BNTEST).c $(ECTEST).c $(IDEATEST).c $(MD2TEST).c $(MD4TEST).c
$(MD5TEST).c \
$(HMACTEST).c \
$(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
- $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(FIPS_SHA1TEST).c
$(MDC2TEST).c $(RMDTEST).c \
+ $(DESTEST).c $(FIPS_DESTEST).c $(SHATEST).c $(SHA1TEST).c
$(FIPS_SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
$(RANDTEST).c $(FIPS_RANDTEST).c $(DHTEST).c $(ENGINETEST).c
$(CASTTEST).c \
$(BFTEST).c $(SSLTEST).c $(DSATEST).c $(FIPS_DSATEST).c $(EXPTEST).c
$(RSATEST).c \
$(EVPTEST).c $(FIPS_AESTEST).c
@@ -309,7 +310,7 @@
fi

$(RSATEST): $(RSATEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RSATEST) $(CFLAGS) $(RSATEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -317,7 +318,7 @@
fi

$(BNTEST): $(BNTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(BNTEST) $(CFLAGS) $(BNTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -325,7 +326,7 @@
fi

$(ECTEST): $(ECTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(ECTEST) $(CFLAGS) $(ECTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -333,7 +334,7 @@
fi

$(EXPTEST): $(EXPTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(EXPTEST) $(CFLAGS) $(EXPTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -341,7 +342,7 @@
fi

$(IDEATEST): $(IDEATEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(IDEATEST) $(CFLAGS) $(IDEATEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -349,7 +350,7 @@
fi

$(MD2TEST): $(MD2TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(MD2TEST) $(CFLAGS) $(MD2TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -357,7 +358,7 @@
fi

$(SHATEST): $(SHATEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(SHATEST) $(CFLAGS) $(SHATEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -365,7 +366,7 @@
fi

$(SHA1TEST): $(SHA1TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(SHA1TEST) $(CFLAGS) $(SHA1TEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -373,14 +374,14 @@
fi

$(FIPS_SHA1TEST): $(FIPS_SHA1TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(FIPS_SHA1TEST) $(CFLAGS) $(FIPS_SHA1TEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
$(CC) -o $(FIPS_SHA1TEST) $(CFLAGS) $(FIPS_SHA1TEST).o $(PEX_LIBS)
$(LIBCRYPTO) $(EX_LIBS) ; \
fi

$(RMDTEST): $(RMDTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RMDTEST) $(CFLAGS) $(RMDTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -388,7 +389,7 @@
fi

$(MDC2TEST): $(MDC2TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(MDC2TEST) $(CFLAGS) $(MDC2TEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -396,7 +397,7 @@
fi

$(MD4TEST): $(MD4TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(MD4TEST) $(CFLAGS) $(MD4TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -404,7 +405,7 @@
fi

$(MD5TEST): $(MD5TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(MD5TEST) $(CFLAGS) $(MD5TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -412,7 +413,7 @@
fi

$(HMACTEST): $(HMACTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(HMACTEST) $(CFLAGS) $(HMACTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -420,7 +421,7 @@
fi

$(RC2TEST): $(RC2TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RC2TEST) $(CFLAGS) $(RC2TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -428,7 +429,7 @@
fi

$(BFTEST): $(BFTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(BFTEST) $(CFLAGS) $(BFTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -436,7 +437,7 @@
fi

$(CASTTEST): $(CASTTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(CASTTEST) $(CFLAGS) $(CASTTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -444,7 +445,7 @@
fi

$(RC4TEST): $(RC4TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RC4TEST) $(CFLAGS) $(RC4TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -452,7 +453,7 @@
fi

$(RC5TEST): $(RC5TEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RC5TEST) $(CFLAGS) $(RC5TEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -460,15 +461,23 @@
fi

$(DESTEST): $(DESTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
$(CC) -o $(DESTEST) $(CFLAGS) $(DESTEST).o $(PEX_LIBS) $(LIBCRYPTO)
$(EX_LIBS) ; \
fi

+$(FIPS_DESTEST): $(FIPS_DESTEST).o $(DLIBCRYPTO)
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
+ $(CC) -o $(FIPS_DESTEST) $(CFLAGS) $(FIPS_DESTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
+ else \
+ LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
+ $(CC) -o $(FIPS_DESTEST) $(CFLAGS) $(FIPS_DESTEST).o $(PEX_LIBS)
$(LIBCRYPTO) $(EX_LIBS) ; \
+ fi
+
$(RANDTEST): $(RANDTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(RANDTEST) $(CFLAGS) $(RANDTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -476,14 +485,14 @@
fi

$(FIPS_RANDTEST): $(FIPS_RANDTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(FIPS_RANDTEST) $(CFLAGS) $(FIPS_RANDTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
$(CC) -o $(FIPS_RANDTEST) $(CFLAGS) $(FIPS_RANDTEST).o $(PEX_LIBS)
$(LIBCRYPTO) $(EX_LIBS) ; \
fi

$(DHTEST): $(DHTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(DHTEST) $(CFLAGS) $(DHTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -491,7 +500,7 @@
fi

$(DSATEST): $(DSATEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(DSATEST) $(CFLAGS) $(DSATEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -499,14 +508,14 @@
fi

$(FIPS_DSATEST): $(FIPS_DSATEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(FIPS_DSATEST) $(CFLAGS) $(FIPS_DSATEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
$(CC) -o $(FIPS_DSATEST) $(CFLAGS) $(FIPS_DSATEST).o $(PEX_LIBS)
$(LIBCRYPTO) $(EX_LIBS) ; \
fi

$(METHTEST): $(METHTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(METHTEST) $(CFLAGS) $(METHTEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -514,7 +523,7 @@
fi

$(SSLTEST): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(SSLTEST) $(CFLAGS) $(SSLTEST).o $(PEX_LIBS) $(DLIBSSL)
$(LIBKRB5) $(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -522,7 +531,7 @@
fi

$(ENGINETEST): $(ENGINETEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(ENGINETEST) $(CFLAGS) $(ENGINETEST).o $(PEX_LIBS)
$(DLIBCRYPTO) $(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -530,7 +539,7 @@
fi

$(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o $(EVPTEST) $(CFLAGS) $(EVPTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -541,7 +550,7 @@
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c

#$(AESTEST): $(AESTEST).o $(DLIBCRYPTO)
-# if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+# if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
# $(CC) -o $(AESTEST) $(CFLAGS) $(AESTEST).o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
# else \
# LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -549,7 +558,7 @@
# fi

dummytest: dummytest.o $(DLIBCRYPTO)
- if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" ] ; then \
+ if [ "$(SHLIB_TARGET)" = "hpux-shared" -o "$(SHLIB_TARGET)" =
"darwin-shared" -o "$(SHLIB_TARGET)" = "" ] ; then \
$(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(DLIBCRYPTO)
$(EX_LIBS) ; \
else \
LD_LIBRARY_PATH=..:$$LD_LIBRARY_PATH \
@@ -671,6 +680,25 @@
fips_aesavs.o: ../include/openssl/sha.h ../include/openssl/stack.h
fips_aesavs.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
fips_aesavs.o: ../include/openssl/ui_compat.h fips_aesavs.c
+fips_desmovs.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+fips_desmovs.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
+fips_desmovs.o: ../include/openssl/bn.h ../include/openssl/cast.h
+fips_desmovs.o: ../include/openssl/crypto.h ../include/openssl/des.h
+fips_desmovs.o: ../include/openssl/des_old.h ../include/openssl/dh.h
+fips_desmovs.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_desmovs.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_desmovs.o: ../include/openssl/fips.h ../include/openssl/idea.h
+fips_desmovs.o: ../include/openssl/lhash.h ../include/openssl/md2.h
+fips_desmovs.o: ../include/openssl/md4.h ../include/openssl/md5.h
+fips_desmovs.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
+fips_desmovs.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips_desmovs.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips_desmovs.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+fips_desmovs.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+fips_desmovs.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_desmovs.o: ../include/openssl/sha.h ../include/openssl/stack.h
+fips_desmovs.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips_desmovs.o: ../include/openssl/ui_compat.h fips_desmovs.c
fips_dsatest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
fips_dsatest.o: ../include/openssl/bn.h ../include/openssl/crypto.h
fips_dsatest.o: ../include/openssl/des.h ../include/openssl/des_old.h
@@ .
patch -p0 <<'@@ .'
Index: openssl/util/libeay.num
============================================================================
$ cvs diff -u -r1.173.2.15 -r1.173.2.15.2.1 libeay.num
--- openssl/util/libeay.num 4 Aug 2003 13:26:14 -0000 1.173.2.15
+++ openssl/util/libeay.num 11 Aug 2003 10:24:52 -0000 1.173.2.15.2.1
@@ -2801,9 +2801,9 @@
BUF_strlcpy 3243 EXIST::FUNCTION:
OpenSSLDie 3244 EXIST::FUNCTION:
OPENSSL_cleanse 3245 EXIST::FUNCTION:
-EVP_cast5_cfb64 3246 EXIST::FUNCTION:CAST
-EVP_aes_128_cfb8 3247 EXIST::FUNCTION:AES
-ENGINE_setup_bsd_cryptodev 3248
EXIST:__FreeBSD__:FUNCTION:ENGINE
+ENGINE_setup_bsd_cryptodev 3246
EXIST:__FreeBSD__:FUNCTION:ENGINE
+EVP_cast5_cfb64 3247 EXIST::FUNCTION:CAST
+EVP_aes_128_cfb8 3248 EXIST::FUNCTION:AES
EVP_aes_256_cfb128 3249 EXIST::FUNCTION:AES
EVP_des_ede3_cfb64 3250 EXIST::FUNCTION:DES
EVP_aes_128_cfb1 3251 EXIST::FUNCTION:AES
@@ .
______________________________________________________________________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List openssl-cvs@xxxxxxxxxxx
Automated List Manager majordomo@xxxxxxxxxxx
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [CVS] OpenSSL: OpenSSL_0_9_7-stable: openssl/apps/ Makefile.ssl, Richard Levitte
Next by Date:  [CVS] OpenSSL: OpenSSL-fips-0_9_7-stable: openssl/fips/sha1/ standalon..., Richard Levitte
Previous by Thread:  [CVS] OpenSSL: OpenSSL_0_9_7-stable: openssl/apps/ Makefile.ssl, Richard Levitte
Next by Thread:  [CVS] OpenSSL: OpenSSL-fips-0_9_7-stable: openssl/fips/sha1/ standalon..., Richard Levitte
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
qnx.openqnx.dev...    gcc.libstdc++.c...    solaris.opensol...    information-ret...    misc.misterhous...    web.catalyst.ge...    apache.webservi...    redhat.release....    hardware.lirc/2...    kernel.autofs/2...    technology.sust...    linux.vdr/2003-...    editors.lyx.gen...    org.user-groups...    netbsd.devel.pk...    xdg.devel/2004-...    version-control...    jakarta.slide.d...    debian.packages...    creativecommons...    ports.ppc.embed...    bug-tracking.bu...   
Home | blog view | USPTO Patent Archive | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe