6 files changed, 20 insertions, 294 deletions

diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 3954b2d858..6d6ced309f 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,10 +1,7 @@
 .include <bsd.own.mk>
+
 ECHO= /bin/echo
 
-.if exists(${.OBJDIR}/src-patent)
-SUBDIR= crypto-patent ssl-patent
-.else
-SUBDIR= crypto ssl
-.endif
+SUBDIR= crypto ssl
 
 .include <bsd.subdir.mk>
diff --git a/src/lib/libssl/Makefile.bsd-wrapper b/src/lib/libssl/Makefile.bsd-wrapper
index 490b0e3d4d..3a96141eae 100644
--- a/src/lib/libssl/Makefile.bsd-wrapper
+++ b/src/lib/libssl/Makefile.bsd-wrapper
@@ -1,9 +1,9 @@
 # Build wrapper for OpenSSL
-# $OpenBSD: Makefile.bsd-wrapper,v 1.28 2001/01/22 06:14:09 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.29 2001/01/31 20:49:10 brad Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
-LNDIR=          /usr/bin/lndir
+LNDIR=  /usr/bin/lndir
 
 # Figure out what flag we use to OpenSSL's configure. This
 # needs to be tested on all architectures.
@@ -35,13 +35,18 @@ SSLCONF=	--openssldir=/etc/ssl OpenBSD
 .endif
 .endif
 
-MUNGEDFILES =   ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/Makefile ${.OBJDIR}/${SSL_SRC}/apps/der_chop ${.OBJDIR}/${SSL_SRC}/tools/c_rehash
+MUNGEDFILES= \
+        ${.OBJDIR}/${SSL_SRC}/crypto/opensslconf.h \
+        ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h \
+        ${.OBJDIR}/${SSL_SRC}/Makefile.ssl \
+        ${.OBJDIR}/${SSL_SRC}/Makefile \
+        ${.OBJDIR}/${SSL_SRC}/apps/der_chop \
+        ${.OBJDIR}/${SSL_SRC}/tools/c_rehash
 
 .include <bsd.own.mk>           # for NOMAN
 
 .ifndef NOMAN
 MANALL= ssl.cat3 SSL_get_error.cat3 \
-        \
         BN_CTX_new.cat3 OPENSSL_VERSION_NUMBER.cat3 BN_CTX_start.cat3 \
         OpenSSL_add_all_algorithms.cat3 BN_add.cat3 RAND_add.cat3 BN_add_word.cat3 \
         RAND_bytes.cat3 BN_bn2bin.cat3 RAND_cleanup.cat3 BN_cmp.cat3 RAND_egd.cat3 \
@@ -68,9 +73,7 @@ MANALL=	ssl.cat3 SSL_get_error.cat3 \
         EVP_EncryptInit.cat3 BUF_MEM_new.cat3 \
         EVP_OpenInit.cat3 EVP_SealInit.cat3 \
         EVP_SignInit.cat3 EVP_VerifyInit.cat3 \
-        \
         openssl.cat1 \
-        \
         BUF_MEM_new.cat3 RC4.cat3 \
         RIPEMD160.cat3 CRYPTO_set_locking_callback.cat3
 
@@ -518,7 +521,6 @@ maninstall:
           --center='OpenSSL' --release="OpenBSD `uname -r`" \
           `basename ${.ALLSRC}` ) | nroff -Tascii -man > ${.TARGET}
 
-
 .pod.ps3:
         ( cd `dirname ${.ALLSRC}` && pod2man --section=3 --official \
           --center='OpenSSL' --release="OpenBSD `uname -r`" \
@@ -532,43 +534,40 @@ maninstall:
           --center='OpenSSL' --release="OpenBSD `uname -r`" \
           `basename ${.ALLSRC}` ) | nroff -Tps -man > ${.TARGET}
 
-.if exists(src-patent)
-SSL_SRC=src-patent
-.else
 SSL_SRC=src
-.endif    
 
 all:    prereq ${MANALL} ${PSALL}
-        cd ${.OBJDIR} && ${MAKE}
+        @cd ${.OBJDIR} && ${MAKE}
 
 includes: prereq
-        cd ${.OBJDIR} && ${MAKE} includes
+        @cd ${.OBJDIR} && ${MAKE} includes
 
 prereq: ${.OBJDIR}/${SSL_SRC}/Makefile.ssl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
 
 install: maninstall
-        cd ${.OBJDIR} && ${MAKE} install
+        @cd ${.OBJDIR} && ${MAKE} install
 
 #${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h
 #       /usr/bin/perl ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.pl ${.OBJDIR}/${SSL_SRC}/crypto/objects/objects.h ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
 # Stupid ssl 0.9.6 fucks this up completely, won't even build if you
 # try to regenerate obj_dat.h - even with a stock distrib. 
 ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h: ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src
-        cp ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
+        @cp ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h.src \
+                ${.OBJDIR}/${SSL_SRC}/crypto/objects/obj_dat.h
 
 ${.OBJDIR}/${SSL_SRC}/Makefile.ssl : ${.OBJDIR}/${SSL_SRC}/Makefile.org
-        cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}
+        @cd ${.OBJDIR}/${SSL_SRC} && /usr/bin/perl Configure ${SSLCONF}
 
 .if !exists(${.OBJDIR}/${SSL_SRC}/Makefile.org)
 ${.OBJDIR}/${SSL_SRC}/Makefile.org: ${.CURDIR}/${SSL_SRC}/Makefile.org
-        ${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper ${.CURDIR}
+        @${LNDIR} -s -e obj -e obj.${MACHINE_ARCH} -e Makefile.bsd-wrapper ${.CURDIR}
 .endif
 
 clean:
-        cd ${.OBJDIR} && ${MAKE} clean
+        @cd ${.OBJDIR} && ${MAKE} clean
 
 cleandir: clean
-        cd ${.OBJDIR} && rm -f ${MUNGEDFILES}
+        @cd ${.OBJDIR} && rm -f ${MUNGEDFILES}
 
 test:
         # Nothing here so far...
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile
deleted file mode 100644
index 24acd06b17..0000000000
--- a/src/lib/libssl/crypto-patent/Makefile
+++ /dev/null
@@ -1,204 +0,0 @@
-
-LIB=    crypto
-
-SSLEAYDIST= src-patent
-
-LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
-LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/include
-
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+= -DL_ENDIAN -DBN_ASM
-.else
-.if ${MACHINE_ARCH} == "mips"
-CFLAGS+= -DL_ENDIAN
-.else
-.if ${MACHINE_ARCH} == "vax"
-CFLAGS+= -DL_ENDIAN
-.else
-.if ${MACHINE_ARCH} == "alpha"
-# no ENDIAN stuff defined for alpha
-.else
-CFLAGS+= -DB_ENDIAN
-.endif
-.endif
-.endif
-.endif 
-
-CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
-CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
-CFLAGS+= -I${LCRYPTO_SRC}
-CFLAGS+= -I${LCRYPTO_INC}
-SRCS+=  cryptlib.c ex_data.c cpt_err.c mem.c mem_dbg.c tmdiff.c cversion.c
-CFLAGS+= -I${LCRYPTO_SRC}/md2
-SRCS+=  md2_dgst.c md2_one.c                                    
-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}/hmac
-SRCS+=  hmac.c                                                  
-CFLAGS+= -I${LCRYPTO_SRC}/ripemd
-SRCS+=  rmd_dgst.c rmd_one.c                            
-CFLAGS+= -I${LCRYPTO_SRC}/des
-SRCS+=  cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
-        ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c \
-        fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
-        qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
-        des_enc.c fcrypt_b.c read2pwd.c \
-        fcrypt.c xcbc_enc.c ede_cbcm_enc.c \
-        str2key.c  cfb64ede.c ofb64ede.c supp.c
-CFLAGS+= -I${LCRYPTO_SRC}/rc2
-SRCS+=  rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c
-SRCS+=  rc2ofb64.c                                                      
-CFLAGS+= -I${LCRYPTO_SRC}/rc4
-SRCS+=  rc4_skey.c rc4_enc.c
-CFLAGS+= -I${LCRYPTO_SRC}/rc5
-SRCS+=  rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c      
-SRCS+=  rc5ofb64.c rc5_enc.c
-#CFLAGS+= -I${LCRYPTO_SRC}/idea
-#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c             
-#SRCS+= i_skey.c                                                        
-CFLAGS+= -I${LCRYPTO_SRC}/bf
-SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c               
-CFLAGS+= -I${LCRYPTO_SRC}/cast
-SRCS+=  c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c    
-CFLAGS+= -I${LCRYPTO_SRC}/bn
-SRCS+=  bn_add.c bn_div.c bn_exp.c bn_lib.c
-SRCS+=  bn_mul.c bn_print.c bn_rand.c bn_shift.c
-SRCS+=  bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
-SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c 
-#SRCS+= bn_comba.c d.c exp.c
-SRCS+=  bn_exp2.c bn_ctx.c
-CFLAGS+= -I${LCRYPTO_SRC}/rsa
-SRCS+=  rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c
-SRCS+=  rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c
-SRCS+=  rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c
-CFLAGS+= -I${LCRYPTO_SRC}/dsa
-SRCS+=  dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c         
-SRCS+=  dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c
-CFLAGS+= -I${LCRYPTO_SRC}/dh
-SRCS+=  dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c  
-CFLAGS+= -I${LCRYPTO_SRC}/buffer
-SRCS+=  buffer.c buf_err.c                              
-CFLAGS+= -I${LCRYPTO_SRC}/bio
-SRCS+=  bio_lib.c bio_cb.c bio_err.c bss_mem.c          
-SRCS+=  bss_null.c bss_fd.c bss_file.c bss_sock.c       
-SRCS+=  bss_conn.c bf_null.c bf_buff.c 
-SRCS+=  b_print.c b_dump.c b_sock.c bss_acpt.c          
-SRCS+=  bf_nbio.c bss_bio.c bss_log.c
-CFLAGS+= -I${LCRYPTO_SRC}/stack
-SRCS+=  stack.c                                                 
-CFLAGS+= -I${LCRYPTO_SRC}/lhash
-SRCS+=  lhash.c lh_stats.c                                      
-CFLAGS+= -I${LCRYPTO_SRC}/rand
-SRCS+=  md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c
-CFLAGS+= -I${LCRYPTO_SRC}/err
-SRCS+=  err.c err_all.c err_prn.c                               
-CFLAGS+= -I${LCRYPTO_SRC}/objects
-SRCS+=  obj_dat.c obj_lib.c obj_err.c o_names.c
-CFLAGS+= -I${LCRYPTO_SRC}/evp
-SRCS+=  encode.c digest.c evp_enc.c evp_key.c           
-SRCS+=  e_ecb_d.c e_cbc_d.c e_cfb_d.c e_ofb_d.c         
-SRCS+=  e_ecb_i.c e_cbc_i.c e_cfb_i.c e_ofb_i.c         
-SRCS+=  e_ecb_3d.c e_cbc_3d.c e_rc4.c names.c           
-SRCS+=  e_cfb_3d.c e_ofb_3d.c e_xcbc_d.c e_ecb_r2.c     
-SRCS+=  e_cbc_r2.c e_cfb_r2.c e_ofb_r2.c e_ecb_bf.c     
-SRCS+=  e_cbc_bf.c e_cfb_bf.c e_ofb_bf.c e_ecb_c.c      
-SRCS+=  e_cbc_c.c e_cfb_c.c e_ofb_c.c e_ecb_r5.c        
-SRCS+=  e_cbc_r5.c e_cfb_r5.c e_ofb_r5.c m_null.c       
-SRCS+=  m_md2.c m_md5.c m_sha.c m_sha1.c m_dss.c        
-SRCS+=  m_dss1.c m_mdc2.c m_ripemd.c p_open.c           
-SRCS+=  p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c
-SRCS+=  p_dec.c bio_md.c bio_b64.c bio_enc.c            
-SRCS+=  evp_err.c e_null.c c_all.c c_allc.c c_alld.c evp_lib.c
-SRCS+=  bio_ok.c evp_pbe.c evp_pkey.c p5_crpt.c p5_crpt2.c
-CFLAGS+= -I${LCRYPTO_SRC}/pem
-SRCS+=  pem_sign.c pem_seal.c pem_info.c pem_lib.c      
-SRCS+=  pem_all.c pem_err.c 
-CFLAGS+= -I${LCRYPTO_SRC}/asn1
-SRCS+=  a_object.c a_bitstr.c a_utctm.c a_int.c 
-SRCS+=  a_octet.c a_print.c a_type.c a_set.c    
-SRCS+=  a_dup.c a_d2i_fp.c a_i2d_fp.c a_sign.c  
-SRCS+=  a_digest.c a_verify.c x_algor.c x_val.c 
-SRCS+=  x_pubkey.c x_sig.c x_req.c x_attrib.c   
-SRCS+=  x_name.c x_cinf.c x_x509.c x_crl.c              
-SRCS+=  x_info.c x_spki.c d2i_r_pr.c i2d_r_pr.c 
-SRCS+=  d2i_r_pu.c i2d_r_pu.c d2i_s_pr.c i2d_s_pr.c     
-SRCS+=  d2i_s_pu.c i2d_s_pu.c d2i_pu.c d2i_pr.c         
-SRCS+=  i2d_pu.c i2d_pr.c t_req.c t_x509.c              
-SRCS+=  t_pkey.c p7_i_s.c p7_signi.c p7_signd.c 
-SRCS+=  p7_recip.c p7_enc_c.c p7_evp.c p7_dgst.c        
-SRCS+=  p7_s_e.c p7_enc.c p7_lib.c f_int.c              
-SRCS+=  f_string.c i2d_dhp.c i2d_dsap.c d2i_dhp.c       
-SRCS+=  d2i_dsap.c n_pkey.c a_hdr.c x_pkey.c    
-SRCS+=  a_bool.c x_exten.c asn1_par.c asn1_lib.c        
-SRCS+=  asn1_err.c a_meth.c a_bytes.c evp_asn1.c
-SRCS+=  a_enum.c a_gentm.c a_time.c a_utf8.c a_vis.c 
-SRCS+=  asn_pack.c f_enum.c nsseq.c p5_pbe.c p5_pbev2.c 
-SRCS+=  p8_pkey.c t_crl.c a_meth.c a_null.c a_strnid.c a_mbstr.c
-#SRCS+= p8_key.c t_bitst.c t_spki.c t_x509a.c x_x509a.c
-SRCS+=  t_bitst.c t_spki.c t_x509a.c x_x509a.c
-CFLAGS+= -I${LCRYPTO_SRC}/x509
-SRCS+=  x509_def.c x509_d2.c x509_r2x.c x509_cmp.c      
-SRCS+=  x509_obj.c x509_req.c x509_vfy.c x509_set.c     
-SRCS+=  x509rset.c x509_err.c x509name.c x509_v3.c      
-SRCS+=  x509_ext.c x509type.c x509_lu.c x509_trs.c x509spki.c
-SRCS+=  x_all.c x509_txt.c by_file.c by_dir.c x509_att.c
-CFLAGS+= -I${LCRYPTO_SRC}/x509v3
-SRCS+=  v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c
-SRCS+=  v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c
-SRCS+=  v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c
-SRCS+=  v3err.c v3_info.c v3_purp.c
-CFLAGS+= -I${LCRYPTO_SRC}/conf
-SRCS+=  conf.c conf_err.c                                       
-CFLAGS+= -I${LCRYPTO_SRC}/txt_db
-SRCS+=  txt_db.c                                                        
-CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
-SRCS+=  pk7_lib.c pkcs7err.c pk7_doit.c pk7_attr.c pk7_mime.c pk7_smime.c
-CFLAGS+= -I${LCRYPTO_SRC}/comp
-SRCS+=  c_rle.c c_zlib.c comp_err.c comp_lib.c
-CFLAGS+= -I${LCRYPTO_SRC}/pkcs12
-SRCS+=  p12_add.c p12_attr.c p12_bags.c p12_crpt.c p12_crt.c
-SRCS+=  p12_decr.c p12_init.c p12_key.c p12_kiss.c p12_lib.c p12_mac.c
-SRCS+=  p12_mutl.c p12_sbag.c p12_utl.c pk12err.c p12_npas.c
-
-HDRS= asn1.h dh.h md5.h rc4.h stack.h asn1_mac.h dsa.h mdc2.h rc5.h     \
-      tls1.h bio.h e_os.h objects.h ripemd.h tmdiff.h blowfish.h        \
-      e_os2.h opensslconf.h rsa.h txt_db.h bn.h ebcdic.h opensslv.h     \
-      rsaref.h x509.h buffer.h err.h pem.h safestack.h x509_vfy.h       \
-      cast.h evp.h pem2.h sha.h x509v3.h comp.h hmac.h pkcs12.h ssl.h   \
-      conf.h idea.h pkcs7.h ssl2.h crypto.h lhash.h rand.h ssl23.h      \
-      des.h md2.h rc2.h ssl3.h
-
-
-.PATH:  ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2    \
-        ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des  ${LCRYPTO_SRC}/rc2 \
-        ${LCRYPTO_SRC}/rc4 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf    \
-        ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn  ${LCRYPTO_SRC}/rsa ${LCRYPTO_SRC}/dsa   \
-        ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack \
-        ${LCRYPTO_SRC}/lhash ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \
-        ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1  ${LCRYPTO_SRC}/asn1 \
-        ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf txt_db/txt_db.c ${LCRYPTO_SRC}/pkcs7 \
-        ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/pkcs12 ${LCRYPTO_SRC}/comp \
-        ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}
-
-includes:
-        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
-        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
-        cd ${LCRYPTO_INC}/openssl; for i in $(HDRS); do \
-                f=`basename $$i`; \
-                j="sed 's/<openssl/<ssl/' \
-                       ${LCRYPTO_INC}/openssl/$$i >$$d/$$f && \
-                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
-                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-                           $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
-                echo $$j; \
-                eval "$$j"; \
-        done; \
-        rm -rf $$d
-
-
-.include <bsd.lib.mk>
-
diff --git a/src/lib/libssl/crypto-patent/shlib_version b/src/lib/libssl/crypto-patent/shlib_version
deleted file mode 100644
index b363be4447..0000000000
--- a/src/lib/libssl/crypto-patent/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=2
-minor=3
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile
deleted file mode 100644
index 70b3d31eac..0000000000
--- a/src/lib/libssl/ssl-patent/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-
-LIB=    ssl
-
-SSLEAYDIST= src-patent
-
-LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
-LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
-
-.if ${MACHINE_ARCH} == "i386"
-CFLAGS+= -DL_ENDIAN -DBN_ASM
-.else
-.if ${MACHINE_ARCH} == "mips"
-CFLAGS+= -DL_ENDIAN
-.else
-.if ${MACHINE_ARCH} == "vax"
-CFLAGS+= -DL_ENDIAN
-.else
-.if ${MACHINE_ARCH} == "alpha"
-# no ENDIAN stuff defined for alpha
-.else
-CFLAGS+= -DB_ENDIAN
-.endif
-.endif
-.endif 
-.endif 
-
-CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 
-CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}/include
-
-SRCS=   bio_ssl.c s2_clnt.c s3_both.c s3_srvr.c ssl_err2.c ssl_txt.c    \
-        t1_srvr.c s23_clnt.c s2_enc.c s3_clnt.c ssl_algs.c ssl_lib.c    \
-        ssltest.c s23_lib.c s2_lib.c s3_enc.c ssl_asn1.c ssl_rsa.c      \
-        t1_clnt.c s23_meth.c s2_meth.c s3_lib.c ssl_cert.c ssl_sess.c   \
-        t1_enc.c s23_pkt.c s2_pkt.c s3_meth.c ssl_ciph.c ssl_stat.c     \
-        t1_lib.c s23_srvr.c s2_srvr.c s3_pkt.c ssl_err.c \
-        t1_meth.c
-
-HDRS=   ssl.h ssl2.h ssl3.h ssl23.h ssl_locl.h tls1.h
-
-.PATH:  ${LSSL_SRC}
-
-includes:
-        @test -d ${DESTDIR}/usr/include/ssl || mkdir ${DESTDIR}/usr/include/ssl
-        @d=`mktemp -d /tmp/libsslXXXXXXXXXX`; \
-        cd ${LSSL_SRC}; for i in $(HDRS); do \
-                f=`basename $$i`; \
-                j="sed 's/<openssl/<ssl/' \
-                       $$i >$$d/$$f && \
-                (cmp -s $$d/$$f ${DESTDIR}/usr/include/ssl/$$f || \
-                ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-                $$d/$$f ${DESTDIR}/usr/include/ssl)"; \
-                echo $$j; \
-                eval "$$j"; \
-        done; \
-        rm -rf $$d
-
-.include <bsd.lib.mk>
-
-
-
-
-
diff --git a/src/lib/libssl/ssl-patent/shlib_version b/src/lib/libssl/ssl-patent/shlib_version
deleted file mode 100644
index b363be4447..0000000000
--- a/src/lib/libssl/ssl-patent/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=2
-minor=3