From: Richard Levitte <levitte@openssl.org>
Date: Mon, 30 May 2005 22:26:22 +0000 (+0000)
Subject: Synchronise with Unixly build
X-Git-Tag: FIPS_TEST_9~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb1bbb327422adeb6858434d2e949b7bfe373ba5;p=oweals%2Fopenssl.git

Synchronise with Unixly build
---

diff --git a/fips/fips-lib.com b/fips/fips-lib.com
index 7bf4f93a0b..5fa68b46e4 100644
--- a/fips/fips-lib.com
+++ b/fips/fips-lib.com
@@ -75,7 +75,7 @@ $ ENDIF
 $!
 $! Define The Different Encryption Types.
 $!
-$ ENCRYPT_TYPES = "Basic,SHA1,RAND,DES,AES,DSA,RSA,DH,HMAC"
+$ ENCRYPT_TYPES = "Basic,SHA,RAND,DES,AES,DSA,RSA,DH,HMAC"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -151,7 +151,7 @@ $!
 $! Define The Different Encryption "library" Strings.
 $!
 $ LIB_ = "fips,fips_err_wrapper"
-$ LIB_SHA1 = "fips_sha1dgst,fips_sha1_selftest,fips_sha256,fips_sha512"
+$ LIB_SHA = "fips_sha1dgst,fips_sha1_selftest,fips_sha256,fips_sha512"
 $ LIB_RAND = "fips_rand,fips_rand_selftest"
 $ LIB_DES = "fips_des_enc,fips_des_selftest,fips_set_key"
 $ LIB_AES = "fips_aes_core,fips_aes_selftest"
diff --git a/fips/install.com b/fips/install.com
index aa19f0599d..8867fcf4c0 100644
--- a/fips/install.com
+++ b/fips/install.com
@@ -26,14 +26,16 @@ $	IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
 $	IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
 	   CREATE/DIR/LOG WRK_SSLINCLUDE:
 $
-$	FDIRS := ,RAND,SHA1,DES,AES,DSA,RSA
+$	FDIRS := ,RAND,SHA1,DES,AES,DSA,RSA,DH,HMAC
 $	EXHEADER_ := fips.h
-$	EXHEADER_SHA1 :=
+$	EXHEADER_SHA := fips_sha.h
 $	EXHEADER_RAND := fips_rand.h
 $	EXHEADER_DES :=
 $	EXHEADER_AES :=
 $	EXHEADER_DSA :=
 $	EXHEADER_RSA :=
+$	EXHEADER_DH :=
+$	EXHEADER_HMAC :=
 $
 $	I = 0
 $ LOOP_FDIRS: 
diff --git a/makevms.com b/makevms.com
index 9a8304f46e..18646cbbed 100755
--- a/makevms.com
+++ b/makevms.com
@@ -482,14 +482,16 @@ $ COPY SYS$DISK:[.SSL]'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL]
 $!
 $! Copy All The ".H" Files From The [.FIPS] Directories.
 $!
-$ FDIRS := ,SHA1,RAND,DES,AES,DSA,RSA
+$ FDIRS := ,SHA,RAND,DES,AES,DSA,RSA,DH,HMAC
 $ EXHEADER_ := fips.h
-$ EXHEADER_SHA1 := fips_sha.h
+$ EXHEADER_SHA := fips_sha.h
 $ EXHEADER_RAND := fips_rand.h
 $ EXHEADER_DES :=
 $ EXHEADER_AES :=
 $ EXHEADER_DSA :=
 $ EXHEADER_RSA :=
+$ EXHEADER_DH :=
+$ EXHEADER_HMAC :=
 $
 $ I = 0
 $ LOOP_FDIRS: