summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <>2010-10-01 23:02:02 +0000
committerdjm <>2010-10-01 23:02:02 +0000
commitca0ad6234b6af7c4007da63eea8d9b826fc8ab87 (patch)
treea5eb6ad6349582b13489bbe51d7f40e5a27963a9
parentef3f0d2ab43605c8936d76a8a55bb41d66ffcc69 (diff)
downloadopenbsd-ca0ad6234b6af7c4007da63eea8d9b826fc8ab87.tar.gz
openbsd-ca0ad6234b6af7c4007da63eea8d9b826fc8ab87.tar.bz2
openbsd-ca0ad6234b6af7c4007da63eea8d9b826fc8ab87.zip
update supporting files, crank library majors
Diffstat
-rw-r--r--src/lib/libssl/crypto/Makefile513
-rw-r--r--src/lib/libssl/crypto/arch/alpha/opensslconf.h27
-rw-r--r--src/lib/libssl/crypto/arch/amd64/opensslconf.h27
-rw-r--r--src/lib/libssl/crypto/arch/arm/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/hppa/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/i386/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/m68k/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/m88k/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/mips64/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/powerpc/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/sh/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/sparc/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/sparc64/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/arch/vax/opensslconf.h25
-rw-r--r--src/lib/libssl/crypto/shlib_version2
-rw-r--r--src/lib/libssl/shlib_version4
-rw-r--r--src/lib/libssl/ssl/Makefile43
-rw-r--r--src/lib/libssl/ssl/shlib_version4
18 files changed, 621 insertions, 274 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index d278be8410..d85aa913da 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.53 2010/07/01 17:44:57 thib Exp $ 1# $OpenBSD: Makefile,v 1.54 2010/10/01 23:01:54 djm Exp $
2 2
3LIB= crypto 3LIB= crypto
4WANTLINT= 4WANTLINT=
@@ -6,7 +6,6 @@ WANTLINT=
6SSLEAYDIST= src 6SSLEAYDIST= src
7SSL_SRC= ${.CURDIR}/../${SSLEAYDIST} 7SSL_SRC= ${.CURDIR}/../${SSLEAYDIST}
8LCRYPTO_SRC= ${SSL_SRC}/crypto 8LCRYPTO_SRC= ${SSL_SRC}/crypto
9FIPS_SRC= ${SSL_SRC}/fips
10 9
11# arm and sh default to little endian, mips defaults to big endian 10# arm and sh default to little endian, mips defaults to big endian
12.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \ 11.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
@@ -32,7 +31,9 @@ CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
32CFLAGS+= -DOPENSSL_NO_IDEA 31CFLAGS+= -DOPENSSL_NO_IDEA
33CFLAGS+= -DOPENSSL_NO_RC5 32CFLAGS+= -DOPENSSL_NO_RC5
34CFLAGS+= -DOPENSSL_NO_KRB5 33CFLAGS+= -DOPENSSL_NO_KRB5
34# NB. MDC2 is off patent now, we can add it whenever we want to
35CFLAGS+= -DOPENSSL_NO_MDC2 35CFLAGS+= -DOPENSSL_NO_MDC2
36CFLAGS+= -DOPENSSL_NO_GOST
36 37
37# Hardware engines 38# Hardware engines
38CFLAGS+= -DOPENSSL_NO_HW_4758_CCA 39CFLAGS+= -DOPENSSL_NO_HW_4758_CCA
@@ -48,163 +49,303 @@ CFLAGS+= -DOPENSSL_NO_HW_UBSEC
48 49
49CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} 50CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
50CFLAGS+= -I${LCRYPTO_SRC} 51CFLAGS+= -I${LCRYPTO_SRC}
51SRCS+= o_time.c o_dir.c o_init.c fips_err.c 52CFLAGS+= -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/evp
52SRCS+= cryptlib.c dyn_lck.c ex_data.c cpt_err.c mem.c mem_dbg.c mem_clr.c 53
53SRCS+= tmdiff.c cversion.c uid.c 54# crypto/
54SRCS+= md2_dgst.c md2_one.c 55SRCS+= cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c
55SRCS+= md5_dgst.c md5_one.c 56SRCS+= ebcdic.c uid.c o_time.c o_str.c o_dir.c
56SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c 57
57#SRCS+= mdc2dgst.c mdc2_one.c 58# acss/
58SRCS+= hmac.c
59SRCS+= rmd_dgst.c rmd_one.c
60SRCS+= acss_skey.c acss_enc.c 59SRCS+= acss_skey.c acss_enc.c
61SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c 60
62SRCS+= aes_ige.c aes_wrap.c 61# aes/
63SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ 62SRCS+= aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c
64 ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ 63
65 ofb64enc.c ofb_enc.c pcbc_enc.c \ 64# asn1/
66 qud_cksm.c rand_key.c rpc_enc.c set_key.c \ 65SRCS+= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c
67 des_lib.c des_enc.c des_old2.c fcrypt_b.c \ 66SRCS+= a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c
68 fcrypt.c xcbc_enc.c ede_cbcm_enc.c \ 67SRCS+= a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c
69 str2key.c cfb64ede.c ofb64ede.c \ 68SRCS+= x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c
70 des_old.c read2pwd.c 69SRCS+= x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c
71SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c 70SRCS+= x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c
72SRCS+= rc2ofb64.c 71SRCS+= t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c
73#SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c 72SRCS+= tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c
74#SRCS+= rc5ofb64.c rc5_enc.c 73SRCS+= tasn_prn.c ameth_lib.c
75#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c 74SRCS+= f_int.c f_string.c n_pkey.c
76#SRCS+= i_skey.c 75SRCS+= f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c
77SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c 76SRCS+= asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c
78SRCS+= c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c 77SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c
79SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c 78
80SRCS+= bn_print.c bn_rand.c bn_shift.c 79# bf/
81SRCS+= bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c 80SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c
82SRCS+= bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_mod.c 81
83SRCS+= bn_exp2.c bn_ctx.c bn_opt.c 82# bio/
84SRCS+= bn_sqrt.c bn_kron.c bn_x931p.c bn_const.c bn_depr.c bn_gf2m.c bn_nist.c 83SRCS+= bio_lib.c bio_cb.c bio_err.c
85#SRCS+= camellia.c cmll_cbc.c cmll_cfb.c cmll_ctr.c 84SRCS+= bss_mem.c bss_null.c bss_fd.c
86#SRCS+= cmll_ecb.c cmll_misc.c cmll_ofb.cq 85SRCS+= bss_file.c bss_sock.c bss_conn.c
87#SRCS+= cms_asn1.c cms_att.c cms_cd.c cms_dd.c cms_enc.c cms_env.c 86SRCS+= bf_null.c bf_buff.c b_print.c b_dump.c
88#SRCS+= cms_err.c cms_ess.c cms_io.c cms_lib.c cms_sd.c cms_smime.c 87SRCS+= b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c
89SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c 88SRCS+= bss_dgram.c
90SRCS+= rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c 89
91SRCS+= rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c rsa_asn1.c 90# bn/
92SRCS+= rsa_pss.c rsa_x931.c rsa_x931g.c rsa_depr.c rsa_eng.c 91SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c
93SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c 92SRCS+= bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c
94SRCS+= dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c dsa_depr.c dsa_utl.c 93SRCS+= bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c
95SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c dh_depr.c 94SRCS+= bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c
96SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c 95SRCS+= bn_depr.c bn_const.c
97SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c 96
98SRCS+= ec2_mult.c ec2_smpl.c ec_asn1.c ec_check.c ec_curve.c 97# buffer/
99SRCS+= ec_key.c ec_print.c 98SRCS+= buffer.c buf_err.c
100SRCS+= ech_err.c ech_key.c ech_lib.c ech_ossl.c 99
101SRCS+= ecs_asn1.c ecs_err.c ecs_lib.c ecs_ossl.c ecs_sign.c ecs_vrf.c 100# camellia/
102SRCS+= buffer.c buf_str.c buf_err.c 101#SRCS+= cmll_ecb.c cmll_ofb.c cmll_cfb.c cmll_ctr.c
103SRCS+= bio_lib.c bio_cb.c bio_err.c bss_mem.c 102
104SRCS+= bss_null.c bss_fd.c bss_file.c bss_sock.c 103# cast/
105SRCS+= bss_conn.c bf_null.c bf_buff.c 104SRCS+= c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
106SRCS+= b_print.c b_dump.c b_sock.c bss_acpt.c 105
107SRCS+= bf_nbio.c bss_bio.c bss_log.c bss_dgram.c 106# cms/
108SRCS+= stack.c 107#SRCS+= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c
109SRCS+= lhash.c lh_stats.c 108#SRCS+= cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
110SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_eng.c 109
111SRCS+= rand_err.c rand_unix.c 110# comp/
112SRCS+= err.c err_def.c err_all.c err_prn.c err_str.c err_bio.c 111SRCS+= comp_lib.c comp_err.c c_rle.c c_zlib.c
113SRCS+= obj_dat.c obj_lib.c obj_err.c o_names.c 112
114SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c 113# conf/
115SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c 114SRCS+= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c
116SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c 115SRCS+= conf_mall.c conf_sap.c
117SRCS+= bio_ok.c e_des3.c dig_eng.c evp_enc.c m_md2.c p_verify.c m_ecdsa.c 116
118#SRCS+= e_camellia.c e_seed.c 117# des/
119SRCS+= c_all.c evp_err.c evp_acnf.c evp_cnf.c m_md4.c p5_crpt.c e_old.c 118SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c
120SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c 119SRCS+= ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c
121SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c 120SRCS+= fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c
122SRCS+= digest.c e_rc2.c enc_min.c evp_pbe.c m_null.c p_enc.c 121SRCS+= qud_cksm.c rand_key.c rpc_enc.c set_key.c xcbc_enc.c
123SRCS+= e_acss.c e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c 122SRCS+= str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c des_old2.c
124SRCS+= md4_dgst.c md4_one.c 123SRCS+= read2pwd.c
125SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_pkey.c 124
126SRCS+= pem_all.c pem_err.c pem_x509.c pem_pk8.c pem_oth.c pem_xaux.c 125# dh/
127SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_compat.c ui_util.c 126SRCS+= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c
128SRCS+= a_bitstr.c a_mbstr.c a_utctm.c f_enum.c t_bitst.c x_name.c 127SRCS+= dh_ameth.c dh_pmeth.c dh_prn.c
129SRCS+= a_bool.c a_meth.c a_utf8.c f_int.c t_crl.c tasn_typ.c x_pkey.c 128
130SRCS+= a_bytes.c a_object.c a_verify.c f_string.c t_pkey.c tasn_utl.c x_pubkey.c 129# dsa/
131SRCS+= a_d2i_fp.c a_octet.c asn1_err.c i2d_pr.c t_req.c x_algor.c x_req.c 130SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c
132SRCS+= a_digest.c a_print.c asn1_lib.c i2d_pu.c t_spki.c x_attrib.c x_sig.c 131SRCS+= dsa_err.c dsa_ossl.c dsa_depr.c dsa_ameth.c dsa_pmeth.c dsa_prn.c
133SRCS+= a_dup.c a_set.c asn1_par.c n_pkey.c t_x509.c x_bignum.c x_spki.c 132
134SRCS+= a_enum.c a_sign.c asn_pack.c nsseq.c t_x509a.c x_val.c 133# dso/
135SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c
136SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c
137SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c
138SRCS+= a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c
139SRCS+= asn1_gen.c asn_mime.c
140SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c
141SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c
142SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c
143SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c
144SRCS+= x509_vpm.c
145SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c
146SRCS+= v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c
147SRCS+= v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c
148SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c v3_pci.c v3_pcia.c
149SRCS+= pcy_cache.c pcy_data.c pcy_int.h pcy_lib.c pcy_map.c pcy_node.c
150SRCS+= pcy_tree.c v3_addr.c v3_asid.c v3_ncons.c v3_pcons.c v3_pmaps.c
151SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c
152SRCS+= conf_sap.c
153SRCS+= txt_db.c
154SRCS+= pk7_lib.c pkcs7err.c
155SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c
156SRCS+= pk7_attr.c pk7_smime.c
157SRCS+= c_rle.c c_zlib.c comp_lib.c comp_err.c
158SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c
159SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c
160SRCS+= p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c
161SRCS+= eng_all.c eng_openssl.c eng_ctrl.c eng_pkey.c eng_aesni.c
162SRCS+= eng_dyn.c eng_table.c tb_cipher.c tb_store.c eng_err.c tb_rsa.c
163SRCS+= tb_ecdh.c tb_ecdsa.c
164SRCS+= hw_cryptodev.c eng_cnf.c
165SRCS+= tb_dh.c eng_fat.c tb_digest.c eng_init.c
166SRCS+= tb_dsa.c eng_lib.c tb_rand.c eng_list.c
167SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c 134SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c
168SRCS+= dso_openssl.c dso_win32.c dso_vms.c 135SRCS+= dso_openssl.c dso_win32.c dso_vms.c dso_beos.c
169SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c 136
170SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c 137# ec/
171SRCS+= pqueue.c 138SRCS+= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c
172#SRCS+= seed.c seed_cbc.c seed_cfb.c seed_ecb.c seed_ofb.c 139SRCS+= ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c
173SRCS+= str_err.c str_lib.c str_mem.c str_meth.c 140SRCS+= ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c
174# Only used when -DOPENSSL_FIPS is set 141
175#SRCS+= fips.c fips_err_wrapper.c 142# ecdh/
176#SRCS+= fips_aes_core.c fips_aes_selftest.c 143SRCS+= ech_lib.c ech_ossl.c ech_key.c ech_err.c
177#SRCS+= fips_des_enc.c fips_des_selftest.c fips_set_key.c 144
178#SRCS+= fips_dh_check.c fips_dh_gen.c fips_dh_key.c 145# ecdsa/
179#SRCS+= fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c 146SRCS+= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c
180#SRCS+= fips_rand.c 147
181#SRCS+= fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c 148# engine/
182#SRCS+= fips_sha1dgst.c fips_sha1_selftest.c 149SRCS+= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c
183 150SRCS+= eng_table.c eng_pkey.c eng_fat.c eng_all.c
184.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha \ 151SRCS+= tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c
185 ${LCRYPTO_SRC}/mdc2 ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd \ 152SRCS+= tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c
186 ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 ${LCRYPTO_SRC}/rc4 \ 153SRCS+= eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c
187 ${LCRYPTO_SRC}/rc5 ${LCRYPTO_SRC}/idea ${LCRYPTO_SRC}/bf \ 154SRCS+= eng_aesni.c # local addition
188 ${LCRYPTO_SRC}/cast ${LCRYPTO_SRC}/bn ${LCRYPTO_SRC}/rsa \ 155
189 ${LCRYPTO_SRC}/dsa ${LCRYPTO_SRC}/dh ${LCRYPTO_SRC}/buffer \ 156# err/
190 ${LCRYPTO_SRC}/bio ${LCRYPTO_SRC}/stack ${LCRYPTO_SRC}/lhash \ 157SRCS+= err.c err_all.c err_prn.c
191 ${LCRYPTO_SRC}/rand ${LCRYPTO_SRC}/err ${LCRYPTO_SRC}/objects \ 158
192 ${LCRYPTO_SRC}/evp ${LCRYPTO_SRC}/pem ${LCRYPTO_SRC}/asn1 \ 159# evp/
193 ${LCRYPTO_SRC}/asn1 ${LCRYPTO_SRC}/x509 ${LCRYPTO_SRC}/conf \ 160SRCS+= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c
194 ${LCRYPTO_SRC}/pkcs7 ${LCRYPTO_SRC}/x509v3 ${LCRYPTO_SRC}/pkcs12 \ 161SRCS+= e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c
195 ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \ 162SRCS+= e_rc4.c e_aes.c names.c e_seed.c
196 ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \ 163SRCS+= e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c
197 ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes \ 164SRCS+= m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c
198 ${LCRYPTO_SRC}/camellia ${LCRYPTO_SRC}/seed ${LCRYPTO_SRC}/cms \ 165SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c
199 ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/ecdh ${LCRYPTO_SRC}/ecdsa \ 166SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c
200 ${LCRYPTO_SRC}/pqueue ${LCRYPTO_SRC}/store \ 167SRCS+= bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c
168SRCS+= c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c
169SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
170SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
171SRCS+= e_acss.c # Local addition
172
173# hmac/
174SRCS+= hmac.c hm_ameth.c hm_pmeth.c
175
176# idea/
177#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c i_skey.c
178
179# jpake/
180#SRCS+= jpake.c jpake_err.c
181
182# krb5/
183SRCS+= krb5_asn.c
184
185# lhash/
186SRCS+= lhash.c lh_stats.c
187
188# md2
189##SRCS+= md2_dgst.c md2_one.c
190
191# md4/
192SRCS+= md4_dgst.c md4_one.c
193
194# md5/
195SRCS+= md5_dgst.c md5_one.c
196
197# mdc2/
198#SRCS+= mdc2dgst.c mdc2_one.c
199
200# modes/
201SRCS+= cbc128.c ctr128.c cts128.c cfb128.c ofb128.c
202
203# objects/
204SRCS+= o_names.c obj_dat.c obj_lib.c obj_err.c obj_xref.c
205
206# ocsp/
207SRCS+= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c
208SRCS+= ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c
209
210# pem/
211SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c
212SRCS+= pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c
213
214# pkcs12/
215SRCS+= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c
216SRCS+= p12_init.c p12_key.c p12_kiss.c p12_mutl.c
217SRCS+= p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c
218
219# pkcs7/
220SRCS+= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c
221SRCS+= pk7_mime.c bio_pk7.c
222
223# pqueue/
224SRCS+= pqueue.c
225
226# rand/
227SRCS+= md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c
228SRCS+= rand_win.c rand_unix.c rand_os2.c rand_nw.c
229
230# rc2/
231SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
232
233# rc5/
234#SRCS+= rc5_skey.c rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c
235
236# ripemd/
237SRCS+= rmd_dgst.c rmd_one.c
238
239# rsa/
240SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c
241SRCS+= rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c
242SRCS+= rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c
243SRCS+= rsa_pmeth.c
244
245# seed/
246#SRCS+= seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
247
248# sha/
249SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c
250
251# stack/
252SRCS+= stack.c
253
254# store/
255#SRCS+= str_err.c str_lib.c str_meth.c str_mem.c
256
257# ts/
258SRCS+= ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c ts_rsp_print.c
259SRCS+= ts_rsp_sign.c ts_rsp_verify.c ts_verify_ctx.c ts_lib.c ts_conf.c
260SRCS+= ts_asn1.c
261
262# txt_db/
263SRCS+=txt_db.c
264
265# ui/
266SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_util.c ui_compat.c
267
268# whrlpool/
269SRCS+= wp_dgst.c
270
271# x509/
272SRCS+= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c
273SRCS+= x509_obj.c x509_req.c x509spki.c x509_vfy.c
274SRCS+= x509_set.c x509cset.c x509rset.c x509_err.c
275SRCS+= x509name.c x509_v3.c x509_ext.c x509_att.c
276SRCS+= x509type.c x509_lu.c x_all.c x509_txt.c
277SRCS+= x509_trs.c by_file.c by_dir.c x509_vpm.c
278
279# x509v3/
280SRCS+= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c
281SRCS+= v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c
282SRCS+= v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c
283SRCS+= v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c
284SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c
285SRCS+= v3_asid.c v3_addr.c
286
287.PATH: ${.CURDIR}/arch/${MACHINE_CPU} \
201 ${LCRYPTO_SRC} \ 288 ${LCRYPTO_SRC} \
202 ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_CPU} \ 289 ${LCRYPTO_SRC}/acss \
290 ${LCRYPTO_SRC}/aes \
291 ${LCRYPTO_SRC}/asn1 \
292 ${LCRYPTO_SRC}/bf \
293 ${LCRYPTO_SRC}/bio \
294 ${LCRYPTO_SRC}/bn \
203 ${LCRYPTO_SRC}/bn/asm \ 295 ${LCRYPTO_SRC}/bn/asm \
204 ${FIPS_SRC}/ ${FIPS_SRC}/aes ${FIPS_SRC}/des ${FIPS_SRC}/dh \ 296 ${LCRYPTO_SRC}/buffer \
205 ${FIPS_SRC}/dsa ${FIPS_SRC}/rand ${FIPS_SRC}/rsa ${FIPS_SRC}/sha1 297 ${LCRYPTO_SRC}/camellia \
298 ${LCRYPTO_SRC}/cast \
299 ${LCRYPTO_SRC}/cms \
300 ${LCRYPTO_SRC}/comp \
301 ${LCRYPTO_SRC}/conf \
302 ${LCRYPTO_SRC}/des \
303 ${LCRYPTO_SRC}/dh \
304 ${LCRYPTO_SRC}/dsa \
305 ${LCRYPTO_SRC}/dso \
306 ${LCRYPTO_SRC}/ec \
307 ${LCRYPTO_SRC}/ecdh \
308 ${LCRYPTO_SRC}/ecdsa \
309 ${LCRYPTO_SRC}/engine \
310 ${LCRYPTO_SRC}/err \
311 ${LCRYPTO_SRC}/evp \
312 ${LCRYPTO_SRC}/md2 \
313 ${LCRYPTO_SRC}/hmac \
314 ${LCRYPTO_SRC}/idea \
315 ${LCRYPTO_SRC}/jpake \
316 ${LCRYPTO_SRC}/krb5 \
317 ${LCRYPTO_SRC}/lhash \
318 ${LCRYPTO_SRC}/md4 \
319 ${LCRYPTO_SRC}/md5 \
320 ${LCRYPTO_SRC}/mdc2 \
321 ${LCRYPTO_SRC}/modes \
322 ${LCRYPTO_SRC}/objects \
323 ${LCRYPTO_SRC}/ocsp \
324 ${LCRYPTO_SRC}/pem \
325 ${LCRYPTO_SRC}/perlasm \
326 ${LCRYPTO_SRC}/pkcs12 \
327 ${LCRYPTO_SRC}/pkcs7 \
328 ${LCRYPTO_SRC}/pqueue \
329 ${LCRYPTO_SRC}/rand \
330 ${LCRYPTO_SRC}/rc2 \
331 ${LCRYPTO_SRC}/rc4 \
332 ${LCRYPTO_SRC}/rc5 \
333 ${LCRYPTO_SRC}/ripemd \
334 ${LCRYPTO_SRC}/rsa \
335 ${LCRYPTO_SRC}/seed \
336 ${LCRYPTO_SRC}/sha \
337 ${LCRYPTO_SRC}/stack \
338 ${LCRYPTO_SRC}/store \
339 ${LCRYPTO_SRC}/threads \
340 ${LCRYPTO_SRC}/ts \
341 ${LCRYPTO_SRC}/txt_db \
342 ${LCRYPTO_SRC}/ui \
343 ${LCRYPTO_SRC}/whrlpool \
344 ${LCRYPTO_SRC}/x509 \
345 ${LCRYPTO_SRC}/x509v3
206 346
207HDRS=\ 347HDRS=\
348 e_os2.h \
208 crypto/acss/acss.h \ 349 crypto/acss/acss.h \
209 crypto/aes/aes.h \ 350 crypto/aes/aes.h \
210 crypto/asn1/asn1.h \ 351 crypto/asn1/asn1.h \
@@ -235,11 +376,13 @@ HDRS=\
235 crypto/evp/evp.h \ 376 crypto/evp/evp.h \
236 crypto/hmac/hmac.h \ 377 crypto/hmac/hmac.h \
237 crypto/idea/idea.h \ 378 crypto/idea/idea.h \
379 crypto/krb5/krb5_asn.h \
238 crypto/lhash/lhash.h \ 380 crypto/lhash/lhash.h \
239 crypto/md2/md2.h \ 381 crypto/md2/md2.h \
240 crypto/md4/md4.h \ 382 crypto/md4/md4.h \
241 crypto/md5/md5.h \ 383 crypto/md5/md5.h \
242 crypto/mdc2/mdc2.h \ 384 crypto/mdc2/mdc2.h \
385 crypto/modes/modes.h \
243 crypto/objects/objects.h \ 386 crypto/objects/objects.h \
244 crypto/ocsp/ocsp.h \ 387 crypto/ocsp/ocsp.h \
245 crypto/opensslv.h \ 388 crypto/opensslv.h \
@@ -248,7 +391,6 @@ HDRS=\
248 crypto/pem/pem2.h \ 391 crypto/pem/pem2.h \
249 crypto/pkcs12/pkcs12.h \ 392 crypto/pkcs12/pkcs12.h \
250 crypto/pkcs7/pkcs7.h \ 393 crypto/pkcs7/pkcs7.h \
251 crypto/pqueue/pq_compat.h \
252 crypto/pqueue/pqueue.h \ 394 crypto/pqueue/pqueue.h \
253 crypto/rand/rand.h \ 395 crypto/rand/rand.h \
254 crypto/rc2/rc2.h \ 396 crypto/rc2/rc2.h \
@@ -262,16 +404,14 @@ HDRS=\
262 crypto/stack/stack.h \ 404 crypto/stack/stack.h \
263 crypto/store/store.h \ 405 crypto/store/store.h \
264 crypto/symhacks.h \ 406 crypto/symhacks.h \
265 crypto/tmdiff.h \ 407 crypto/ts/ts.h \
266 crypto/txt_db/txt_db.h \ 408 crypto/txt_db/txt_db.h \
267 crypto/ui/ui.h \ 409 crypto/ui/ui.h \
268 crypto/ui/ui_compat.h \ 410 crypto/ui/ui_compat.h \
411 crypto/whrlpool/whrlpool.h \
269 crypto/x509/x509.h \ 412 crypto/x509/x509.h \
270 crypto/x509/x509_vfy.h \ 413 crypto/x509/x509_vfy.h \
271 crypto/x509v3/x509v3.h \ 414 crypto/x509v3/x509v3.h
272 e_os2.h \
273 fips/fips.h \
274 fips/rand/fips_rand.h
275 415
276HDRS_GEN=\ 416HDRS_GEN=\
277 ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \ 417 ${.CURDIR}/arch/${MACHINE_CPU}/opensslconf.h \
@@ -323,15 +463,19 @@ des_enc.po:
323.endif 463.endif
324 464
325.if (${MACHINE_ARCH} == "i386") 465.if (${MACHINE_ARCH} == "i386")
326SRCS+= rc4_skey.c 466SRCS+= wp_block.c
327CFLAGS+= -DAES_ASM 467CFLAGS+= -DAES_ASM
328CFLAGS+= -DMD5_ASM 468CFLAGS+= -DMD5_ASM
329CFLAGS+= -DSHA1_ASM 469CFLAGS+= -DSHA1_ASM
470CFLAGS+= -DSHA256_ASM
471CFLAGS+= -DSHA512_ASM
330CFLAGS+= -DRMD160_ASM 472CFLAGS+= -DRMD160_ASM
331CFLAGS+= -DOPENBSD_DES_ASM 473CFLAGS+= -DOPENBSD_DES_ASM
332CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS 474CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
333CFLAGS+= -DOPENSSL_BN_ASM_MONT 475CFLAGS+= -DOPENSSL_BN_ASM_MONT
334CFLAGS+= -DOPENSSL_CPUID_OBJ 476CFLAGS+= -DOPENSSL_CPUID_OBJ
477CFLAGS+= -DWHIRLPOOL_ASM
478CFLAGS+= -DOPENSSL_IA32_SSE2
335# XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto 479# XXX bad relocation in CAST ASM code leads to TEXTREL for shared libcrypto
336#CFLAGS+= -DOPENBSD_CAST_ASM 480#CFLAGS+= -DOPENBSD_CAST_ASM
337SSLASM=\ 481SSLASM=\
@@ -339,56 +483,79 @@ SSLASM=\
339 bf bf-586 \ 483 bf bf-586 \
340 bn bn-586 \ 484 bn bn-586 \
341 bn co-586 \ 485 bn co-586 \
342 bn mo-586 \ 486 bn x86-mont \
343 des crypt586 \ 487 des crypt586 \
344 des des-586 \ 488 des des-586 \
345 md5 md5-586 \ 489 md5 md5-586 \
346 rc4 rc4-586 \ 490 rc4 rc4-586 \
347 ripemd rmd-586 \ 491 ripemd rmd-586 \
348 sha sha1-586 492 sha sha1-586 \
493 sha sha256-586 \
494 sha sha512-586 \
495 whrlpool wp-mmx
349.for dir f in ${SSLASM} 496.for dir f in ${SSLASM}
350SRCS+= ${f}.S 497SRCS+= ${f}.S
351GENERATED+=${f}.S 498GENERATED+=${f}.S
352${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86unix.pl 499${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
353 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \ 500 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \
354 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl openbsd-elf 386 > ${.TARGET} 501 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl \
502 openbsd-elf 386 ${PICFLAG} > ${.TARGET}
355.endfor 503.endfor
356SRCS+= x86cpuid.S 504SRCS+= x86cpuid.S
357GENERATED+=x86cpuid.S 505GENERATED+=x86cpuid.S
358x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl 506x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl ${LCRYPTO_SRC}/perlasm/x86gas.pl
359 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm \ 507 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm ${LCRYPTO_SRC}/x86cpuid.pl \
360 ${LCRYPTO_SRC}/x86cpuid.pl openbsd-elf 386 > ${.TARGET} 508 openbsd-elf 386 ${PICFLAG} > ${.TARGET}
361SRCS+= bf_cbc.c 509SRCS+= bf_cbc.c
362.elif (${MACHINE_ARCH} == "amd64") 510.elif (${MACHINE_ARCH} == "amd64")
363SRCS+= aes_core.c aes_cbc.c 511SRCS+= bf_enc.c des_enc.c
364SRCS+= bf_enc.c
365SRCS+= x86_64-gcc.c 512SRCS+= x86_64-gcc.c
366#CFLAGS+= -DAES_ASM # XXX ASM implementation SEGVs with MALLOC_OPTIONS=AFGJPRX 513SRCS+= fcrypt_b.c
514CFLAGS+= -DAES_ASM
367CFLAGS+= -DMD5_ASM 515CFLAGS+= -DMD5_ASM
368CFLAGS+= -DSHA1_ASM 516CFLAGS+= -DSHA1_ASM
517CFLAGS+= -DSHA512_ASM
369CFLAGS+= -DOPENSSL_CPUID_OBJ 518CFLAGS+= -DOPENSSL_CPUID_OBJ
519CFLAGS+= -DOPENSSL_BN_ASM_MONT
520CFLAGS+= -DWHIRLPOOL_ASM
521CFLAGS+= -DOPENSSL_IA32_SSE2
370SSLASM=\ 522SSLASM=\
523 aes aes-x86_64 \
524 aes aesni-x86_64 \
371 bn x86_64-mont \ 525 bn x86_64-mont \
372 md5 md5-x86_64 \ 526 md5 md5-x86_64 \
373 rc4 rc4-x86_64 \ 527 rc4 rc4-x86_64 \
374 sha sha1-x86_64 \ 528 sha sha1-x86_64 \
375 aes aesni-x86_64 529 whrlpool wp-x86_64
376.for dir f in ${SSLASM} 530.for dir f in ${SSLASM}
377SRCS+= ${f}.S 531SRCS+= ${f}.S
378GENERATED+=${f}.S 532GENERATED+=${f}.S
379${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl 533${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
380 (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./asm/${f}.pl) > ${.TARGET} 534 (cd ${LCRYPTO_SRC}/${dir} ; \
535 /usr/bin/perl ./asm/${f}.pl openbsd-elf) > ${.TARGET}
381.endfor 536.endfor
382SRCS+= x86_64cpuid.S 537SRCS+= x86_64cpuid.S
383GENERATED+=x86_64cpuid.S 538GENERATED+=x86_64cpuid.S
384x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl 539x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl
385 (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET} 540 (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
541sha256-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
542 (cd ${LCRYPTO_SRC}/sha/asm ; \
543 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET})
544sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl
545 (cd ${LCRYPTO_SRC}/sha/asm ; \
546 /usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET})
547SRCS+= sha256-x86_64.S sha512-x86_64.S
548GENERATED+=sha256-x86_64.S sha512-x86_64.S
386.else 549.else
550# XXX ppccpuid.pl
387CFLAGS+=-DOPENSSL_NO_ASM 551CFLAGS+=-DOPENSSL_NO_ASM
552SRCS+= mem_clr.c
388SRCS+= aes_core.c aes_cbc.c 553SRCS+= aes_core.c aes_cbc.c
389SRCS+= bf_enc.c 554SRCS+= bf_enc.c
390SRCS+= bn_asm.c 555SRCS+= bn_asm.c
556SRCS+= des_enc.c fcrypt_b.c
391SRCS+= rc4_enc.c rc4_skey.c 557SRCS+= rc4_enc.c rc4_skey.c
558SRCS+= wp_block.c
392.endif 559.endif
393 560
394all beforedepend: ${GENERATED} 561all beforedepend: ${GENERATED}
diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
index c57f794ded..a49bd23031 100644
--- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
@@ -148,8 +163,6 @@
148#define SIXTY_FOUR_BIT_LONG 163#define SIXTY_FOUR_BIT_LONG
149#undef SIXTY_FOUR_BIT 164#undef SIXTY_FOUR_BIT
150#undef THIRTY_TWO_BIT 165#undef THIRTY_TWO_BIT
151#undef SIXTEEN_BIT
152#undef EIGHT_BIT
153#endif 166#endif
154 167
155#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) 168#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
index 48bcf742e3..16314dbc1e 100644
--- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
@@ -148,8 +163,6 @@
148#define SIXTY_FOUR_BIT_LONG 163#define SIXTY_FOUR_BIT_LONG
149#undef SIXTY_FOUR_BIT 164#undef SIXTY_FOUR_BIT
150#undef THIRTY_TWO_BIT 165#undef THIRTY_TWO_BIT
151#undef SIXTEEN_BIT
152#undef EIGHT_BIT
153#endif 166#endif
154 167
155#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) 168#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h
index 93568f382f..a222ec1007 100644
--- a/src/lib/libssl/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
index c57f794ded..10cb4e721d 100644
--- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
index c57f794ded..10cb4e721d 100644
--- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h
index fb0979fce3..c1fc4e5d11 100644
--- a/src/lib/libssl/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h
@@ -7,21 +7,24 @@
7#ifndef OPENSSL_NO_CAMELLIA 7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA 8# define OPENSSL_NO_CAMELLIA
9#endif 9#endif
10#ifndef OPENSSL_NO_CAPIENG
11# define OPENSSL_NO_CAPIENG
12#endif
13#ifndef OPENSSL_NO_CMS 10#ifndef OPENSSL_NO_CMS
14# define OPENSSL_NO_CMS 11# define OPENSSL_NO_CMS
15#endif 12#endif
16#ifndef OPENSSL_NO_GMP 13#ifndef OPENSSL_NO_GMP
17# define OPENSSL_NO_GMP 14# define OPENSSL_NO_GMP
18#endif 15#endif
16#ifndef OPENSSL_NO_GOST
17# define OPENSSL_NO_GOST
18#endif
19#ifndef OPENSSL_NO_JPAKE 19#ifndef OPENSSL_NO_JPAKE
20# define OPENSSL_NO_JPAKE 20# define OPENSSL_NO_JPAKE
21#endif 21#endif
22#ifndef OPENSSL_NO_KRB5 22#ifndef OPENSSL_NO_KRB5
23# define OPENSSL_NO_KRB5 23# define OPENSSL_NO_KRB5
24#endif 24#endif
25#ifndef OPENSSL_NO_MD2
26# define OPENSSL_NO_MD2
27#endif
25#ifndef OPENSSL_NO_MDC2 28#ifndef OPENSSL_NO_MDC2
26# define OPENSSL_NO_MDC2 29# define OPENSSL_NO_MDC2
27#endif 30#endif
@@ -34,6 +37,9 @@
34#ifndef OPENSSL_NO_SEED 37#ifndef OPENSSL_NO_SEED
35# define OPENSSL_NO_SEED 38# define OPENSSL_NO_SEED
36#endif 39#endif
40#ifndef OPENSSL_NO_STORE
41# define OPENSSL_NO_STORE
42#endif
37 43
38#endif /* OPENSSL_DOING_MAKEDEPEND */ 44#endif /* OPENSSL_DOING_MAKEDEPEND */
39#ifndef OPENSSL_THREADS 45#ifndef OPENSSL_THREADS
@@ -57,9 +63,18 @@
57# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) 63# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
58# define NO_GMP 64# define NO_GMP
59# endif 65# endif
66# if defined(OPENSSL_NO_GOST) && !defined(NO_GOST)
67# define NO_GOST
68# endif
69# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
70# define NO_JPAKE
71# endif
60# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 72# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
61# define NO_KRB5 73# define NO_KRB5
62# endif 74# endif
75# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
76# define NO_MD2
77# endif
63# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) 78# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
64# define NO_MDC2 79# define NO_MDC2
65# endif 80# endif
@@ -72,8 +87,8 @@
72# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) 87# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
73# define NO_SEED 88# define NO_SEED
74# endif 89# endif
75# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT) 90# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
76# define NO_TLSEXT 91# define NO_STORE
77# endif 92# endif
78#endif 93#endif
79 94
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
index 94727e17b3..0aab0406bf 100644
--- a/src/lib/libssl/crypto/shlib_version
+++ b/src/lib/libssl/crypto/shlib_version
@@ -1,2 +1,2 @@
1major=18 1major=19
2minor=0 2minor=0
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version
index b9229d3517..84e2c2920d 100644
--- a/src/lib/libssl/shlib_version
+++ b/src/lib/libssl/shlib_version
@@ -1,2 +1,2 @@
1major=15 1major=16
2minor=1 2minor=0
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index b948803bb9..8926ce5423 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.22 2008/09/06 12:20:16 djm Exp $ 1# $OpenBSD: Makefile,v 1.23 2010/10/01 23:02:02 djm Exp $
2 2
3LIB= ssl 3LIB= ssl
4WANTLINT= 4WANTLINT=
@@ -7,35 +7,24 @@ SSLEAYDIST= src
7 7
8LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl 8LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
9 9
10.if ${MACHINE_ARCH} == "i386" 10CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE
11CFLAGS+= -DL_ENDIAN -DBN_ASM
12.else
13.if ${MACHINE_ARCH} == "vax"
14CFLAGS+= -DL_ENDIAN
15.else
16.if ${MACHINE_ARCH} == "alpha"
17# no ENDIAN stuff defined for alpha
18.else
19CFLAGS+= -DB_ENDIAN
20.endif
21.endif
22.endif
23
24CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR
25CFLAGS+= -DOPENSSL_NO_MDC2 11CFLAGS+= -DOPENSSL_NO_MDC2
26CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 -DHAVE_DLFCN_H 12CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5
27CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto 13CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} -I${.CURDIR}/../${SSLEAYDIST}/crypto
28 14
29SRCS= bio_ssl.c s2_clnt.c s3_both.c s3_srvr.c ssl_err2.c ssl_txt.c \ 15SRCS=\
30 t1_srvr.c s23_clnt.c s2_enc.c s3_clnt.c ssl_algs.c ssl_lib.c \ 16 s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
31 s23_lib.c s2_lib.c s3_enc.c ssl_asn1.c ssl_rsa.c \ 17 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
32 t1_clnt.c s23_meth.c s2_meth.c s3_lib.c ssl_cert.c ssl_sess.c \ 18 s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
33 t1_enc.c s23_pkt.c s2_pkt.c s3_meth.c ssl_ciph.c ssl_stat.c \ 19 t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
34 t1_lib.c s23_srvr.c s2_srvr.c s3_pkt.c ssl_err.c \ 20 d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
35 t1_meth.c \ 21 d1_both.c d1_enc.c \
36 d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c d1_srvr.c 22 ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
37 23 ssl_ciph.c ssl_stat.c ssl_rsa.c \
38HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h kssl.h dtls1.h 24 ssl_asn1.c ssl_txt.c ssl_algs.c \
25 bio_ssl.c ssl_err.c kssl.c t1_reneg.c
26
27HDRS= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h
39 28
40.PATH: ${LSSL_SRC} 29.PATH: ${LSSL_SRC}
41 30
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
index b9229d3517..84e2c2920d 100644
--- a/src/lib/libssl/ssl/shlib_version
+++ b/src/lib/libssl/ssl/shlib_version
@@ -1,2 +1,2 @@
1major=15 1major=16
2minor=1 2minor=0
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-20 12:05:50 +0000