OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

2 files changed, 14 insertions, 12 deletions

diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 1dea336f27..516217e648 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -24,7 +24,7 @@ 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 tmdiff.c cversion.c
+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
@@ -66,14 +66,14 @@ 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
+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
+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                                 
+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
@@ -89,7 +89,7 @@ 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                                 
+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
@@ -108,7 +108,7 @@ 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 evp_lib.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      
@@ -133,30 +133,32 @@ 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
+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 
+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   
 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
+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 
+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
+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        \
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
index b52599a164..ba5a3fee58 100644
--- a/src/lib/libssl/crypto/shlib_version
+++ b/src/lib/libssl/crypto/shlib_version
@@ -1,2 +1,2 @@
 major=2
-minor=0
+minor=2