From cb7ad8e6800971ee3f2b6cd03d0231f7808b1082 Mon Sep 17 00:00:00 2001
From: markus <>
Date: Thu, 12 Sep 2002 20:53:15 +0000
Subject: import openssl-0.9.7-stable-SNAP-20020911 (without idea)

---
 src/lib/libcrypto/Makefile.ssl                   |  2 +-
 src/lib/libcrypto/des/Makefile.ssl               |  3 ++-
 src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c | 10 +++++-----
 src/lib/libcrypto/krb5/Makefile.ssl              | 10 +++++-----
 src/lib/libcrypto/ocsp/Makefile.ssl              | 10 +++++-----
 5 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/lib/libcrypto')

diff --git a/src/lib/libcrypto/Makefile.ssl b/src/lib/libcrypto/Makefile.ssl
index 8ac7016593..91e931a6ed 100644
--- a/src/lib/libcrypto/Makefile.ssl
+++ b/src/lib/libcrypto/Makefile.ssl
@@ -98,7 +98,7 @@ lib:	$(LIBOBJ)
 
 shared:
 	if [ -n "$(SHARED_LIBS)" ]; then \
-		(cd ..; make $(SHARED_LIB)); \
+		(cd ..; $(MAKE) $(SHARED_LIB)); \
 	fi
 
 libs:
diff --git a/src/lib/libcrypto/des/Makefile.ssl b/src/lib/libcrypto/des/Makefile.ssl
index 00e479dbd1..14baf7d0cc 100644
--- a/src/lib/libcrypto/des/Makefile.ssl
+++ b/src/lib/libcrypto/des/Makefile.ssl
@@ -207,7 +207,8 @@ ecb_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ecb_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 ecb_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ecb_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h ecb_enc.c spr.h
+ecb_enc.o: ../../include/openssl/ui_compat.h des_locl.h des_ver.h ecb_enc.c
+ecb_enc.o: spr.h
 ede_cbcm_enc.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 ede_cbcm_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
 ede_cbcm_enc.o: ../../include/openssl/opensslconf.h
diff --git a/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c b/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c
index f946389b8a..b8aab545db 100644
--- a/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c
+++ b/src/lib/libcrypto/engine/hw_openbsd_dev_crypto.c
@@ -408,7 +408,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len)
     cryp.op=COP_ENCRYPT;/* required to do the MAC rather than check it */
     cryp.len=len;
     cryp.src=(caddr_t)data;
-    cryp.dst=(caddr_t)data; // FIXME!!!
+    cryp.dst=(caddr_t)data; /* FIXME!!! */
     cryp.mac=(caddr_t)md;
 
     if(ioctl(fd, CIOCCRYPT, &cryp) == -1)
@@ -420,7 +420,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len)
 	    dcopy=OPENSSL_malloc(len);
 	    memcpy(dcopy,data,len);
 	    cryp.src=dcopy;
-	    cryp.dst=cryp.src; // FIXME!!!
+	    cryp.dst=cryp.src; /* FIXME!!! */
 
 	    if(ioctl(fd, CIOCCRYPT, &cryp) == -1)
 		{
@@ -437,7 +437,7 @@ static int do_digest(int ses,unsigned char *md,const void *data,int len)
 	    return 0;
 	    }
 	}
-    //    printf("done\n");
+    /*    printf("done\n"); */
 
     return 1;
     }
@@ -483,7 +483,7 @@ static int dev_crypto_md5_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
     const MD_DATA *from_md=from->md_data;
     MD_DATA *to_md=to->md_data;
 
-    // How do we copy sessions?
+    /* How do we copy sessions? */
     assert(from->digest->flags&EVP_MD_FLAG_ONESHOT);
 
     to_md->data=OPENSSL_malloc(from_md->len);
@@ -530,7 +530,7 @@ static const EVP_MD md5_md=
     NID_md5,
     NID_md5WithRSAEncryption,
     MD5_DIGEST_LENGTH,
-    EVP_MD_FLAG_ONESHOT,	// XXX: set according to device info...
+    EVP_MD_FLAG_ONESHOT,	/* XXX: set according to device info... */
     dev_crypto_md5_init,
     dev_crypto_md5_update,
     dev_crypto_md5_final,
diff --git a/src/lib/libcrypto/krb5/Makefile.ssl b/src/lib/libcrypto/krb5/Makefile.ssl
index 496370f1aa..8daed59211 100644
--- a/src/lib/libcrypto/krb5/Makefile.ssl
+++ b/src/lib/libcrypto/krb5/Makefile.ssl
@@ -45,13 +45,13 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-	$(TOP)/util/point.sh Makefile.ssl Makefile ;
-	$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+	@$(TOP)/util/point.sh Makefile.ssl Makefile ;
+	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
diff --git a/src/lib/libcrypto/ocsp/Makefile.ssl b/src/lib/libcrypto/ocsp/Makefile.ssl
index cf6050dc6e..f5260abaed 100644
--- a/src/lib/libcrypto/ocsp/Makefile.ssl
+++ b/src/lib/libcrypto/ocsp/Makefile.ssl
@@ -47,13 +47,13 @@ lib:	$(LIBOBJ)
 	@touch lib
 
 files:
-	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+	$(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-	$(TOP)/util/point.sh Makefile.ssl Makefile ;
-	$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
-	$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
-	$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+	@$(TOP)/util/point.sh Makefile.ssl Makefile ;
+	@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+	@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+	@$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
 	@for i in $(EXHEADER) ; \
-- 
cgit v1.2.3-55-g6feb