From c4260e12c02a0898c794ac5e1ab67de9cf97777d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 1 Oct 2010 23:02:03 +0000 Subject: update supporting files, crank library majors --- lib/libssl/crypto/Makefile | 513 ++++++++++++++++++--------- lib/libssl/crypto/arch/alpha/opensslconf.h | 27 +- lib/libssl/crypto/arch/amd64/opensslconf.h | 27 +- lib/libssl/crypto/arch/arm/opensslconf.h | 25 +- lib/libssl/crypto/arch/hppa/opensslconf.h | 25 +- lib/libssl/crypto/arch/i386/opensslconf.h | 25 +- lib/libssl/crypto/arch/m68k/opensslconf.h | 25 +- lib/libssl/crypto/arch/m88k/opensslconf.h | 25 +- lib/libssl/crypto/arch/mips64/opensslconf.h | 25 +- lib/libssl/crypto/arch/powerpc/opensslconf.h | 25 +- lib/libssl/crypto/arch/sh/opensslconf.h | 25 +- lib/libssl/crypto/arch/sparc/opensslconf.h | 25 +- lib/libssl/crypto/arch/sparc64/opensslconf.h | 25 +- lib/libssl/crypto/arch/vax/opensslconf.h | 25 +- lib/libssl/crypto/shlib_version | 2 +- lib/libssl/ssl/Makefile | 43 +-- lib/libssl/ssl/shlib_version | 4 +- 17 files changed, 619 insertions(+), 272 deletions(-) (limited to 'lib') diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile index d278be8410e..d85aa913dab 100644 --- a/lib/libssl/crypto/Makefile +++ b/lib/libssl/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2010/07/01 17:44:57 thib Exp $ +# $OpenBSD: Makefile,v 1.54 2010/10/01 23:01:54 djm Exp $ LIB= crypto WANTLINT= @@ -6,7 +6,6 @@ WANTLINT= SSLEAYDIST= src SSL_SRC= ${.CURDIR}/../${SSLEAYDIST} LCRYPTO_SRC= ${SSL_SRC}/crypto -FIPS_SRC= ${SSL_SRC}/fips # arm and sh default to little endian, mips defaults to big endian .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \ @@ -32,7 +31,9 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH CFLAGS+= -DOPENSSL_NO_IDEA CFLAGS+= -DOPENSSL_NO_RC5 CFLAGS+= -DOPENSSL_NO_KRB5 +# NB. MDC2 is off patent now, we can add it whenever we want to CFLAGS+= -DOPENSSL_NO_MDC2 +CFLAGS+= -DOPENSSL_NO_GOST # Hardware engines CFLAGS+= -DOPENSSL_NO_HW_4758_CCA @@ -48,163 +49,303 @@ CFLAGS+= -DOPENSSL_NO_HW_UBSEC CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} CFLAGS+= -I${LCRYPTO_SRC} -SRCS+= o_time.c o_dir.c o_init.c fips_err.c -SRCS+= cryptlib.c dyn_lck.c ex_data.c cpt_err.c mem.c mem_dbg.c mem_clr.c -SRCS+= tmdiff.c cversion.c uid.c -SRCS+= md2_dgst.c md2_one.c -SRCS+= md5_dgst.c md5_one.c -SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c -#SRCS+= mdc2dgst.c mdc2_one.c -SRCS+= hmac.c -SRCS+= rmd_dgst.c rmd_one.c +CFLAGS+= -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/evp + +# crypto/ +SRCS+= cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c +SRCS+= ebcdic.c uid.c o_time.c o_str.c o_dir.c + +# acss/ SRCS+= acss_skey.c acss_enc.c -SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c -SRCS+= aes_ige.c aes_wrap.c -SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ - ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ - ofb64enc.c ofb_enc.c pcbc_enc.c \ - qud_cksm.c rand_key.c rpc_enc.c set_key.c \ - des_lib.c des_enc.c des_old2.c fcrypt_b.c \ - fcrypt.c xcbc_enc.c ede_cbcm_enc.c \ - str2key.c cfb64ede.c ofb64ede.c \ - des_old.c read2pwd.c -SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c -SRCS+= rc2ofb64.c -#SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c -#SRCS+= rc5ofb64.c rc5_enc.c -#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c -#SRCS+= i_skey.c -SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c -SRCS+= c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c -SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c -SRCS+= 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_mod.c -SRCS+= bn_exp2.c bn_ctx.c bn_opt.c -SRCS+= bn_sqrt.c bn_kron.c bn_x931p.c bn_const.c bn_depr.c bn_gf2m.c bn_nist.c -#SRCS+= camellia.c cmll_cbc.c cmll_cfb.c cmll_ctr.c -#SRCS+= cmll_ecb.c cmll_misc.c cmll_ofb.cq -#SRCS+= cms_asn1.c cms_att.c cms_cd.c cms_dd.c cms_enc.c cms_env.c -#SRCS+= cms_err.c cms_ess.c cms_io.c cms_lib.c cms_sd.c cms_smime.c -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 rsa_asn1.c -SRCS+= rsa_pss.c rsa_x931.c rsa_x931g.c rsa_depr.c rsa_eng.c -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 dsa_depr.c dsa_utl.c -SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c dh_depr.c -SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c -SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c -SRCS+= ec2_mult.c ec2_smpl.c ec_asn1.c ec_check.c ec_curve.c -SRCS+= ec_key.c ec_print.c -SRCS+= ech_err.c ech_key.c ech_lib.c ech_ossl.c -SRCS+= ecs_asn1.c ecs_err.c ecs_lib.c ecs_ossl.c ecs_sign.c ecs_vrf.c -SRCS+= buffer.c buf_str.c buf_err.c -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 bss_dgram.c -SRCS+= stack.c -SRCS+= lhash.c lh_stats.c -SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_eng.c -SRCS+= rand_err.c rand_unix.c -SRCS+= err.c err_def.c err_all.c err_prn.c err_str.c err_bio.c -SRCS+= obj_dat.c obj_lib.c obj_err.c o_names.c -SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c -SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c -SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c -SRCS+= bio_ok.c e_des3.c dig_eng.c evp_enc.c m_md2.c p_verify.c m_ecdsa.c -#SRCS+= e_camellia.c e_seed.c -SRCS+= c_all.c evp_err.c evp_acnf.c evp_cnf.c m_md4.c p5_crpt.c e_old.c -SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c -SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c -SRCS+= digest.c e_rc2.c enc_min.c evp_pbe.c m_null.c p_enc.c -SRCS+= e_acss.c e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c -SRCS+= md4_dgst.c md4_one.c -SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_pkey.c -SRCS+= pem_all.c pem_err.c pem_x509.c pem_pk8.c pem_oth.c pem_xaux.c -SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_compat.c ui_util.c -SRCS+= a_bitstr.c a_mbstr.c a_utctm.c f_enum.c t_bitst.c x_name.c -SRCS+= a_bool.c a_meth.c a_utf8.c f_int.c t_crl.c tasn_typ.c x_pkey.c -SRCS+= a_bytes.c a_object.c a_verify.c f_string.c t_pkey.c tasn_utl.c x_pubkey.c -SRCS+= a_d2i_fp.c a_octet.c asn1_err.c i2d_pr.c t_req.c x_algor.c x_req.c -SRCS+= a_digest.c a_print.c asn1_lib.c i2d_pu.c t_spki.c x_attrib.c x_sig.c -SRCS+= a_dup.c a_set.c asn1_par.c n_pkey.c t_x509.c x_bignum.c x_spki.c -SRCS+= a_enum.c a_sign.c asn_pack.c nsseq.c t_x509a.c x_val.c -SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c -SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c -SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c -SRCS+= a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c -SRCS+= asn1_gen.c asn_mime.c -SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c -SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c -SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c -SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c -SRCS+= x509_vpm.c -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 v3_ocsp.c v3_akeya.c v3_pci.c v3_pcia.c -SRCS+= pcy_cache.c pcy_data.c pcy_int.h pcy_lib.c pcy_map.c pcy_node.c -SRCS+= pcy_tree.c v3_addr.c v3_asid.c v3_ncons.c v3_pcons.c v3_pmaps.c -SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c -SRCS+= conf_sap.c -SRCS+= txt_db.c -SRCS+= pk7_lib.c pkcs7err.c -SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c -SRCS+= pk7_attr.c pk7_smime.c -SRCS+= c_rle.c c_zlib.c comp_lib.c comp_err.c -SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c -SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c -SRCS+= p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c -SRCS+= eng_all.c eng_openssl.c eng_ctrl.c eng_pkey.c eng_aesni.c -SRCS+= eng_dyn.c eng_table.c tb_cipher.c tb_store.c eng_err.c tb_rsa.c -SRCS+= tb_ecdh.c tb_ecdsa.c -SRCS+= hw_cryptodev.c eng_cnf.c -SRCS+= tb_dh.c eng_fat.c tb_digest.c eng_init.c -SRCS+= tb_dsa.c eng_lib.c tb_rand.c eng_list.c + +# aes/ +SRCS+= aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c + +# asn1/ +SRCS+= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c +SRCS+= a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c +SRCS+= a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c +SRCS+= x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c +SRCS+= x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c +SRCS+= x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c +SRCS+= t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c +SRCS+= tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c +SRCS+= tasn_prn.c ameth_lib.c +SRCS+= f_int.c f_string.c n_pkey.c +SRCS+= f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c +SRCS+= asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c +SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c + +# bf/ +SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c + +# bio/ +SRCS+= bio_lib.c bio_cb.c bio_err.c +SRCS+= bss_mem.c bss_null.c bss_fd.c +SRCS+= bss_file.c bss_sock.c bss_conn.c +SRCS+= bf_null.c bf_buff.c b_print.c b_dump.c +SRCS+= b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c +SRCS+= bss_dgram.c + +# bn/ +SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c +SRCS+= bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c +SRCS+= bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c +SRCS+= bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c +SRCS+= bn_depr.c bn_const.c + +# buffer/ +SRCS+= buffer.c buf_err.c + +# camellia/ +#SRCS+= cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c + +# cast/ +SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c + +# cms/ +#SRCS+= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c +#SRCS+= cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c + +# comp/ +SRCS+= comp_lib.c comp_err.c c_rle.c c_zlib.c + +# conf/ +SRCS+= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c +SRCS+= conf_mall.c conf_sap.c + +# des/ +SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c +SRCS+= ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c +SRCS+= fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c +SRCS+= qud_cksm.c rand_key.c rpc_enc.c set_key.c xcbc_enc.c +SRCS+= str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c +SRCS+= read2pwd.c + +# dh/ +SRCS+= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c +SRCS+= dh_ameth.c dh_pmeth.c dh_prn.c + +# dsa/ +SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c +SRCS+= dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c + +# dso/ SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c -SRCS+= dso_openssl.c dso_win32.c dso_vms.c -SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c -SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c -SRCS+= pqueue.c -#SRCS+= seed.c seed_cbc.c seed_cfb.c seed_ecb.c seed_ofb.c -SRCS+= str_err.c str_lib.c str_mem.c str_meth.c -# Only used when -DOPENSSL_FIPS is set -#SRCS+= fips.c fips_err_wrapper.c -#SRCS+= fips_aes_core.c fips_aes_selftest.c -#SRCS+= fips_des_enc.c fips_des_selftest.c fips_set_key.c -#SRCS+= fips_dh_check.c fips_dh_gen.c fips_dh_key.c -#SRCS+= fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c -#SRCS+= fips_rand.c -#SRCS+= fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c -#SRCS+= fips_sha1dgst.c fips_sha1_selftest.c - -.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 \ - ${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/pkcs12 \ - ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \ - ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \ - ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes \ - ${LCRYPTO_SRC}/camellia ${LCRYPTO_SRC}/seed ${LCRYPTO_SRC}/cms \ - ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/ecdh ${LCRYPTO_SRC}/ecdsa \ - ${LCRYPTO_SRC}/pqueue ${LCRYPTO_SRC}/store \ +SRCS+= dso_openssl.c dso_win32.c dso_vms.c dso_beos.c + +# ec/ +SRCS+= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c +SRCS+= ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c +SRCS+= ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c + +# ecdh/ +SRCS+= ech_lib.c ech_ossl.c ech_key.c ech_err.c + +# ecdsa/ +SRCS+= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c + +# engine/ +SRCS+= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c +SRCS+= eng_table.c eng_pkey.c eng_fat.c eng_all.c +SRCS+= tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c +SRCS+= tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c +SRCS+= eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c +SRCS+= eng_aesni.c # local addition + +# err/ +SRCS+= err.c err_all.c err_prn.c + +# evp/ +SRCS+= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c +SRCS+= e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c +SRCS+= e_rc4.c e_aes.c names.c e_seed.c +SRCS+= e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c +SRCS+= m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c +SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c +SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c +SRCS+= bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c +SRCS+= c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c +SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c +SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c +SRCS+= e_acss.c # Local addition + +# hmac/ +SRCS+= hmac.c hm_ameth.c hm_pmeth.c + +# idea/ +#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c + +# jpake/ +#SRCS+= jpake.c jpake_err.c + +# krb5/ +SRCS+= krb5_asn.c + +# lhash/ +SRCS+= lhash.c lh_stats.c + +# md2 +##SRCS+= md2_dgst.c md2_one.c + +# md4/ +SRCS+= md4_dgst.c md4_one.c + +# md5/ +SRCS+= md5_dgst.c md5_one.c + +# mdc2/ +#SRCS+= mdc2dgst.c mdc2_one.c + +# modes/ +SRCS+= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c + +# objects/ +SRCS+= o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c + +# ocsp/ +SRCS+= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c +SRCS+= ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c + +# pem/ +SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c +SRCS+= pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c + +# pkcs12/ +SRCS+= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c +SRCS+= p12_init.c p12_key.c p12_kiss.c p12_mutl.c +SRCS+= p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c + +# pkcs7/ +SRCS+= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c +SRCS+= pk7_mime.c bio_pk7.c + +# pqueue/ +SRCS+= pqueue.c + +# rand/ +SRCS+= md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c +SRCS+= rand_win.c rand_unix.c rand_os2.c rand_nw.c + +# rc2/ +SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c + +# rc5/ +#SRCS+= rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c + +# ripemd/ +SRCS+= rmd_dgst.c rmd_one.c + +# rsa/ +SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c +SRCS+= rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c +SRCS+= rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c +SRCS+= rsa_pmeth.c + +# seed/ +#SRCS+= seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c + +# sha/ +SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c + +# stack/ +SRCS+= stack.c + +# store/ +#SRCS+= str_err.c str_lib.c str_meth.c str_mem.c + +# ts/ +SRCS+= ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c +SRCS+= ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c +SRCS+= ts_asn1.c + +# txt_db/ +SRCS+=txt_db.c + +# ui/ +SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_util.c ui_compat.c + +# whrlpool/ +SRCS+= wp_dgst.c + +# x509/ +SRCS+= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c +SRCS+= x509_obj.c x509_req.c x509spki.c x509_vfy.c +SRCS+= x509_set.c x509cset.c x509rset.c x509_err.c +SRCS+= x509name.c x509_v3.c x509_ext.c x509_att.c +SRCS+= x509type.c x509_lu.c x_all.c x509_txt.c +SRCS+= x509_trs.c by_file.c by_dir.c x509_vpm.c + +# x509v3/ +SRCS+= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c +SRCS+= v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c +SRCS+= v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c +SRCS+= v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c +SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c +SRCS+= v3_asid.c v3_addr.c + +.PATH: ${.CURDIR}/arch/${MACHINE_CPU} \ ${LCRYPTO_SRC} \ - ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_CPU} \ + ${LCRYPTO_SRC}/acss \ + ${LCRYPTO_SRC}/aes \ + ${LCRYPTO_SRC}/asn1 \ + ${LCRYPTO_SRC}/bf \ + ${LCRYPTO_SRC}/bio \ + ${LCRYPTO_SRC}/bn \ ${LCRYPTO_SRC}/bn/asm \ - ${FIPS_SRC}/ ${FIPS_SRC}/aes ${FIPS_SRC}/des ${FIPS_SRC}/dh \ - ${FIPS_SRC}/dsa ${FIPS_SRC}/rand ${FIPS_SRC}/rsa ${FIPS_SRC}/sha1 + ${LCRYPTO_SRC}/buffer \ + ${LCRYPTO_SRC}/camellia \ + ${LCRYPTO_SRC}/cast \ + ${LCRYPTO_SRC}/cms \ + ${LCRYPTO_SRC}/comp \ + ${LCRYPTO_SRC}/conf \ + ${LCRYPTO_SRC}/des \ + ${LCRYPTO_SRC}/dh \ + ${LCRYPTO_SRC}/dsa \ + ${LCRYPTO_SRC}/dso \ + ${LCRYPTO_SRC}/ec \ + ${LCRYPTO_SRC}/ecdh \ + ${LCRYPTO_SRC}/ecdsa \ + ${LCRYPTO_SRC}/engine \ + ${LCRYPTO_SRC}/err \ + ${LCRYPTO_SRC}/evp \ + ${LCRYPTO_SRC}/md2 \ + ${LCRYPTO_SRC}/hmac \ + ${LCRYPTO_SRC}/idea \ + ${LCRYPTO_SRC}/jpake \ + ${LCRYPTO_SRC}/krb5 \ + ${LCRYPTO_SRC}/lhash \ + ${LCRYPTO_SRC}/md4 \ + ${LCRYPTO_SRC}/md5 \ + ${LCRYPTO_SRC}/mdc2 \ + ${LCRYPTO_SRC}/modes \ + ${LCRYPTO_SRC}/objects \ + ${LCRYPTO_SRC}/ocsp \ + ${LCRYPTO_SRC}/pem \ + ${LCRYPTO_SRC}/perlasm \ + ${LCRYPTO_SRC}/pkcs12 \ + ${LCRYPTO_SRC}/pkcs7 \ + ${LCRYPTO_SRC}/pqueue \ + ${LCRYPTO_SRC}/rand \ + ${LCRYPTO_SRC}/rc2 \ + ${LCRYPTO_SRC}/rc4 \ + ${LCRYPTO_SRC}/rc5 \ + ${LCRYPTO_SRC}/ripemd \ + ${LCRYPTO_SRC}/rsa \ + ${LCRYPTO_SRC}/seed \ + ${LCRYPTO_SRC}/sha \ + ${LCRYPTO_SRC}/stack \ + ${LCRYPTO_SRC}/store \ + ${LCRYPTO_SRC}/threads \ + ${LCRYPTO_SRC}/ts \ + ${LCRYPTO_SRC}/txt_db \ + ${LCRYPTO_SRC}/ui \ + ${LCRYPTO_SRC}/whrlpool \ + ${LCRYPTO_SRC}/x509 \ + ${LCRYPTO_SRC}/x509v3 HDRS=\ + e_os2.h \ crypto/acss/acss.h \ crypto/aes/aes.h \ crypto/asn1/asn1.h \ @@ -235,11 +376,13 @@ HDRS=\ crypto/evp/evp.h \ crypto/hmac/hmac.h \ crypto/idea/idea.h \ + crypto/krb5/krb5_asn.h \ crypto/lhash/lhash.h \ crypto/md2/md2.h \ crypto/md4/md4.h \ crypto/md5/md5.h \ crypto/mdc2/mdc2.h \ + crypto/modes/modes.h \ crypto/objects/objects.h \ crypto/ocsp/ocsp.h \ crypto/opensslv.h \ @@ -248,7 +391,6 @@ HDRS=\ crypto/pem/pem2.h \ crypto/pkcs12/pkcs12.h \ crypto/pkcs7/pkcs7.h \ - crypto/pqueue/pq_compat.h \ crypto/pqueue/pqueue.h \ crypto/rand/rand.h \ crypto/rc2/rc2.h \ @@ -262,16 +404,14 @@ HDRS=\ crypto/stack/stack.h \ crypto/store/store.h \ crypto/symhacks.h \ - crypto/tmdiff.h \ + crypto/ts/ts.h \ crypto/txt_db/txt_db.h \ crypto/ui/ui.h \ crypto/ui/ui_compat.h \ + crypto/whrlpool/whrlpool.h \ crypto/x509/x509.h \ crypto/x509/x509_vfy.h \ - crypto/x509v3/x509v3.h \ - e_os2.h \ - fips/fips.h \ - fips/rand/fips_rand.h + crypto/x509v3/x509v3.h HDRS_GEN=\ ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \ @@ -323,15 +463,19 @@ des_enc.po: .endif .if (${MACHINE_ARCH} == "i386") -SRCS+= rc4_skey.c +SRCS+= wp_block.c CFLAGS+= -DAES_ASM CFLAGS+= -DMD5_ASM CFLAGS+= -DSHA1_ASM +CFLAGS+= -DSHA256_ASM +CFLAGS+= -DSHA512_ASM CFLAGS+= -DRMD160_ASM CFLAGS+= -DOPENBSD_DES_ASM CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS CFLAGS+= -DOPENSSL_BN_ASM_MONT CFLAGS+= -DOPENSSL_CPUID_OBJ +CFLAGS+= -DWHIRLPOOL_ASM +CFLAGS+= -DOPENSSL_IA32_SSE2 # XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto #CFLAGS+= -DOPENBSD_CAST_ASM SSLASM=\ @@ -339,56 +483,79 @@ SSLASM=\ bf bf-586 \ bn bn-586 \ bn co-586 \ - bn mo-586 \ + bn x86-mont \ des crypt586 \ des des-586 \ md5 md5-586 \ rc4 rc4-586 \ ripemd rmd-586 \ - sha sha1-586 + sha sha1-586 \ + sha sha256-586 \ + sha sha512-586 \ + whrlpool wp-mmx .for dir f in ${SSLASM} SRCS+= ${f}.S GENERATED+=${f}.S -${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86unix.pl +${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \ - ${LCRYPTO_SRC}/${dir}/asm/${f}.pl openbsd-elf 386 > ${.TARGET} + ${LCRYPTO_SRC}/${dir}/asm/${f}.pl \ + openbsd-elf 386 ${PICFLAG} > ${.TARGET} .endfor SRCS+= x86cpuid.S GENERATED+=x86cpuid.S -x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl - /usr/bin/perl -I${LCRYPTO_SRC}/perlasm \ - ${LCRYPTO_SRC}/x86cpuid.pl openbsd-elf 386 > ${.TARGET} +x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl + /usr/bin/perl -I${LCRYPTO_SRC}/perlasm ${LCRYPTO_SRC}/x86cpuid.pl \ + openbsd-elf 386 ${PICFLAG} > ${.TARGET} SRCS+= bf_cbc.c .elif (${MACHINE_ARCH} == "amd64") -SRCS+= aes_core.c aes_cbc.c -SRCS+= bf_enc.c +SRCS+= bf_enc.c des_enc.c SRCS+= x86_64-gcc.c -#CFLAGS+= -DAES_ASM # XXX ASM implementation SEGVs with MALLOC_OPTIONS=AFGJPRX +SRCS+= fcrypt_b.c +CFLAGS+= -DAES_ASM CFLAGS+= -DMD5_ASM CFLAGS+= -DSHA1_ASM +CFLAGS+= -DSHA512_ASM CFLAGS+= -DOPENSSL_CPUID_OBJ +CFLAGS+= -DOPENSSL_BN_ASM_MONT +CFLAGS+= -DWHIRLPOOL_ASM +CFLAGS+= -DOPENSSL_IA32_SSE2 SSLASM=\ + aes aes-x86_64 \ + aes aesni-x86_64 \ bn x86_64-mont \ md5 md5-x86_64 \ rc4 rc4-x86_64 \ sha sha1-x86_64 \ - aes aesni-x86_64 + whrlpool wp-x86_64 .for dir f in ${SSLASM} SRCS+= ${f}.S GENERATED+=${f}.S ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl - (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./asm/${f}.pl) > ${.TARGET} + (cd ${LCRYPTO_SRC}/${dir} ; \ + /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET} .endfor SRCS+= x86_64cpuid.S GENERATED+=x86_64cpuid.S x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET} +sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl + (cd ${LCRYPTO_SRC}/sha/asm ; \ + /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}) +sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl + (cd ${LCRYPTO_SRC}/sha/asm ; \ + /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}) +SRCS+= sha256-x86_64.S sha512-x86_64.S +GENERATED+=sha256-x86_64.S sha512-x86_64.S .else +# XXX ppccpuid.pl CFLAGS+=-DOPENSSL_NO_ASM +SRCS+= mem_clr.c SRCS+= aes_core.c aes_cbc.c -SRCS+= bf_enc.c +SRCS+= bf_enc.c SRCS+= bn_asm.c +SRCS+= des_enc.c fcrypt_b.c SRCS+= rc4_enc.c rc4_skey.c +SRCS+= wp_block.c .endif all beforedepend: ${GENERATED} diff --git a/lib/libssl/crypto/arch/alpha/opensslconf.h b/lib/libssl/crypto/arch/alpha/opensslconf.h index c57f794ded5..a49bd230319 100644 --- a/lib/libssl/crypto/arch/alpha/opensslconf.h +++ b/lib/libssl/crypto/arch/alpha/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif @@ -148,8 +163,6 @@ #define SIXTY_FOUR_BIT_LONG #undef SIXTY_FOUR_BIT #undef THIRTY_TWO_BIT -#undef SIXTEEN_BIT -#undef EIGHT_BIT #endif #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) diff --git a/lib/libssl/crypto/arch/amd64/opensslconf.h b/lib/libssl/crypto/arch/amd64/opensslconf.h index 48bcf742e38..16314dbc1e7 100644 --- a/lib/libssl/crypto/arch/amd64/opensslconf.h +++ b/lib/libssl/crypto/arch/amd64/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif @@ -148,8 +163,6 @@ #define SIXTY_FOUR_BIT_LONG #undef SIXTY_FOUR_BIT #undef THIRTY_TWO_BIT -#undef SIXTEEN_BIT -#undef EIGHT_BIT #endif #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) diff --git a/lib/libssl/crypto/arch/arm/opensslconf.h b/lib/libssl/crypto/arch/arm/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/arm/opensslconf.h +++ b/lib/libssl/crypto/arch/arm/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/hppa/opensslconf.h b/lib/libssl/crypto/arch/hppa/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/hppa/opensslconf.h +++ b/lib/libssl/crypto/arch/hppa/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/i386/opensslconf.h b/lib/libssl/crypto/arch/i386/opensslconf.h index 93568f382fa..a222ec10070 100644 --- a/lib/libssl/crypto/arch/i386/opensslconf.h +++ b/lib/libssl/crypto/arch/i386/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/m68k/opensslconf.h b/lib/libssl/crypto/arch/m68k/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/m68k/opensslconf.h +++ b/lib/libssl/crypto/arch/m68k/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/m88k/opensslconf.h b/lib/libssl/crypto/arch/m88k/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/m88k/opensslconf.h +++ b/lib/libssl/crypto/arch/m88k/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/mips64/opensslconf.h b/lib/libssl/crypto/arch/mips64/opensslconf.h index c57f794ded5..10cb4e721d4 100644 --- a/lib/libssl/crypto/arch/mips64/opensslconf.h +++ b/lib/libssl/crypto/arch/mips64/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/powerpc/opensslconf.h b/lib/libssl/crypto/arch/powerpc/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/powerpc/opensslconf.h +++ b/lib/libssl/crypto/arch/powerpc/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/sh/opensslconf.h b/lib/libssl/crypto/arch/sh/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/sh/opensslconf.h +++ b/lib/libssl/crypto/arch/sh/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/sparc/opensslconf.h b/lib/libssl/crypto/arch/sparc/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/sparc/opensslconf.h +++ b/lib/libssl/crypto/arch/sparc/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/sparc64/opensslconf.h b/lib/libssl/crypto/arch/sparc64/opensslconf.h index c57f794ded5..10cb4e721d4 100644 --- a/lib/libssl/crypto/arch/sparc64/opensslconf.h +++ b/lib/libssl/crypto/arch/sparc64/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/arch/vax/opensslconf.h b/lib/libssl/crypto/arch/vax/opensslconf.h index fb0979fce34..c1fc4e5d116 100644 --- a/lib/libssl/crypto/arch/vax/opensslconf.h +++ b/lib/libssl/crypto/arch/vax/opensslconf.h @@ -7,21 +7,24 @@ #ifndef OPENSSL_NO_CAMELLIA # define OPENSSL_NO_CAMELLIA #endif -#ifndef OPENSSL_NO_CAPIENG -# define OPENSSL_NO_CAPIENG -#endif #ifndef OPENSSL_NO_CMS # define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP #endif +#ifndef OPENSSL_NO_GOST +# define OPENSSL_NO_GOST +#endif #ifndef OPENSSL_NO_JPAKE # define OPENSSL_NO_JPAKE #endif #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif +#ifndef OPENSSL_NO_MD2 +# define OPENSSL_NO_MD2 +#endif #ifndef OPENSSL_NO_MDC2 # define OPENSSL_NO_MDC2 #endif @@ -34,6 +37,9 @@ #ifndef OPENSSL_NO_SEED # define OPENSSL_NO_SEED #endif +#ifndef OPENSSL_NO_STORE +# define OPENSSL_NO_STORE +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ #ifndef OPENSSL_THREADS @@ -57,9 +63,18 @@ # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) # define NO_GMP # endif +# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) +# define NO_GOST +# endif +# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) +# define NO_JPAKE +# endif # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) # define NO_KRB5 # endif +# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) +# define NO_MD2 +# endif # if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) # define NO_MDC2 # endif @@ -72,8 +87,8 @@ # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) # define NO_SEED # endif -# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) -# define NO_TLSEXT +# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) +# define NO_STORE # endif #endif diff --git a/lib/libssl/crypto/shlib_version b/lib/libssl/crypto/shlib_version index 94727e17b3a..0aab0406bf8 100644 --- a/lib/libssl/crypto/shlib_version +++ b/lib/libssl/crypto/shlib_version @@ -1,2 +1,2 @@ -major=18 +major=19 minor=0 diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile index b948803bb9f..8926ce54239 100644 --- a/lib/libssl/ssl/Makefile +++ b/lib/libssl/ssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2008/09/06 12:20:16 djm Exp $ +# $OpenBSD: Makefile,v 1.23 2010/10/01 23:02:02 djm Exp $ LIB= ssl WANTLINT= @@ -7,35 +7,24 @@ SSLEAYDIST= src LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -DL_ENDIAN -DBN_ASM -.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 - -CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR +CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE CFLAGS+= -DOPENSSL_NO_MDC2 -CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DHAVE_DLFCN_H +CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto -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 \ - 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 \ - d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c d1_srvr.c - -HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h kssl.h dtls1.h +SRCS=\ + s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ + s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ + s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ + t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ + d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \ + d1_both.c d1_enc.c \ + ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ + ssl_ciph.c ssl_stat.c ssl_rsa.c \ + ssl_asn1.c ssl_txt.c ssl_algs.c \ + bio_ssl.c ssl_err.c kssl.c t1_reneg.c + +HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h .PATH: ${LSSL_SRC} diff --git a/lib/libssl/ssl/shlib_version b/lib/libssl/ssl/shlib_version index b9229d35170..84e2c2920d7 100644 --- a/lib/libssl/ssl/shlib_version +++ b/lib/libssl/ssl/shlib_version @@ -1,2 +1,2 @@ -major=15 -minor=1 +major=16 +minor=0 -- cgit v1.2.3