remove MDC2; patents

5 files changed, 11 insertions, 14 deletions

diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index c95efa83ea..461954b13d 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2002/09/10 16:31:53 markus Exp $
+# $OpenBSD: Makefile,v 1.28 2002/09/26 11:39:50 markus Exp $
 
 LIB=    crypto
 
@@ -26,6 +26,7 @@ CFLAGS+= -DB_ENDIAN
 
 CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM
 CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DSO_DLFCN -DHAVE_DLFCN_H 
+CFLAGS+= -DOPENSSL_NO_MDC2
 CFLAGS+= -DNO_WINDOWS_BRAINDEATH
 CFLAGS+= -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA
 CFLAGS+= -DOPENSSL_NO_HW_NURON -DOPENSSL_NO_HW_UBSEC -DOPENSSL_NO_HW_AEP
@@ -40,8 +41,8 @@ CFLAGS+= -I${LCRYPTO_SRC}/md5
 SRCS+=  md5_dgst.c md5_one.c                                    
 CFLAGS+= -I${LCRYPTO_SRC}/sha
 SRCS+=  sha_dgst.c sha1dgst.c sha_one.c sha1_one.c      
-CFLAGS+= -I${LCRYPTO_SRC}/mdc2
-SRCS+=  mdc2dgst.c mdc2_one.c                                   
+#CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+#SRCS+= mdc2dgst.c mdc2_one.c                                   
 CFLAGS+= -I${LCRYPTO_SRC}/hmac
 SRCS+=  hmac.c                                                  
 CFLAGS+= -I${LCRYPTO_SRC}/ripemd
@@ -113,7 +114,7 @@ SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c
 SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c
 SRCS+= c_all.c evp_err.c evp_acnf.c m_md4.c p5_crpt.c
 SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c
-SRCS+= c_alld.c e_null.c evp_lib.c m_mdc2.c p_dec.c
+SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c
 SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c
 SRCS+= e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c
 CFLAGS+= -I${LCRYPTO_SRC}/md4
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
index b39addfcc6..d0f0988b41 100644
--- a/src/lib/libssl/crypto/shlib_version
+++ b/src/lib/libssl/crypto/shlib_version
@@ -1,2 +1,2 @@
-major=7
-minor=1
+major=8
+minor=0
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 7282f43793..ce04b703c1 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2002/09/03 18:59:56 markus Exp $
+# $OpenBSD: Makefile,v 1.16 2002/09/26 11:39:50 markus Exp $
 
 LIB=    ssl
 
@@ -25,6 +25,7 @@ CFLAGS+= -DB_ENDIAN
 .endif
 
 CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR 
+CFLAGS+= -DOPENSSL_NO_MDC2
 CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DSO_DLFCN -DHAVE_DLFCN_H 
 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
 
diff --git a/src/regress/lib/libssl/Makefile b/src/regress/lib/libssl/Makefile
index 85608b9679..d69db1b29e 100644
--- a/src/regress/lib/libssl/Makefile
+++ b/src/regress/lib/libssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.9 2002/09/02 20:01:43 avsm Exp $
+#       $OpenBSD: Makefile,v 1.10 2002/09/26 11:39:50 markus Exp $
 
 CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
 
@@ -14,7 +14,6 @@ ECTEST=		ectest
 EXPTEST=        exptest
 SHATEST=        shatest
 SHA1TEST=       sha1test
-MDC2TEST=       mdc2test
 RMDTEST=        rmdtest
 MD2TEST=        md2test
 MD4TEST=        md4test
@@ -145,11 +144,6 @@ $(RANDTEST).c: ${.CURDIR}/../../../lib/libssl/src/crypto/rand/${RANDTEST}.c
 $(RANDTEST): ${RANDTEST}.c e_os.h
         cc -O -o $(RANDTEST) ${RANDTEST}.c -lcrypto
 
-$(MDC2TEST).c: ${.CURDIR}/../../../lib/libssl/src/crypto/mdc2/${MDC2TEST}.c
-        cp ${.CURDIR}/../../../lib/libssl/src/crypto/mdc2/${MDC2TEST}.c ${.OBJDIR}
-$(MDC2TEST): ${MDC2TEST}.c e_os.h
-        cc -O -o $(MDC2TEST) ${MDC2TEST}.c -lcrypto
-
 $(RMDTEST).c: ${.CURDIR}/../../../lib/libssl/src/crypto/ripemd/${RMDTEST}.c
         cp ${.CURDIR}/../../../lib/libssl/src/crypto/ripemd/${RMDTEST}.c ${.OBJDIR}
 $(RMDTEST): ${RMDTEST}.c e_os.h
diff --git a/src/usr.sbin/openssl/Makefile b/src/usr.sbin/openssl/Makefile
index fa280d2f59..ee8f5b8c5c 100644
--- a/src/usr.sbin/openssl/Makefile
+++ b/src/usr.sbin/openssl/Makefile
@@ -29,6 +29,7 @@ CFLAGS+= -DB_ENDIAN
 .endif 
 
 CFLAGS+= -DMONOLITH -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5
+CFLAGS+= -DOPENSSL_NO_MDC2
 CFLAGS+= -I/usr/include/ssl -I${SSLEAY_SRC_TOP}
 
 SRCS=   verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c\