From 820a20ea2b5f97e4a8fb714fedf33edafd40740a Mon Sep 17 00:00:00 2001
From: beck <>
Date: Fri, 7 Jun 2002 03:45:34 +0000
Subject: Merge OpenSSL 0.9.7-stable-20020605, correctly autogenerate obj_mac.h

---
 src/lib/libcrypto/engine/Makefile.ssl  |  2 +-
 src/lib/libcrypto/engine/hw_4758_cca.c | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/lib/libcrypto/engine')

diff --git a/src/lib/libcrypto/engine/Makefile.ssl b/src/lib/libcrypto/engine/Makefile.ssl
index 5172028f93..8ee3b7d2dd 100644
--- a/src/lib/libcrypto/engine/Makefile.ssl
+++ b/src/lib/libcrypto/engine/Makefile.ssl
@@ -74,7 +74,7 @@ tags:
 
 errors:
 	$(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \
-		-nostatic -staticloader -write hw_*.c; \
+		-nostatic -staticloader -write hw_*.c
 
 tests:
 
diff --git a/src/lib/libcrypto/engine/hw_4758_cca.c b/src/lib/libcrypto/engine/hw_4758_cca.c
index 959d8f1a61..77d3d2ffdf 100644
--- a/src/lib/libcrypto/engine/hw_4758_cca.c
+++ b/src/lib/libcrypto/engine/hw_4758_cca.c
@@ -287,13 +287,13 @@ err:
 		DSO_free(dso);
 	dso = NULL;
 
-	keyRecordRead = (F_KEYRECORDREAD)NULL;
-	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL;
-	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL;
-	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL;
-	publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL;
-	pkaEncrypt = (F_PKAENCRYPT)NULL;
-	pkaDecrypt = (F_PKADECRYPT)NULL;
+	keyRecordRead = (F_KEYRECORDREAD)0;
+	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
+	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
+	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
+	publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
+	pkaEncrypt = (F_PKAENCRYPT)0;
+	pkaDecrypt = (F_PKADECRYPT)0;
 	return 0;
 	}
 
@@ -312,13 +312,13 @@ static int ibm_4758_cca_finish(ENGINE *e)
 		return 0;
 		}
 	dso = NULL;
-	keyRecordRead = (F_KEYRECORDREAD)NULL;
-	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)NULL;
-	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)NULL;
-	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)NULL;
-	publicKeyExtract = (F_PUBLICKEYEXTRACT)NULL;
-	pkaEncrypt = (F_PKAENCRYPT)NULL;
-	pkaDecrypt = (F_PKADECRYPT)NULL;
+	keyRecordRead = (F_KEYRECORDREAD)0;
+	randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
+	digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
+	digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
+	publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
+	pkaEncrypt = (F_PKAENCRYPT)0;
+	pkaDecrypt = (F_PKADECRYPT)0;
 	return 1;
 	}
 
-- 
cgit v1.2.3-55-g6feb