summaryrefslogtreecommitdiff
path: root/src/lib/libssl/crypto
diff options
context:
space:
mode:
authordjm <>2008-09-06 12:20:16 +0000
committerdjm <>2008-09-06 12:20:16 +0000
commite08b42612a6c7d5705254f96233d4d7fa1907a4f (patch)
tree8bad2049c8c0044c7964fd985794ad61777e7163 /src/lib/libssl/crypto
parent38ce604e3cc97706b876b0525ddff0121115456d (diff)
downloadopenbsd-e08b42612a6c7d5705254f96233d4d7fa1907a4f.tar.gz
openbsd-e08b42612a6c7d5705254f96233d4d7fa1907a4f.tar.bz2
openbsd-e08b42612a6c7d5705254f96233d4d7fa1907a4f.zip
remerge local tweaks, update per-arch configuration headers, update
Makefiles, crank shlib_version
Diffstat (limited to 'src/lib/libssl/crypto')
-rw-r--r--src/lib/libssl/crypto/Makefile139
-rw-r--r--src/lib/libssl/crypto/arch/alpha/opensslconf.h61
-rw-r--r--src/lib/libssl/crypto/arch/amd64/opensslconf.h65
-rw-r--r--src/lib/libssl/crypto/arch/arm/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/hppa/opensslconf.h59
-rw-r--r--src/lib/libssl/crypto/arch/i386/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/m68k/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/m88k/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/mips64/opensslconf.h61
-rw-r--r--src/lib/libssl/crypto/arch/powerpc/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sh/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sparc/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/arch/sparc64/opensslconf.h59
-rw-r--r--src/lib/libssl/crypto/arch/vax/opensslconf.h57
-rw-r--r--src/lib/libssl/crypto/shlib_version2
15 files changed, 838 insertions, 64 deletions
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index f281086962..6994201d34 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.46 2006/10/14 19:43:57 drahn Exp $ 1# $OpenBSD: Makefile,v 1.47 2008/09/06 12:20:07 djm Exp $
2 2
3LIB= crypto 3LIB= crypto
4WANTLINT= 4WANTLINT=
@@ -21,26 +21,38 @@ CFLAGS+= -DB_ENDIAN
21CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H 21CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H
22.endif 22.endif
23 23
24CFLAGS+= -DOPENSSL_NO_IDEA -DTERMIOS -DANSI_SOURCE -DNO_ERR -DOPENSSL_NO_ASM 24CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
25CFLAGS+= -DOPENSSL_NO_RC5 -DOPENSSL_NO_KRB5 25# Patented algorithms
26CFLAGS+= -DOPENSSL_NO_IDEA
27CFLAGS+= -DOPENSSL_NO_RC5
28CFLAGS+= -DOPENSSL_NO_KRB5
26CFLAGS+= -DOPENSSL_NO_MDC2 29CFLAGS+= -DOPENSSL_NO_MDC2
27CFLAGS+= -DNO_WINDOWS_BRAINDEATH 30
28CFLAGS+= -DOPENSSL_NO_HW_CSWIFT -DOPENSSL_NO_HW_NCIPHER -DOPENSSL_NO_HW_ATALLA 31# Hardware engines
29CFLAGS+= -DOPENSSL_NO_HW_NURON -DOPENSSL_NO_HW_UBSEC -DOPENSSL_NO_HW_AEP 32CFLAGS+= -DOPENSSL_NO_HW_4758_CCA
30CFLAGS+= -DOPENSSL_NO_HW_SUREWARE -DOPENSSL_NO_HW_4758_CCA 33CFLAGS+= -DOPENSSL_NO_HW_AEP
34CFLAGS+= -DOPENSSL_NO_HW_ATALLA
35CFLAGS+= -DOPENSSL_NO_HW_CSWIFT
36CFLAGS+= -DOPENSSL_NO_HW_NCIPHER
37CFLAGS+= -DOPENSSL_NO_HW_NURON
38CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this?
39CFLAGS+= -DOPENSSL_NO_HW_SUREWARE
40CFLAGS+= -DOPENSSL_NO_HW_UBSEC
41
31CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST} 42CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
32CFLAGS+= -I${LCRYPTO_SRC} 43CFLAGS+= -I${LCRYPTO_SRC}
33SRCS+= o_time.c 44SRCS+= o_time.c o_dir.c
34SRCS+= cryptlib.c ex_data.c cpt_err.c mem.c mem_dbg.c mem_clr.c 45SRCS+= cryptlib.c ex_data.c cpt_err.c mem.c mem_dbg.c mem_clr.c
35SRCS+= tmdiff.c cversion.c uid.c 46SRCS+= tmdiff.c cversion.c uid.c
36SRCS+= md2_dgst.c md2_one.c 47SRCS+= md2_dgst.c md2_one.c
37SRCS+= md5_dgst.c md5_one.c 48SRCS+= md5_dgst.c md5_one.c
38SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c 49SRCS+= sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c
39#SRCS+= mdc2dgst.c mdc2_one.c 50#SRCS+= mdc2dgst.c mdc2_one.c
40SRCS+= hmac.c 51SRCS+= hmac.c
41SRCS+= rmd_dgst.c rmd_one.c 52SRCS+= rmd_dgst.c rmd_one.c
42SRCS+= acss_skey.c acss_enc.c 53SRCS+= acss_skey.c acss_enc.c
43SRCS+= aes_cbc.c aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c 54SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c
55SRCS+= aes_ige.c aes_wrap.c
44SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ 56SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
45 ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \ 57 ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \
46 ofb64enc.c ofb_enc.c pcbc_enc.c \ 58 ofb64enc.c ofb_enc.c pcbc_enc.c \
@@ -51,32 +63,41 @@ SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
51 des_old.c read2pwd.c 63 des_old.c read2pwd.c
52SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c 64SRCS+= rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c
53SRCS+= rc2ofb64.c 65SRCS+= rc2ofb64.c
54SRCS+= rc4_skey.c
55#SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c 66#SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c
56#SRCS+= rc5ofb64.c rc5_enc.c 67#SRCS+= rc5ofb64.c rc5_enc.c
57#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c 68#SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c
58#SRCS+= i_skey.c 69#SRCS+= i_skey.c
59SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c 70SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c
60SRCS+= c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c 71SRCS+= c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c
61SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c 72SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c
62SRCS+= bn_mul.c bn_print.c bn_rand.c bn_shift.c 73SRCS+= bn_print.c bn_rand.c bn_shift.c
63SRCS+= bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c 74SRCS+= bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
64SRCS+= bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_mod.c 75SRCS+= bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_mod.c
65SRCS+= bn_exp2.c bn_ctx.c 76SRCS+= bn_exp2.c bn_ctx.c
66SRCS+= bn_sqrt.c bn_kron.c bn_x931p.c 77SRCS+= bn_sqrt.c bn_kron.c bn_x931p.c bn_const.c bn_depr.c bn_gf2m.c bn_nist.c
78#SRCS+= camellia.c cmll_cbc.c cmll_cfb.c cmll_ctr.c
79#SRCS+= cmll_ecb.c cmll_misc.c cmll_ofb.cq
80#SRCS+= cms_asn1.c cms_att.c cms_cd.c cms_dd.c cms_enc.c cms_env.c
81#SRCS+= cms_err.c cms_ess.c cms_io.c cms_lib.c cms_sd.c cms_smime.c
67SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c 82SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c
68SRCS+= rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c 83SRCS+= rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c
69SRCS+= rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c rsa_asn1.c 84SRCS+= rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c rsa_asn1.c
70SRCS+= rsa_pss.c rsa_x931.c 85SRCS+= rsa_pss.c rsa_x931.c rsa_depr.c
71SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c 86SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c
72SRCS+= dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c 87SRCS+= dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c dsa_depr.c
73SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c 88SRCS+= dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c dh_depr.c
89SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c
90SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c
91SRCS+= ec2_mult.c ec2_smpl.c ec_asn1.c ec_check.c ec_curve.c
92SRCS+= ec_key.c ec_print.c
93SRCS+= ech_err.c ech_key.c ech_lib.c ech_ossl.c
94SRCS+= ecs_asn1.c ecs_err.c ecs_lib.c ecs_ossl.c ecs_sign.c ecs_vrf.c
74SRCS+= buffer.c buf_err.c 95SRCS+= buffer.c buf_err.c
75SRCS+= bio_lib.c bio_cb.c bio_err.c bss_mem.c 96SRCS+= bio_lib.c bio_cb.c bio_err.c bss_mem.c
76SRCS+= bss_null.c bss_fd.c bss_file.c bss_sock.c 97SRCS+= bss_null.c bss_fd.c bss_file.c bss_sock.c
77SRCS+= bss_conn.c bf_null.c bf_buff.c 98SRCS+= bss_conn.c bf_null.c bf_buff.c
78SRCS+= b_print.c b_dump.c b_sock.c bss_acpt.c 99SRCS+= b_print.c b_dump.c b_sock.c bss_acpt.c
79SRCS+= bf_nbio.c bss_bio.c bss_log.c 100SRCS+= bf_nbio.c bss_bio.c bss_log.c bss_dgram.c
80SRCS+= stack.c 101SRCS+= stack.c
81SRCS+= lhash.c lh_stats.c 102SRCS+= lhash.c lh_stats.c
82SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c rand_unix.c 103SRCS+= md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c rand_unix.c
@@ -85,7 +106,8 @@ SRCS+= obj_dat.c obj_lib.c obj_err.c o_names.c
85SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c 106SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c
86SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c 107SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c
87SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c 108SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c
88SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c 109SRCS+= bio_ok.c e_des3.c evp_enc.c m_md2.c p_verify.c m_ecdsa.c
110#SRCS+= e_camellia.c e_seed.c
89SRCS+= c_all.c evp_err.c evp_acnf.c m_md4.c p5_crpt.c e_old.c 111SRCS+= c_all.c evp_err.c evp_acnf.c m_md4.c p5_crpt.c e_old.c
90SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c 112SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c
91SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c 113SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c
@@ -105,15 +127,19 @@ SRCS+= a_enum.c a_sign.c asn_pack.c nsseq.c t_x509a.c x_val.c
105SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c 127SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c
106SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c 128SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c
107SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c 129SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c
108SRCS+=a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c 130SRCS+= a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c
131SRCS+= asn1_gen.c asn_mime.c
109SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c 132SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c
110SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c 133SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c
111SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c 134SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c
112SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c 135SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c
136SRCS+= x509_vpm.c
113SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c 137SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c
114SRCS+= v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c 138SRCS+= v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c
115SRCS+= v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c 139SRCS+= v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c
116SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c v3_pci.c v3_pcia.c 140SRCS+= v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c v3_pci.c v3_pcia.c
141SRCS+= pcy_cache.c pcy_data.c pcy_int.h pcy_lib.c pcy_map.c pcy_node.c
142SRCS+= pcy_tree.c v3_addr.c v3_asid.c v3_ncons.c v3_pcons.c v3_pmaps.c
117SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c 143SRCS+= conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c
118SRCS+= conf_sap.c 144SRCS+= conf_sap.c
119SRCS+= txt_db.c 145SRCS+= txt_db.c
@@ -125,7 +151,8 @@ SRCS+= p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c
125SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c 151SRCS+= p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c
126SRCS+= p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c 152SRCS+= p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c
127SRCS+= eng_all.c eng_openssl.c eng_ctrl.c eng_pkey.c 153SRCS+= eng_all.c eng_openssl.c eng_ctrl.c eng_pkey.c
128SRCS+= eng_dyn.c eng_table.c tb_cipher.c eng_err.c tb_rsa.c 154SRCS+= eng_dyn.c eng_table.c tb_cipher.c tb_store.c eng_err.c tb_rsa.c
155SRCS+= tb_ecdh.c tb_ecdsa.c
129SRCS+= hw_cryptodev.c eng_cnf.c 156SRCS+= hw_cryptodev.c eng_cnf.c
130SRCS+= tb_dh.c eng_fat.c tb_digest.c eng_init.c 157SRCS+= tb_dh.c eng_fat.c tb_digest.c eng_init.c
131SRCS+= tb_dsa.c eng_lib.c tb_rand.c eng_list.c 158SRCS+= tb_dsa.c eng_lib.c tb_rand.c eng_list.c
@@ -133,9 +160,9 @@ SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c
133SRCS+= dso_openssl.c dso_win32.c dso_vms.c 160SRCS+= dso_openssl.c dso_win32.c dso_vms.c
134SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c 161SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c
135SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c 162SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c
136SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c 163SRCS+= pqueue.c
137SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c 164#SRCS+= seed.c seed_cbc.c seed_cfb.c seed_ecb.c seed_ofb.c
138 165SRCS+= str_err.c str_lib.c str_mem.c str_meth.c
139# Only used when -DOPENSSL_FIPS is set 166# Only used when -DOPENSSL_FIPS is set
140#SRCS+= fips.c fips_err_wrapper.c 167#SRCS+= fips.c fips_err_wrapper.c
141#SRCS+= fips_aes_core.c fips_aes_selftest.c 168#SRCS+= fips_aes_core.c fips_aes_selftest.c
@@ -160,6 +187,9 @@ SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c
160 ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \ 187 ${LCRYPTO_SRC}/comp ${LCRYPTO_SRC}/txt_db ${LCRYPTO_SRC}/md4 \
161 ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \ 188 ${LCRYPTO_SRC}/engine ${LCRYPTO_SRC}/dso ${LCRYPTO_SRC}/ui \
162 ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes \ 189 ${LCRYPTO_SRC}/ocsp ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/aes \
190 ${LCRYPTO_SRC}/camellia ${LCRYPTO_SRC}/seed ${LCRYPTO_SRC}/cms \
191 ${LCRYPTO_SRC}/ec ${LCRYPTO_SRC}/ecdh ${LCRYPTO_SRC}/ecdsa \
192 ${LCRYPTO_SRC}/pqueue ${LCRYPTO_SRC}/store \
163 ${LCRYPTO_SRC} \ 193 ${LCRYPTO_SRC} \
164 ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_ARCH} \ 194 ${LCRYPTO_SRC}/acss ${.CURDIR}/arch/${MACHINE_ARCH} \
165 ${LCRYPTO_SRC}/bn/asm \ 195 ${LCRYPTO_SRC}/bn/asm \
@@ -176,7 +206,9 @@ HDRS=\
176 crypto/bio/bio.h \ 206 crypto/bio/bio.h \
177 crypto/bn/bn.h \ 207 crypto/bn/bn.h \
178 crypto/buffer/buffer.h \ 208 crypto/buffer/buffer.h \
209 crypto/camellia/camellia.h \
179 crypto/cast/cast.h \ 210 crypto/cast/cast.h \
211 crypto/cms/cms.h \
180 crypto/comp/comp.h \ 212 crypto/comp/comp.h \
181 crypto/conf/conf.h \ 213 crypto/conf/conf.h \
182 crypto/conf/conf_api.h \ 214 crypto/conf/conf_api.h \
@@ -188,6 +220,8 @@ HDRS=\
188 crypto/dso/dso.h \ 220 crypto/dso/dso.h \
189 crypto/ebcdic.h \ 221 crypto/ebcdic.h \
190 crypto/ec/ec.h \ 222 crypto/ec/ec.h \
223 crypto/ecdh/ecdh.h \
224 crypto/ecdsa/ecdsa.h \
191 crypto/engine/engine.h \ 225 crypto/engine/engine.h \
192 crypto/err/err.h \ 226 crypto/err/err.h \
193 crypto/evp/evp.h \ 227 crypto/evp/evp.h \
@@ -206,15 +240,19 @@ HDRS=\
206 crypto/pem/pem2.h \ 240 crypto/pem/pem2.h \
207 crypto/pkcs12/pkcs12.h \ 241 crypto/pkcs12/pkcs12.h \
208 crypto/pkcs7/pkcs7.h \ 242 crypto/pkcs7/pkcs7.h \
243 crypto/pqueue/pq_compat.h \
244 crypto/pqueue/pqueue.h \
209 crypto/rand/rand.h \ 245 crypto/rand/rand.h \
210 crypto/rc2/rc2.h \ 246 crypto/rc2/rc2.h \
211 crypto/rc4/rc4.h \ 247 crypto/rc4/rc4.h \
212 crypto/rc5/rc5.h \ 248 crypto/rc5/rc5.h \
213 crypto/ripemd/ripemd.h \ 249 crypto/ripemd/ripemd.h \
214 crypto/rsa/rsa.h \ 250 crypto/rsa/rsa.h \
251 crypto/seed/seed.h \
215 crypto/sha/sha.h \ 252 crypto/sha/sha.h \
216 crypto/stack/safestack.h \ 253 crypto/stack/safestack.h \
217 crypto/stack/stack.h \ 254 crypto/stack/stack.h \
255 crypto/store/store.h \
218 crypto/symhacks.h \ 256 crypto/symhacks.h \
219 crypto/tmdiff.h \ 257 crypto/tmdiff.h \
220 crypto/txt_db/txt_db.h \ 258 crypto/txt_db/txt_db.h \
@@ -277,18 +315,24 @@ des_enc.po:
277.endif 315.endif
278 316
279.if (${MACHINE_ARCH} == "i386") 317.if (${MACHINE_ARCH} == "i386")
318SRCS+= rc4_skey.c
280CFLAGS+= -DAES_ASM 319CFLAGS+= -DAES_ASM
281CFLAGS+= -DMD5_ASM 320CFLAGS+= -DMD5_ASM
282CFLAGS+= -DSHA1_ASM 321CFLAGS+= -DSHA1_ASM
283CFLAGS+= -DRMD160_ASM 322CFLAGS+= -DRMD160_ASM
284CFLAGS+= -DOPENBSD_CAST_ASM
285CFLAGS+= -DOPENBSD_DES_ASM 323CFLAGS+= -DOPENBSD_DES_ASM
324CFLAGS+= -DOPENBSD_CAST_ASM
325CFLAGS+= -DOPENSSL_BN_ASM_PART_WORDS
326CFLAGS+= -DOPENSSL_BN_ASM_MONT
327CFLAGS+= -DOPENSSL_CPUID_OBJ
286SSLASM=\ 328SSLASM=\
287 aes aes-586 \ 329 aes aes-586 \
288 bf bf-586 \ 330 bf bf-586 \
289 bn bn-586 \ 331 bn bn-586 \
290 bn co-586 \ 332 bn co-586 \
333 bn mo-586 \
291 cast cast-586 \ 334 cast cast-586 \
335 des crypt586 \
292 des des-586 \ 336 des des-586 \
293 md5 md5-586 \ 337 md5 md5-586 \
294 rc4 rc4-586 \ 338 rc4 rc4-586 \
@@ -301,26 +345,41 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${LCRYPTO_SRC}/perlasm/x86unix.pl
301 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \ 345 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm -I${LCRYPTO_SRC}/${dir}/asm \
302 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl openbsd-elf 386 > ${.TARGET} 346 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl openbsd-elf 386 > ${.TARGET}
303.endfor 347.endfor
348SRCS+= x86cpuid.S
349GENERATED+=x86cpuid.S
350x86cpuid.S: ${LCRYPTO_SRC}/x86cpuid.pl
351 /usr/bin/perl -I${LCRYPTO_SRC}/perlasm \
352 ${LCRYPTO_SRC}/x86cpuid.pl openbsd-elf 386 > ${.TARGET}
304SRCS+= bf_cbc.c 353SRCS+= bf_cbc.c
305.else 354.elif (${MACHINE_ARCH} == "amd64")
306.if (${MACHINE_ARCH} == "vax") 355SRCS+= aes_core.c aes_cbc.c
307SRCS+= aes_core.c
308SRCS+= bf_enc.c
309SRCS+= bn_asm_vax.S
310SRCS+= rc4_enc.c
311.else
312.if (${MACHINE_ARCH} == "amd64")
313SRCS+= aes_core.c
314SRCS+= bf_enc.c 356SRCS+= bf_enc.c
315SRCS+= x86_64-gcc.c 357SRCS+= x86_64-gcc.c
316SRCS+= rc4_enc.c 358#CFLAGS+= -DAES_ASM # XXX ASM implementation SEGVs with MALLOC_OPTIONS=AFGJPRX
359CFLAGS+= -DMD5_ASM
360CFLAGS+= -DSHA1_ASM
361CFLAGS+= -DOPENSSL_CPUID_OBJ
362SSLASM=\
363 bn x86_64-mont \
364 md5 md5-x86_64 \
365 rc4 rc4-x86_64 \
366 sha sha1-x86_64
367.for dir f in ${SSLASM}
368SRCS+= ${f}.S
369GENERATED+=${f}.S
370${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
371 (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./asm/${f}.pl) > ${.TARGET}
372.endfor
373SRCS+= x86_64cpuid.S
374GENERATED+=x86_64cpuid.S
375x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl
376 (cd ${LCRYPTO_SRC}/${dir} ; /usr/bin/perl ./x86_64cpuid.pl) > ${.TARGET}
317.else 377.else
318SRCS+= aes_core.c 378CFLAGS+=-DOPENSSL_NO_ASM
379SRCS+= aes_core.c aes_cbc.c
319SRCS+= bf_enc.c 380SRCS+= bf_enc.c
320SRCS+= bn_asm.c 381SRCS+= bn_asm.c
321SRCS+= rc4_enc.c 382SRCS+= rc4_enc.c rc4_skey.c
322.endif
323.endif
324.endif 383.endif
325 384
326all beforedepend: ${GENERATED} 385all beforedepend: ${GENERATED}
diff --git a/src/lib/libssl/crypto/arch/alpha/opensslconf.h b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
index c33ccc8a0f..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/alpha/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/alpha/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -103,7 +158,7 @@
103 158
104#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 159#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
105#define CONFIG_HEADER_BF_LOCL_H 160#define CONFIG_HEADER_BF_LOCL_H
106#undef BF_PTR 161#define BF_PTR
107#endif /* HEADER_BF_LOCL_H */ 162#endif /* HEADER_BF_LOCL_H */
108 163
109#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) 164#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/amd64/opensslconf.h b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
index c33ccc8a0f..fd992553a7 100644
--- a/src/lib/libssl/crypto/arch/amd64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/amd64/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -112,7 +167,7 @@
112/* the following is tweaked from a config script, that is why it is a 167/* the following is tweaked from a config script, that is why it is a
113 * protected undef/define */ 168 * protected undef/define */
114#ifndef DES_PTR 169#ifndef DES_PTR
115#define DES_PTR 170#undef DES_PTR
116#endif 171#endif
117 172
118/* This helps C compiler generate the correct code for multiple functional 173/* This helps C compiler generate the correct code for multiple functional
@@ -123,7 +178,7 @@
123#endif 178#endif
124 179
125#ifndef DES_RISC2 180#ifndef DES_RISC2
126#define DES_RISC2 181#undef DES_RISC2
127#endif 182#endif
128 183
129#if defined(DES_RISC1) && defined(DES_RISC2) 184#if defined(DES_RISC1) && defined(DES_RISC2)
@@ -133,7 +188,7 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
133/* Unroll the inner loop, this sometimes helps, sometimes hinders. 188/* Unroll the inner loop, this sometimes helps, sometimes hinders.
134 * Very mucy CPU dependant */ 189 * Very mucy CPU dependant */
135#ifndef DES_UNROLL 190#ifndef DES_UNROLL
136#undef DES_UNROLL 191#define DES_UNROLL
137#endif 192#endif
138 193
139/* These default values were supplied by 194/* These default values were supplied by
diff --git a/src/lib/libssl/crypto/arch/arm/opensslconf.h b/src/lib/libssl/crypto/arch/arm/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/arm/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/arm/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/hppa/opensslconf.h b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
index 0334dbdfc6..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/hppa/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/hppa/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,11 +124,11 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
76#define DES_LONG unsigned long 131#define DES_LONG unsigned int
77#endif 132#endif
78#endif 133#endif
79 134
diff --git a/src/lib/libssl/crypto/arch/i386/opensslconf.h b/src/lib/libssl/crypto/arch/i386/opensslconf.h
index 7361ac56a1..98b7b58408 100644
--- a/src/lib/libssl/crypto/arch/i386/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/i386/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m68k/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/m88k/opensslconf.h b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/m88k/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/m88k/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/mips64/opensslconf.h b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
index c33ccc8a0f..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/mips64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/mips64/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
@@ -103,7 +158,7 @@
103 158
104#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) 159#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
105#define CONFIG_HEADER_BF_LOCL_H 160#define CONFIG_HEADER_BF_LOCL_H
106#undef BF_PTR 161#define BF_PTR
107#endif /* HEADER_BF_LOCL_H */ 162#endif /* HEADER_BF_LOCL_H */
108 163
109#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) 164#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
diff --git a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/powerpc/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sh/opensslconf.h b/src/lib/libssl/crypto/arch/sh/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/sh/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sh/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sparc/opensslconf.h b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/sparc/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
index 053308653b..0d759a5784 100644
--- a/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/sparc64/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -65,11 +120,11 @@
65 * This enables code handling data aligned at natural CPU word 120 * This enables code handling data aligned at natural CPU word
66 * boundary. See crypto/rc4/rc4_enc.c for further details. 121 * boundary. See crypto/rc4/rc4_enc.c for further details.
67 */ 122 */
68#undef RC4_CHUNK 123#define RC4_CHUNK unsigned long
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/arch/vax/opensslconf.h b/src/lib/libssl/crypto/arch/vax/opensslconf.h
index 47a6dd8596..94d322270b 100644
--- a/src/lib/libssl/crypto/arch/vax/opensslconf.h
+++ b/src/lib/libssl/crypto/arch/vax/opensslconf.h
@@ -4,20 +4,74 @@
4/* OpenSSL was configured with the following options: */ 4/* OpenSSL was configured with the following options: */
5#ifndef OPENSSL_DOING_MAKEDEPEND 5#ifndef OPENSSL_DOING_MAKEDEPEND
6 6
7#ifndef OPENSSL_NO_CAMELLIA
8# define OPENSSL_NO_CAMELLIA
9#endif
10#ifndef OPENSSL_NO_CMS
11# define OPENSSL_NO_CMS
12#endif
13#ifndef OPENSSL_NO_GMP
14# define OPENSSL_NO_GMP
15#endif
7#ifndef OPENSSL_NO_KRB5 16#ifndef OPENSSL_NO_KRB5
8# define OPENSSL_NO_KRB5 17# define OPENSSL_NO_KRB5
9#endif 18#endif
19#ifndef OPENSSL_NO_MDC2
20# define OPENSSL_NO_MDC2
21#endif
22#ifndef OPENSSL_NO_RC5
23# define OPENSSL_NO_RC5
24#endif
25#ifndef OPENSSL_NO_RFC3779
26# define OPENSSL_NO_RFC3779
27#endif
28#ifndef OPENSSL_NO_SEED
29# define OPENSSL_NO_SEED
30#endif
31#ifndef OPENSSL_NO_TLSEXT
32# define OPENSSL_NO_TLSEXT
33#endif
10 34
11#endif /* OPENSSL_DOING_MAKEDEPEND */ 35#endif /* OPENSSL_DOING_MAKEDEPEND */
36#ifndef OPENSSL_THREADS
37# define OPENSSL_THREADS
38#endif
39#ifndef OPENSSL_NO_DYNAMIC_ENGINE
40# define OPENSSL_NO_DYNAMIC_ENGINE
41#endif
12 42
13/* The OPENSSL_NO_* macros are also defined as NO_* if the application 43/* The OPENSSL_NO_* macros are also defined as NO_* if the application
14 asks for it. This is a transient feature that is provided for those 44 asks for it. This is a transient feature that is provided for those
15 who haven't had the time to do the appropriate changes in their 45 who haven't had the time to do the appropriate changes in their
16 applications. */ 46 applications. */
17#ifdef OPENSSL_ALGORITHM_DEFINES 47#ifdef OPENSSL_ALGORITHM_DEFINES
48# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
49# define NO_CAMELLIA
50# endif
51# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
52# define NO_CMS
53# endif
54# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
55# define NO_GMP
56# endif
18# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) 57# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
19# define NO_KRB5 58# define NO_KRB5
20# endif 59# endif
60# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
61# define NO_MDC2
62# endif
63# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
64# define NO_RC5
65# endif
66# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
67# define NO_RFC3779
68# endif
69# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
70# define NO_SEED
71# endif
72# if defined(OPENSSL_NO_TLSEXT) && !defined(NO_TLSEXT)
73# define NO_TLSEXT
74# endif
21#endif 75#endif
22 76
23/* crypto/opensslconf.h.in */ 77/* crypto/opensslconf.h.in */
@@ -27,6 +81,7 @@
27 81
28#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ 82#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
29#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) 83#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
84#define ENGINESDIR "/usr/lib/engines"
30#define OPENSSLDIR "/etc/ssl" 85#define OPENSSLDIR "/etc/ssl"
31#endif 86#endif
32#endif 87#endif
@@ -69,7 +124,7 @@
69#endif 124#endif
70#endif 125#endif
71 126
72#if (defined(HEADER_DES_H) || defined(HEADER_DES_OLD_H)) && !defined(DES_LONG) 127#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
73/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a 128/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
74 * %20 speed up (longs are 8 bytes, int's are 4). */ 129 * %20 speed up (longs are 8 bytes, int's are 4). */
75#ifndef DES_LONG 130#ifndef DES_LONG
diff --git a/src/lib/libssl/crypto/shlib_version b/src/lib/libssl/crypto/shlib_version
index d85251eba7..7791322042 100644
--- a/src/lib/libssl/crypto/shlib_version
+++ b/src/lib/libssl/crypto/shlib_version
@@ -1,2 +1,2 @@
1major=14 1major=15
2minor=0 2minor=0
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-27 00:24:51 +0000