Update OpenSSL to version 1.1.1i

Note, OpenSSL now comes as one combined depot archive *openssl* that
replaces the former *libssl* and *libcrypto* archives. The libraries are
still separate binaries for compatibility with legacy software.

Issue #3773
This commit is contained in:
Christian Helmuth 2020-03-18 16:27:28 +01:00 committed by Norman Feske
parent f5cd12dcf9
commit f23e302475
67 changed files with 3532 additions and 2339 deletions

View File

@ -1,6 +1,5 @@
_/src/wifi_drv
_/src/libcrypto
_/src/libssl
_/src/openssl
_/src/vfs
_/src/vfs_jitterentropy
_/src/libc

View File

@ -1,8 +1,7 @@
base
os
libc
libcrypto
libssl
openssl
nic_session
uplink_session
nic_driver

View File

@ -1,4 +1,4 @@
_/src/vfs
_/src/cbe
_/src/spark
_/src/libcrypto
_/src/openssl

View File

@ -7,8 +7,7 @@ _/src/fs_rom
_/src/fetchurl
_/src/libc
_/src/libssh
_/src/libssl
_/src/libcrypto
_/src/openssl
_/src/vfs
_/src/zlib
_/src/curl

View File

@ -6,9 +6,8 @@ _/src/coreutils-minimal
_/src/curl
_/src/fetchurl
_/src/init
_/src/libcrypto
_/src/libssh
_/src/libssl
_/src/openssl
_/src/ncurses
_/src/posix
_/src/report_rom

View File

@ -1,9 +1,10 @@
aes_cbc_4k
base
block_session
libc
libsparkcrypto
openssl
os
vfs
aes_cbc_4k
libcrypto
so
spark
libsparkcrypto
vfs

View File

@ -14,8 +14,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/fetchurl \
[depot_user]/src/libc \
[depot_user]/src/libssh \
[depot_user]/src/libssl \
[depot_user]/src/libcrypto \
[depot_user]/src/openssl \
[depot_user]/src/zlib \
[depot_user]/src/curl \
[depot_user]/src/init \

View File

@ -29,7 +29,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/ipxe_nic_drv \
[depot_user]/src/libc \
[depot_user]/src/libcrypto \
[depot_user]/src/openssl \
[depot_user]/src/libssh \
[depot_user]/src/platform_drv \
[depot_user]/src/posix \

View File

@ -1 +1,10 @@
LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl)
ARCH = $(filter 32bit 64bit,$(SPECS))
INC_DIR += $(call select_from_ports,openssl)/include
INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH)
LIBS += libc
include $(call select_from_repositories,lib/import/import-libc.mk)

View File

@ -1 +1,8 @@
LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl)
LIBS += libcrypto
ARCH = $(filter 32bit 64bit,$(SPECS))
INC_DIR += $(call select_from_ports,openssl)/include
INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH)

View File

@ -23,7 +23,7 @@ SRC_C = \
CC_OPT += -DHAVE_CONFIG_H
LIBS += libc zlib libcrypto libssh libssl
LIBS += libc zlib libssh libssl
include $(call select_from_repositories,lib/import/import-curl.mk)

View File

@ -1,200 +1,650 @@
OPENSSL_PORT_DIR := $(call select_from_ports,openssl)
LIBCRYPTO_DIR := $(OPENSSL_PORT_DIR)/src/lib/openssl/crypto
LIB_SRC_DIR := $(OPENSSL_PORT_DIR)/src/lib/openssl
SHARED_LIB = yes
LIBS += libc
CC_OPT += -DDSO_DLFCN -DHAVE_DLFCN_H -Wa,--noexecstack -DL_ENDIAN -DTERMIOS \
-DOPENSSL_NO_ASM -DGETPID_IS_MEANINGLESS
CC_OPT += -DRAND_GENODE
CC_OPT += -Wa,--noexecstack -DL_ENDIAN
CC_OPT += -DOPENSSL_USE_NODELETE -DOPENSSL_PIC -DNDEBUG
CC_OPT += -DOPENSSLDIR=\"/etc/ssl\" -DENGINESDIR=\"/etc/ssl\"
#
# crypto base source
#
SRC_C = cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c cpt_err.c mem_clr.c \
ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c \
getenv.c
SRC_C += \
aes/aes_cbc.c \
aes/aes_cfb.c \
aes/aes_ecb.c \
aes/aes_ige.c \
aes/aes_misc.c \
aes/aes_ofb.c \
aes/aes_wrap.c \
aria/aria.c \
asn1/a_bitstr.c \
asn1/a_d2i_fp.c \
asn1/a_digest.c \
asn1/a_dup.c \
asn1/a_gentm.c \
asn1/a_i2d_fp.c \
asn1/a_int.c \
asn1/a_mbstr.c \
asn1/a_object.c \
asn1/a_octet.c \
asn1/a_print.c \
asn1/a_sign.c \
asn1/a_strex.c \
asn1/a_strnid.c \
asn1/a_time.c \
asn1/a_type.c \
asn1/a_utctm.c \
asn1/a_utf8.c \
asn1/a_verify.c \
asn1/ameth_lib.c \
asn1/asn1_err.c \
asn1/asn1_gen.c \
asn1/asn1_item_list.c \
asn1/asn1_lib.c \
asn1/asn1_par.c \
asn1/asn_mime.c \
asn1/asn_moid.c \
asn1/asn_mstbl.c \
asn1/asn_pack.c \
asn1/bio_asn1.c \
asn1/bio_ndef.c \
asn1/d2i_pr.c \
asn1/d2i_pu.c \
asn1/evp_asn1.c \
asn1/f_int.c \
asn1/f_string.c \
asn1/i2d_pr.c \
asn1/i2d_pu.c \
asn1/n_pkey.c \
asn1/nsseq.c \
asn1/p5_pbe.c \
asn1/p5_pbev2.c \
asn1/p5_scrypt.c \
asn1/p8_pkey.c \
asn1/t_bitst.c \
asn1/t_pkey.c \
asn1/t_spki.c \
asn1/tasn_dec.c \
asn1/tasn_enc.c \
asn1/tasn_fre.c \
asn1/tasn_new.c \
asn1/tasn_prn.c \
asn1/tasn_scn.c \
asn1/tasn_typ.c \
asn1/tasn_utl.c \
asn1/x_algor.c \
asn1/x_bignum.c \
asn1/x_info.c \
asn1/x_int64.c \
asn1/x_long.c \
asn1/x_pkey.c \
asn1/x_sig.c \
asn1/x_spki.c \
asn1/x_val.c \
async/arch/async_null.c \
async/arch/async_posix.c \
async/async.c \
async/async_err.c \
async/async_wait.c \
bf/bf_cfb64.c \
bf/bf_ecb.c \
bf/bf_ofb64.c \
bf/bf_skey.c \
bio/b_addr.c \
bio/b_dump.c \
bio/b_print.c \
bio/b_sock.c \
bio/b_sock2.c \
bio/bf_buff.c \
bio/bf_lbuf.c \
bio/bf_nbio.c \
bio/bf_null.c \
bio/bio_cb.c \
bio/bio_err.c \
bio/bio_lib.c \
bio/bio_meth.c \
bio/bss_acpt.c \
bio/bss_bio.c \
bio/bss_conn.c \
bio/bss_dgram.c \
bio/bss_fd.c \
bio/bss_file.c \
bio/bss_log.c \
bio/bss_mem.c \
bio/bss_null.c \
bio/bss_sock.c \
blake2/blake2b.c \
blake2/blake2s.c \
blake2/m_blake2b.c \
blake2/m_blake2s.c \
bn/bn_add.c \
bn/bn_blind.c \
bn/bn_const.c \
bn/bn_ctx.c \
bn/bn_depr.c \
bn/bn_dh.c \
bn/bn_div.c \
bn/bn_err.c \
bn/bn_exp.c \
bn/bn_exp2.c \
bn/bn_gcd.c \
bn/bn_gf2m.c \
bn/bn_intern.c \
bn/bn_kron.c \
bn/bn_lib.c \
bn/bn_mod.c \
bn/bn_mont.c \
bn/bn_mpi.c \
bn/bn_mul.c \
bn/bn_nist.c \
bn/bn_prime.c \
bn/bn_print.c \
bn/bn_rand.c \
bn/bn_recp.c \
bn/bn_shift.c \
bn/bn_sqr.c \
bn/bn_sqrt.c \
bn/bn_srp.c \
bn/bn_word.c \
bn/bn_x931p.c \
bn/rsaz_exp.c \
buffer/buf_err.c \
buffer/buffer.c \
camellia/cmll_cfb.c \
camellia/cmll_ctr.c \
camellia/cmll_ecb.c \
camellia/cmll_ofb.c \
cast/c_cfb64.c \
cast/c_ecb.c \
cast/c_enc.c \
cast/c_ofb64.c \
cast/c_skey.c \
cmac/cm_ameth.c \
cmac/cm_pmeth.c \
cmac/cmac.c \
cms/cms_asn1.c \
cms/cms_att.c \
cms/cms_cd.c \
cms/cms_dd.c \
cms/cms_enc.c \
cms/cms_env.c \
cms/cms_err.c \
cms/cms_ess.c \
cms/cms_io.c \
cms/cms_kari.c \
cms/cms_lib.c \
cms/cms_pwri.c \
cms/cms_sd.c \
cms/cms_smime.c \
comp/c_zlib.c \
comp/comp_err.c \
comp/comp_lib.c \
conf/conf_api.c \
conf/conf_def.c \
conf/conf_err.c \
conf/conf_lib.c \
conf/conf_mall.c \
conf/conf_mod.c \
conf/conf_sap.c \
conf/conf_ssl.c \
cpt_err.c \
cryptlib.c \
ct/ct_b64.c \
ct/ct_err.c \
ct/ct_log.c \
ct/ct_oct.c \
ct/ct_policy.c \
ct/ct_prn.c \
ct/ct_sct.c \
ct/ct_sct_ctx.c \
ct/ct_vfy.c \
ct/ct_x509v3.c \
ctype.c \
cversion.c \
des/cbc_cksm.c \
des/cbc_enc.c \
des/cfb64ede.c \
des/cfb64enc.c \
des/cfb_enc.c \
des/ecb3_enc.c \
des/ecb_enc.c \
des/fcrypt.c \
des/fcrypt_b.c \
des/ofb64ede.c \
des/ofb64enc.c \
des/ofb_enc.c \
des/pcbc_enc.c \
des/qud_cksm.c \
des/rand_key.c \
des/set_key.c \
des/str2key.c \
des/xcbc_enc.c \
dh/dh_ameth.c \
dh/dh_asn1.c \
dh/dh_check.c \
dh/dh_depr.c \
dh/dh_err.c \
dh/dh_gen.c \
dh/dh_kdf.c \
dh/dh_key.c \
dh/dh_lib.c \
dh/dh_meth.c \
dh/dh_pmeth.c \
dh/dh_prn.c \
dh/dh_rfc5114.c \
dh/dh_rfc7919.c \
dsa/dsa_ameth.c \
dsa/dsa_asn1.c \
dsa/dsa_depr.c \
dsa/dsa_err.c \
dsa/dsa_gen.c \
dsa/dsa_key.c \
dsa/dsa_lib.c \
dsa/dsa_meth.c \
dsa/dsa_ossl.c \
dsa/dsa_pmeth.c \
dsa/dsa_prn.c \
dsa/dsa_sign.c \
dsa/dsa_vrf.c \
dso/dso_dl.c \
dso/dso_dlfcn.c \
dso/dso_err.c \
dso/dso_lib.c \
dso/dso_openssl.c \
ebcdic.c \
ec/curve25519.c \
ec/curve448/arch_32/f_impl.c \
ec/curve448/curve448.c \
ec/curve448/curve448_tables.c \
ec/curve448/eddsa.c \
ec/curve448/f_generic.c \
ec/curve448/scalar.c \
ec/ec2_oct.c \
ec/ec2_smpl.c \
ec/ec_ameth.c \
ec/ec_asn1.c \
ec/ec_check.c \
ec/ec_curve.c \
ec/ec_cvt.c \
ec/ec_err.c \
ec/ec_key.c \
ec/ec_kmeth.c \
ec/ec_lib.c \
ec/ec_mult.c \
ec/ec_oct.c \
ec/ec_pmeth.c \
ec/ec_print.c \
ec/ecdh_kdf.c \
ec/ecdh_ossl.c \
ec/ecdsa_ossl.c \
ec/ecdsa_sign.c \
ec/ecdsa_vrf.c \
ec/eck_prn.c \
ec/ecp_mont.c \
ec/ecp_nist.c \
ec/ecp_nistp224.c \
ec/ecp_nistp256.c \
ec/ecp_nistp521.c \
ec/ecp_nistputil.c \
ec/ecp_nistz256.c \
ec/ecp_oct.c \
ec/ecp_smpl.c \
ec/ecx_meth.c \
engine/eng_all.c \
engine/eng_cnf.c \
engine/eng_ctrl.c \
engine/eng_dyn.c \
engine/eng_err.c \
engine/eng_fat.c \
engine/eng_init.c \
engine/eng_lib.c \
engine/eng_list.c \
engine/eng_openssl.c \
engine/eng_pkey.c \
engine/eng_rdrand.c \
engine/eng_table.c \
engine/tb_asnmth.c \
engine/tb_cipher.c \
engine/tb_dh.c \
engine/tb_digest.c \
engine/tb_dsa.c \
engine/tb_eckey.c \
engine/tb_pkmeth.c \
engine/tb_rand.c \
engine/tb_rsa.c \
err/err.c \
err/err_all.c \
err/err_prn.c \
evp/bio_b64.c \
evp/bio_enc.c \
evp/bio_md.c \
evp/bio_ok.c \
evp/c_allc.c \
evp/c_alld.c \
evp/cmeth_lib.c \
evp/digest.c \
evp/e_aes.c \
evp/e_aes_cbc_hmac_sha1.c \
evp/e_aes_cbc_hmac_sha256.c \
evp/e_aria.c \
evp/e_bf.c \
evp/e_camellia.c \
evp/e_cast.c \
evp/e_chacha20_poly1305.c \
evp/e_des.c \
evp/e_des3.c \
evp/e_idea.c \
evp/e_null.c \
evp/e_old.c \
evp/e_rc2.c \
evp/e_rc4.c \
evp/e_rc4_hmac_md5.c \
evp/e_rc5.c \
evp/e_seed.c \
evp/e_sm4.c \
evp/e_xcbc_d.c \
evp/encode.c \
evp/evp_cnf.c \
evp/evp_enc.c \
evp/evp_err.c \
evp/evp_key.c \
evp/evp_lib.c \
evp/evp_pbe.c \
evp/evp_pkey.c \
evp/m_md2.c \
evp/m_md4.c \
evp/m_md5.c \
evp/m_md5_sha1.c \
evp/m_mdc2.c \
evp/m_null.c \
evp/m_ripemd.c \
evp/m_sha1.c \
evp/m_sha3.c \
evp/m_sigver.c \
evp/m_wp.c \
evp/names.c \
evp/p5_crpt.c \
evp/p5_crpt2.c \
evp/p_dec.c \
evp/p_enc.c \
evp/p_lib.c \
evp/p_open.c \
evp/p_seal.c \
evp/p_sign.c \
evp/p_verify.c \
evp/pbe_scrypt.c \
evp/pmeth_fn.c \
evp/pmeth_gn.c \
evp/pmeth_lib.c \
ex_data.c \
getenv.c \
hmac/hm_ameth.c \
hmac/hm_pmeth.c \
hmac/hmac.c \
idea/i_cbc.c \
idea/i_cfb64.c \
idea/i_ecb.c \
idea/i_ofb64.c \
idea/i_skey.c \
init.c \
kdf/hkdf.c \
kdf/kdf_err.c \
kdf/scrypt.c \
kdf/tls1_prf.c \
lhash/lh_stats.c \
lhash/lhash.c \
md4/md4_dgst.c \
md4/md4_one.c \
md5/md5_dgst.c \
md5/md5_one.c \
mdc2/mdc2_one.c \
mdc2/mdc2dgst.c \
mem.c \
mem_dbg.c \
mem_sec.c \
modes/cbc128.c \
modes/ccm128.c \
modes/cfb128.c \
modes/ctr128.c \
modes/cts128.c \
modes/gcm128.c \
modes/ocb128.c \
modes/ofb128.c \
modes/wrap128.c \
modes/xts128.c \
o_dir.c \
o_fips.c \
o_fopen.c \
o_init.c \
o_str.c \
o_time.c \
objects/o_names.c \
objects/obj_dat.c \
objects/obj_err.c \
objects/obj_lib.c \
objects/obj_xref.c \
ocsp/ocsp_asn.c \
ocsp/ocsp_cl.c \
ocsp/ocsp_err.c \
ocsp/ocsp_ext.c \
ocsp/ocsp_ht.c \
ocsp/ocsp_lib.c \
ocsp/ocsp_prn.c \
ocsp/ocsp_srv.c \
ocsp/ocsp_vfy.c \
ocsp/v3_ocsp.c \
pem/pem_all.c \
pem/pem_err.c \
pem/pem_info.c \
pem/pem_lib.c \
pem/pem_oth.c \
pem/pem_pk8.c \
pem/pem_pkey.c \
pem/pem_sign.c \
pem/pem_x509.c \
pem/pem_xaux.c \
pem/pvkfmt.c \
pkcs12/p12_add.c \
pkcs12/p12_asn.c \
pkcs12/p12_attr.c \
pkcs12/p12_crpt.c \
pkcs12/p12_crt.c \
pkcs12/p12_decr.c \
pkcs12/p12_init.c \
pkcs12/p12_key.c \
pkcs12/p12_kiss.c \
pkcs12/p12_mutl.c \
pkcs12/p12_npas.c \
pkcs12/p12_p8d.c \
pkcs12/p12_p8e.c \
pkcs12/p12_sbag.c \
pkcs12/p12_utl.c \
pkcs12/pk12err.c \
pkcs7/bio_pk7.c \
pkcs7/pk7_asn1.c \
pkcs7/pk7_attr.c \
pkcs7/pk7_doit.c \
pkcs7/pk7_lib.c \
pkcs7/pk7_mime.c \
pkcs7/pk7_smime.c \
pkcs7/pkcs7err.c \
poly1305/poly1305.c \
poly1305/poly1305_ameth.c \
poly1305/poly1305_pmeth.c \
rand/drbg_ctr.c \
rand/drbg_lib.c \
rand/rand_egd.c \
rand/rand_err.c \
rand/rand_lib.c \
rand/rand_unix.c \
rand/randfile.c \
rc2/rc2_cbc.c \
rc2/rc2_ecb.c \
rc2/rc2_skey.c \
rc2/rc2cfb64.c \
rc2/rc2ofb64.c \
ripemd/rmd_dgst.c \
ripemd/rmd_one.c \
rsa/rsa_ameth.c \
rsa/rsa_asn1.c \
rsa/rsa_chk.c \
rsa/rsa_crpt.c \
rsa/rsa_depr.c \
rsa/rsa_err.c \
rsa/rsa_gen.c \
rsa/rsa_lib.c \
rsa/rsa_meth.c \
rsa/rsa_mp.c \
rsa/rsa_none.c \
rsa/rsa_oaep.c \
rsa/rsa_ossl.c \
rsa/rsa_pk1.c \
rsa/rsa_pmeth.c \
rsa/rsa_prn.c \
rsa/rsa_pss.c \
rsa/rsa_saos.c \
rsa/rsa_sign.c \
rsa/rsa_ssl.c \
rsa/rsa_x931.c \
rsa/rsa_x931g.c \
seed/seed.c \
seed/seed_cbc.c \
seed/seed_cfb.c \
seed/seed_ecb.c \
seed/seed_ofb.c \
sha/sha1_one.c \
sha/sha1dgst.c \
sha/sha256.c \
sha/sha512.c \
siphash/siphash.c \
siphash/siphash_ameth.c \
siphash/siphash_pmeth.c \
sm2/sm2_crypt.c \
sm2/sm2_err.c \
sm2/sm2_pmeth.c \
sm2/sm2_sign.c \
sm3/m_sm3.c \
sm3/sm3.c \
sm4/sm4.c \
srp/srp_lib.c \
srp/srp_vfy.c \
stack/stack.c \
store/loader_file.c \
store/store_err.c \
store/store_init.c \
store/store_lib.c \
store/store_register.c \
store/store_strings.c \
threads_none.c \
threads_pthread.c \
ts/ts_asn1.c \
ts/ts_conf.c \
ts/ts_err.c \
ts/ts_lib.c \
ts/ts_req_print.c \
ts/ts_req_utils.c \
ts/ts_rsp_print.c \
ts/ts_rsp_sign.c \
ts/ts_rsp_utils.c \
ts/ts_rsp_verify.c \
ts/ts_verify_ctx.c \
txt_db/txt_db.c \
ui/ui_err.c \
ui/ui_lib.c \
ui/ui_null.c \
ui/ui_openssl.c \
ui/ui_util.c \
uid.c \
whrlpool/wp_dgst.c \
x509/by_dir.c \
x509/by_file.c \
x509/t_crl.c \
x509/t_req.c \
x509/t_x509.c \
x509/x509_att.c \
x509/x509_cmp.c \
x509/x509_d2.c \
x509/x509_def.c \
x509/x509_err.c \
x509/x509_ext.c \
x509/x509_lu.c \
x509/x509_meth.c \
x509/x509_obj.c \
x509/x509_r2x.c \
x509/x509_req.c \
x509/x509_set.c \
x509/x509_trs.c \
x509/x509_txt.c \
x509/x509_v3.c \
x509/x509_vfy.c \
x509/x509_vpm.c \
x509/x509cset.c \
x509/x509name.c \
x509/x509rset.c \
x509/x509spki.c \
x509/x509type.c \
x509/x_all.c \
x509/x_attrib.c \
x509/x_crl.c \
x509/x_exten.c \
x509/x_name.c \
x509/x_pubkey.c \
x509/x_req.c \
x509/x_x509.c \
x509/x_x509a.c \
x509v3/pcy_cache.c \
x509v3/pcy_data.c \
x509v3/pcy_lib.c \
x509v3/pcy_map.c \
x509v3/pcy_node.c \
x509v3/pcy_tree.c \
x509v3/v3_addr.c \
x509v3/v3_admis.c \
x509v3/v3_akey.c \
x509v3/v3_akeya.c \
x509v3/v3_alt.c \
x509v3/v3_asid.c \
x509v3/v3_bcons.c \
x509v3/v3_bitst.c \
x509v3/v3_conf.c \
x509v3/v3_cpols.c \
x509v3/v3_crld.c \
x509v3/v3_enum.c \
x509v3/v3_extku.c \
x509v3/v3_genn.c \
x509v3/v3_ia5.c \
x509v3/v3_info.c \
x509v3/v3_int.c \
x509v3/v3_lib.c \
x509v3/v3_ncons.c \
x509v3/v3_pci.c \
x509v3/v3_pcia.c \
x509v3/v3_pcons.c \
x509v3/v3_pku.c \
x509v3/v3_pmaps.c \
x509v3/v3_prn.c \
x509v3/v3_purp.c \
x509v3/v3_skey.c \
x509v3/v3_sxnet.c \
x509v3/v3_tlsf.c \
x509v3/v3_utl.c \
x509v3/v3err.c \
# end of SRC_C
#
# Excluded 'aes_x86core.c'
#
SRC_C_aes = aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c \
aes_ofb.c aes_ctr.c aes_ige.c aes_wrap.c
SRC_C_asn1 = a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c \
a_int.c a_octet.c a_print.c a_type.c a_set.c a_dup.c \
a_d2i_fp.c a_i2d_fp.c a_enum.c a_utf8.c a_sign.c \
a_digest.c a_verify.c a_mbstr.c a_strex.c x_algor.c \
x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c \
x_bignum.c x_long.c x_name.c x_x509.c x_x509a.c \
x_crl.c x_info.c x_spki.c nsseq.c x_nx509.c d2i_pu.c \
d2i_pr.c i2d_pu.c i2d_pr.c t_req.c t_x509.c \
t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c \
tasn_utl.c tasn_typ.c tasn_prn.c ameth_lib.c f_int.c \
f_string.c n_pkey.c f_enum.c x_pkey.c a_bool.c \
x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \
asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c \
a_bytes.c a_strnid.c evp_asn1.c asn_pack.c p5_pbe.c \
p5_pbev2.c p8_pkey.c asn_moid.c
SRC_C_bf = bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c bf_enc.c
SRC_C_bio = bio_lib.c bio_cb.c bio_err.c \
bss_mem.c bss_null.c bss_fd.c \
bss_file.c bss_sock.c bss_conn.c \
bf_null.c bf_buff.c b_print.c b_dump.c \
b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \
bss_dgram.c
SRC_C_bn = bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c \
bn_mod.c bn_print.c bn_rand.c bn_shift.c bn_word.c \
bn_blind.c bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c \
bn_err.c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \
bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c bn_depr.c \
bn_const.c bn_x931p.c bn_asm.c
SRC_C_buffer = buffer.c buf_err.c buf_str.c
#
# camellia (x86 only?)
#
SRC_C_camellia = camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c \
cmll_ofb.c cmll_cfb.c cmll_ctr.c cmll_utl.c
SRC_C_cast = c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
SRC_C_cmac = cm_ameth.c cm_pmeth.c cmac.c
SRC_C_cms = cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c \
cms_err.c cms_sd.c cms_dd.c cms_cd.c cms_env.c \
cms_enc.c cms_ess.c cms_pwri.c cms_kari.c
SRC_C_comp = comp_lib.c comp_err.c c_rle.c c_zlib.c
SRC_C_conf = conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
conf_mall.c conf_sap.c
SRC_C_des = cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c fcrypt.c \
ofb64enc.c ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c \
rpc_enc.c set_key.c des_enc.c fcrypt_b.c xcbc_enc.c \
str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c \
des_old.c des_old2.c read2pwd.c
SRC_C_dh = dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c \
dh_err.c dh_depr.c dh_ameth.c dh_pmeth.c dh_prn.c \
dh_rfc5114.c dh_kdf.c
SRC_C_dsa = dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c \
dsa_sign.c dsa_err.c dsa_ossl.c dsa_depr.c \
dsa_ameth.c dsa_pmeth.c dsa_prn.c
SRC_C_dso = dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
dso_openssl.c
SRC_C_ec = ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c \
ec_mult.c ec_err.c ec_curve.c ec_check.c ec_print.c \
ec_asn1.c ec_key.c ec2_smpl.c ec2_mult.c ec_ameth.c \
ec_pmeth.c eck_prn.c ecp_nistp224.c ecp_nistp256.c \
ecp_nistp521.c ecp_nistputil.c ecp_oct.c ec2_oct.c \
ec_oct.c
SRC_C_ecdh = ech_lib.c ech_ossl.c ech_key.c ech_err.c ech_kdf.c
SRC_C_ecdsa = ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c \
ecs_vrf.c ecs_err.c
SRC_C_engine = eng_err.c eng_lib.c eng_list.c eng_init.c \
eng_ctrl.c eng_table.c eng_pkey.c eng_fat.c \
eng_all.c tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c \
tb_ecdh.c tb_rand.c tb_store.c tb_cipher.c \
tb_digest.c tb_pkmeth.c tb_asnmth.c eng_openssl.c \
eng_cnf.c eng_dyn.c eng_cryptodev.c \
eng_rdrand.c
SRC_C_err = err.c err_all.c err_prn.c
#
# evp (e_camellia.c x86 only?)
#
SRC_C_evp = encode.c digest.c evp_cnf.c evp_enc.c evp_key.c evp_acnf.c \
e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c e_rc4.c \
e_aes.c names.c e_seed.c e_xcbc_d.c e_rc2.c e_cast.c \
m_null.c m_md4.c m_md5.c m_sha.c \
m_sha1.c m_wp.c m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \
m_ecdsa.c p_open.c p_seal.c p_sign.c p_verify.c \
p_lib.c p_enc.c p_dec.c bio_md.c bio_b64.c bio_enc.c \
evp_err.c e_null.c c_all.c c_allc.c c_alld.c \
evp_lib.c bio_ok.c evp_pkey.c evp_pbe.c p5_crpt.c \
p5_crpt2.c e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c \
m_sigver.c e_aes_cbc_hmac_sha1.c \
e_rc4_hmac_md5.c e_aes_cbc_hmac_sha256.c
SRC_C_hmac = hmac.c hm_ameth.c hm_pmeth.c
SRC_C_idea = i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
SRC_C_krb5 = krb5_asn.c
SRC_C_lhash = lhash.c lh_stats.c
SRC_C_md4 = md4_dgst.c md4_one.c
SRC_C_md5 = md5_dgst.c md5_one.c
SRC_C_mdc2 = mdc2_one.c mdc2dgst.c
SRC_C_objects = o_names.c obj_dat.c obj_err.c obj_lib.c obj_xref.c
SRC_C_modes = cbc128.c ctr128.c cts128.c cfb128.c ofb128.c \
gcm128.c ccm128.c xts128.c wrap128.c
SRC_C_ocsp = ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c \
ocsp_cl.c ocsp_srv.c ocsp_prn.c ocsp_vfy.c \
ocsp_err.c
SRC_C_pem = pem_sign.c pem_seal.c pem_info.c pem_lib.c \
pem_all.c pem_err.c pem_x509.c pem_xaux.c \
pem_oth.c pem_pk8.c pem_pkey.c pvkfmt.c
SRC_C_pkcs12 = p12_add.c p12_asn.c p12_attr.c p12_crpt.c \
p12_crt.c p12_decr.c p12_init.c p12_key.c \
p12_kiss.c p12_mutl.c p12_utl.c p12_npas.c \
pk12err.c p12_p8d.c p12_p8e.c
SRC_C_pkcs7 = pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c \
pk7_smime.c pk7_attr.c pk7_mime.c bio_pk7.c
SRC_C_pqueue = pqueue.c
SRC_C_rand = md_rand.c randfile.c rand_lib.c rand_err.c \
rand_egd.c rand_win.c rand_unix.c rand_os2.c \
rand_nw.c
SRC_C_rc2 = rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
SRC_C_rc4 = rc4_skey.c rc4_enc.c rc4_utl.c
SRC_C_ripemd = rmd_dgst.c rmd_one.c
SRC_C_rsa = rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c \
rsa_err.c rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c \
rsa_chk.c rsa_null.c rsa_pss.c rsa_x931.c rsa_asn1.c \
rsa_depr.c rsa_ameth.c rsa_prn.c rsa_pmeth.c \
rsa_crpt.c
SRC_C_seed = seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
SRC_C_sha = sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c \
sha512.c
SRC_C_srp = srp_lib.c srp_vfy.c
SRC_C_stack = stack.c
#SRC_C_threads = th-lock.c
SRC_C_ts = ts_err.c ts_req_utils.c ts_req_print.c ts_rsp_utils.c \
ts_rsp_print.c ts_rsp_sign.c ts_rsp_verify.c \
ts_verify_ctx.c ts_lib.c ts_conf.c ts_asn1.c
SRC_C_txt_db = txt_db.c
SRC_C_ui = ui_err.c ui_lib.c ui_openssl.c ui_util.c ui_compat.c
SRC_C_whrlpool = wp_dgst.c wp_block.c
SRC_C_x509 = x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
x509_obj.c x509_req.c x509spki.c x509_vfy.c \
x509_set.c x509cset.c x509rset.c x509_err.c \
x509name.c x509_v3.c x509_ext.c x509_att.c \
x509type.c x509_lu.c x_all.c x509_txt.c x509_trs.c \
by_file.c by_dir.c x509_vpm.c
SRC_C_x509v3 = v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c \
v3_ia5.c v3_lib.c v3_prn.c v3_utl.c v3err.c \
v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \
v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c \
v3_purp.c v3_info.c v3_ocsp.c v3_akeya.c \
v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c \
v3_pci.c pcy_cache.c pcy_node.c pcy_data.c \
pcy_map.c pcy_tree.c pcy_lib.c v3_asid.c \
v3_addr.c v3_scts.c
SRC_DIR = aes asn1 bf bio bn buffer camellia cast cmac cms comp conf des dh \
dsa dso ec ecdh ecdsa engine err evp hmac idea krb5 lhash md2 md4 md5 \
mdc2 objects modes ocsp pem pkcs12 pkcs7 pqueue rand rc2 rc4 rc5 \
ripemd rsa seed sha srp stack store ts txt_db ui whrlpool x509 x509v3
SRC_C += $(foreach dir,$(SRC_DIR),$(addprefix $(dir)/,$(SRC_C_$(dir))))
#
# Suppress warning "right-hand operand of comma expression has no effect" for
# the HOST_c2l(c,l) macro.
#
CC_OPT_md5/md5_dgst := -Wno-unused-value
INC_DIR += $(LIBCRYPTO_DIR)/asn1
INC_DIR += $(LIBCRYPTO_DIR)/evp
INC_DIR += $(LIBCRYPTO_DIR)/modes
INC_DIR += $(LIBCRYPTO_DIR)
INC_DIR += $(LIBCRYPTO_DIR)/../
INC_DIR += $(OPENSSL_PORT_DIR)/include
INC_DIR += $(REP_DIR)/src/lib/openssl
INC_DIR += $(LIB_SRC_DIR)/crypto/modes
INC_DIR += $(LIB_SRC_DIR)/crypto
INC_DIR += $(LIB_SRC_DIR)
INC_DIR += $(LIB_SRC_DIR)/include
CURVE448_INCLUDES := -I$(LIB_SRC_DIR)/crypto/ec/curve448/arch_32 -I$(LIB_SRC_DIR)/crypto/ec/curve448
CC_OPT_ec/curve448/arch_32/f_impl += $(CURVE448_INCLUDES)
CC_OPT_ec/curve448/curve448 += $(CURVE448_INCLUDES)
CC_OPT_ec/curve448/curve448_tables += $(CURVE448_INCLUDES)
CC_OPT_ec/curve448/eddsa += $(CURVE448_INCLUDES)
CC_OPT_ec/curve448/f_generic += $(CURVE448_INCLUDES)
CC_OPT_ec/curve448/scalar += $(CURVE448_INCLUDES)
#
# Generate buildinf.h
@ -203,10 +653,15 @@ $(SRC_C:.c=.o): buildinf.h
# Rules taken from FreeBSDs libcrypto/Makefile
buildinf.h:
$(VERBOSE)( echo "#ifndef MK1MF_BUILD"; \
$(VERBOSE)( \
echo "#ifndef MK1MF_BUILD" ;\
echo "/* auto-generated by libcrypto.mk for crypto/cversion.c */" ;\
echo " #define CFLAGS \"$(CC)\""; \
echo " #define PLATFORM \"FreeBSD-$(TARGET_CPUARCH)\""; \
echo "#endif" ) > $@
echo "#define PLATFORM \"Genode-$(TARGET_CPUARCH)\"" ;\
echo "#define DATE \"built on: $(shell date --rfc-email)\"" ;\
echo "static const char compiler_flags[] = \"<undefined>\";" ;\
echo "#endif" ;\
) > $@
vpath %.c $(LIBCRYPTO_DIR)
vpath %.c $(LIB_SRC_DIR)/crypto
# vi: set ft=make :

View File

@ -27,7 +27,6 @@ SRC_C = \
knownhosts.c \
legacy.c \
libcrypto.c \
libcrypto-compat.c \
log.c \
match.c \
messages.c \

View File

@ -1,24 +0,0 @@
LIBSSL_PORT_DIR = $(call select_from_ports,openssl)
LIBS += libc libcrypto
SRC_C = s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
d1_both.c d1_srtp.c \
ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
ssl_ciph.c ssl_stat.c ssl_rsa.c \
ssl_asn1.c ssl_txt.c ssl_algs.c \
bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c t1_ext.c \
ssl_conf.c
INC_DIR += $(LIBSSL_PORT_DIR)/include/openssl
INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl
INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/crypto
INC_DIR += $(LIBSSL_PORT_DIR)/include
vpath %.c $(LIBSSL_PORT_DIR)/src/lib/openssl/ssl
SHARED_LIB = yes

View File

@ -0,0 +1,63 @@
OPENSSL_PORT_DIR := $(call select_from_ports,openssl)
LIB_SRC_DIR := $(OPENSSL_PORT_DIR)/src/lib/openssl
SHARED_LIB = yes
LIBS += libc libcrypto
SRC_C += \
bio_ssl.c \
d1_lib.c \
d1_msg.c \
d1_srtp.c \
methods.c \
packet.c \
pqueue.c \
record/dtls1_bitmap.c \
record/rec_layer_d1.c \
record/rec_layer_s3.c \
record/ssl3_buffer.c \
record/ssl3_record.c \
record/ssl3_record_tls13.c \
s3_cbc.c \
s3_enc.c \
s3_lib.c \
s3_msg.c \
ssl_asn1.c \
ssl_cert.c \
ssl_ciph.c \
ssl_conf.c \
ssl_err.c \
ssl_init.c \
ssl_lib.c \
ssl_mcnf.c \
ssl_rsa.c \
ssl_sess.c \
ssl_stat.c \
ssl_txt.c \
ssl_utst.c \
statem/extensions.c \
statem/extensions_clnt.c \
statem/extensions_cust.c \
statem/extensions_srvr.c \
statem/statem.c \
statem/statem_clnt.c \
statem/statem_dtls.c \
statem/statem_lib.c \
statem/statem_srvr.c \
t1_enc.c \
t1_lib.c \
t1_trce.c \
tls13_enc.c \
tls_srp.c \
# end of SRC_C
INC_DIR += $(OPENSSL_PORT_DIR)/include/openssl
INC_DIR += $(LIB_SRC_DIR)/include
INC_DIR += $(LIB_SRC_DIR)
INC_DIR += $(LIB_SRC_DIR)/crypto
INC_DIR += $(OPENSSL_PORT_DIR)/include
vpath %.c $(LIB_SRC_DIR)/ssl
CC_CXX_WARN_STRICT =

View File

@ -1,7 +1,37 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/arm
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/32bit
CC_OPTS += -DL_ENDIAN
CC_OPT += -DOPENSSL_CPUID_OBJ -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
CC_OPT += -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DKECCAK1600_ASM -DAES_ASM
CC_OPT += -DGHASH_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM
SRC_C = \
armcap.c \
bf/bf_enc.c \
bn/bn_asm.c \
camellia/cmll_cbc.c \
camellia/cmll_misc.c \
des/des_enc.c \
# end of SRC_C
SRC_S = \
aes/asm/aes-armv4.S \
aes/asm/aesv8-arm32.S \
armv4cpuid.S \
bn/asm/armv4-gf2m.S \
bn/asm/armv4-mont.S \
chacha/asm/chacha-armv4.S \
ec/asm/ecp_nistz256-armv4.S \
modes/asm/ghash-armv4.S \
modes/asm/ghashv8-arm32.S \
poly1305/asm/poly1305-armv4.S \
sha/asm/keccak1600-armv4.S \
sha/asm/sha1-armv4-large.S \
sha/asm/sha256-armv4.S \
sha/asm/sha512-armv4.S \
# end of SRC_S
vpath %.S $(call select_from_ports,openssl)/src/lib/openssl/crypto
include $(REP_DIR)/lib/mk/libcrypto.inc

View File

@ -1,6 +0,0 @@
include $(REP_DIR)/lib/mk/libssl.inc
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/arm
INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/spec/arm
CC_CXX_WARN_STRICT =

View File

@ -1,7 +1,36 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/arm_64
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/64bit
CC_OPTS += -DL_ENDIAN
CC_OPT += -DOPENSSL_CPUID_OBJ -DOPENSSL_BN_ASM_MONT -DSHA1_ASM -DSHA256_ASM
CC_OPT += -DSHA512_ASM -DKECCAK1600_ASM -DVPAES_ASM -DECP_NISTZ256_ASM
CC_OPT += -DPOLY1305_ASM
SRC_C = \
armcap.c \
aes/aes_core.c \
bf/bf_enc.c \
bn/bn_asm.c \
camellia/cmll_cbc.c \
camellia/cmll_misc.c \
des/des_enc.c \
# end of SRC_C
SRC_S = \
aes/asm/aesv8-arm64.S \
aes/asm/vpaes-armv8.S \
arm64cpuid.S \
bn/asm/armv8-mont.S \
chacha/asm/chacha-armv8.S \
ec/asm/ecp_nistz256-armv8.S \
modes/asm/ghashv8-arm64.S \
poly1305/asm/poly1305-armv8.S \
sha/asm/keccak1600-armv8.S \
sha/asm/sha1-armv8.S \
sha/asm/sha256-armv8.S \
sha/asm/sha512-armv8.S \
# end of SRC_S
vpath %.S $(call select_from_ports,openssl)/src/lib/openssl/crypto
include $(REP_DIR)/lib/mk/libcrypto.inc

View File

@ -1,5 +0,0 @@
include $(REP_DIR)/lib/mk/libssl.inc
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/arm_64
CC_CXX_WARN_STRICT =

View File

@ -1,7 +1,40 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/x86_32
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/32bit
CC_OPTS += -DL_ENDIAN
CC_OPT += -DOPENSSL_CPUID_OBJ -DOPENSSL_BN_ASM_PART_WORDS -DOPENSSL_IA32_SSE2
CC_OPT += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM
CC_OPT += -DSHA512_ASM -DRC4_ASM -DMD5_ASM -DRMD160_ASM -DAESNI_ASM -DVPAES_ASM
CC_OPT += -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM -DPOLY1305_ASM
SRC_C = \
aes/aes_core.c \
# end of SRC_C
SRC_S = \
aes/asm/aesni-x86.s \
aes/asm/vpaes-x86.s \
bf/asm/bf-586.s \
bn/asm/bn-586.s \
bn/asm/co-586.s \
bn/asm/x86-gf2m.s \
bn/asm/x86-mont.s \
camellia/asm/cmll-x86.s \
chacha/asm/chacha-x86.s \
des/asm/des-586.s \
ec/asm/ecp_nistz256-x86.s \
md5/asm/md5-586.s \
modes/asm/ghash-x86.s \
poly1305/asm/poly1305-x86.s \
rc4/asm/rc4-586.s \
ripemd/asm/rmd-586.s \
sha/asm/sha1-586.s \
sha/asm/sha256-586.s \
sha/asm/sha512-586.s \
whrlpool/asm/wp-mmx.s \
x86cpuid.s \
# end of SRC_S
vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/crypto
include $(REP_DIR)/lib/mk/libcrypto.inc

View File

@ -1,6 +0,0 @@
include $(REP_DIR)/lib/mk/libssl.inc
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/x86_32
INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/spec/x86_32
CC_CXX_WARN_STRICT =

View File

@ -1,9 +1,51 @@
# has to be the first path because it includes openssl/opensslconf.h
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/x86_64
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/64bit
CC_OPTS += -DL_ENDIAN
CC_OPT += -DOPENSSL_CPUID_OBJ -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT
CC_OPT += -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM
CC_OPT += -DSHA512_ASM -DKECCAK1600_ASM -DRC4_ASM -DMD5_ASM -DAESNI_ASM -DVPAES_ASM
CC_OPT += -DGHASH_ASM -DECP_NISTZ256_ASM -DX25519_ASM -DPOLY1305_ASM
vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/x86_64
SRC_C = \
aes/aes_core.c \
bf/bf_enc.c \
bn/asm/x86_64-gcc.c \
camellia/cmll_misc.c \
des/des_enc.c \
# end of SRC_C
SRC_S = \
aes/asm/aesni-mb-x86_64.s \
aes/asm/aesni-sha1-x86_64.s \
aes/asm/aesni-sha256-x86_64.s \
aes/asm/aesni-x86_64.s \
aes/asm/vpaes-x86_64.s \
bn/asm/rsaz-avx2.s \
bn/asm/rsaz-x86_64.s \
bn/asm/x86_64-gf2m.s \
bn/asm/x86_64-mont.s \
bn/asm/x86_64-mont5.s \
camellia/asm/cmll-x86_64.s \
chacha/asm/chacha-x86_64.s \
ec/asm/ecp_nistz256-x86_64.s \
ec/asm/x25519-x86_64.s \
md5/asm/md5-x86_64.s \
modes/asm/aesni-gcm-x86_64.s \
modes/asm/ghash-x86_64.s \
poly1305/asm/poly1305-x86_64.s \
rc4/asm/rc4-md5-x86_64.s \
rc4/asm/rc4-x86_64.s \
sha/asm/keccak1600-x86_64.s \
sha/asm/sha1-mb-x86_64.s \
sha/asm/sha1-x86_64.s \
sha/asm/sha256-mb-x86_64.s \
sha/asm/sha256-x86_64.s \
sha/asm/sha512-x86_64.s \
whrlpool/asm/wp-x86_64.s \
x86_64cpuid.s \
# end of SRC_S
vpath %.s $(call select_from_ports,openssl)/src/lib/openssl/crypto
include $(REP_DIR)/lib/mk/libcrypto.inc

View File

@ -1,6 +0,0 @@
include $(REP_DIR)/lib/mk/libssl.inc
INC_DIR += $(REP_DIR)/src/lib/openssl/spec/x86_64
INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/spec/x86_64
CC_CXX_WARN_STRICT =

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
82ec0408053fd1e09356d6ed015bdf10a5ddbcf0
76f11202782ecc6ea2342346bd70fe45960c1d66

View File

@ -1,92 +1,137 @@
LICENSE := OpenSSL
VERSION := 1.0.2u
VERSION := 1.1.1i
DOWNLOADS := openssl.archive
URL(openssl) := https://www.openssl.org/source/openssl-$(VERSION).tar.gz
SHA(openssl) := ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
SHA(openssl) := e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
DIR(openssl) := src/lib/openssl
DIRS := include/openssl
DIR_CONTENT(include/openssl) = \
src/lib/openssl/crypto/aes/aes.h \
src/lib/openssl/crypto/asn1/asn1.h \
src/lib/openssl/crypto/asn1/asn1_mac.h \
src/lib/openssl/crypto/asn1/asn1t.h \
src/lib/openssl/crypto/bf/blowfish.h \
src/lib/openssl/crypto/bio/bio.h \
src/lib/openssl/crypto/bn/bn.h \
src/lib/openssl/crypto/buffer/buffer.h \
src/lib/openssl/crypto/camellia/camellia.h \
src/lib/openssl/crypto/cast/cast.h \
src/lib/openssl/crypto/cmac/cmac.h \
src/lib/openssl/crypto/cms/cms.h \
src/lib/openssl/crypto/comp/comp.h \
src/lib/openssl/crypto/conf/conf.h \
src/lib/openssl/crypto/conf/conf_api.h \
src/lib/openssl/crypto/crypto.h \
src/lib/openssl/crypto/des/des.h \
src/lib/openssl/crypto/des/des_old.h \
src/lib/openssl/crypto/dh/dh.h \
src/lib/openssl/crypto/dsa/dsa.h \
src/lib/openssl/crypto/dso/dso.h \
src/lib/openssl/crypto/ebcdic.h \
src/lib/openssl/crypto/ec/ec.h \
src/lib/openssl/crypto/ecdh/ecdh.h \
src/lib/openssl/crypto/ecdsa/ecdsa.h \
src/lib/openssl/crypto/engine/engine.h \
src/lib/openssl/crypto/err/err.h \
src/lib/openssl/crypto/evp/evp.h \
src/lib/openssl/crypto/hmac/hmac.h \
src/lib/openssl/crypto/idea/idea.h \
src/lib/openssl/crypto/krb5/krb5_asn.h \
src/lib/openssl/crypto/lhash/lhash.h \
src/lib/openssl/crypto/md2/md2.h \
src/lib/openssl/crypto/md4/md4.h \
src/lib/openssl/crypto/md5/md5.h \
src/lib/openssl/crypto/mdc2/mdc2.h \
src/lib/openssl/crypto/modes/modes.h \
src/lib/openssl/crypto/objects/obj_mac.h \
src/lib/openssl/crypto/objects/objects.h \
src/lib/openssl/crypto/ocsp/ocsp.h \
src/lib/openssl/crypto/opensslconf.h \
src/lib/openssl/crypto/opensslv.h \
src/lib/openssl/crypto/ossl_typ.h \
src/lib/openssl/crypto/pem/pem.h \
src/lib/openssl/crypto/pem/pem2.h \
src/lib/openssl/crypto/pkcs12/pkcs12.h \
src/lib/openssl/crypto/pkcs7/pkcs7.h \
src/lib/openssl/crypto/pqueue/pqueue.h \
src/lib/openssl/crypto/rand/rand.h \
src/lib/openssl/crypto/rc2/rc2.h \
src/lib/openssl/crypto/rc4/rc4.h \
src/lib/openssl/crypto/rc5/rc5.h \
src/lib/openssl/crypto/ripemd/ripemd.h \
src/lib/openssl/crypto/rsa/rsa.h \
src/lib/openssl/crypto/seed/seed.h \
src/lib/openssl/crypto/sha/sha.h \
src/lib/openssl/crypto/srp/srp.h \
src/lib/openssl/crypto/stack/safestack.h \
src/lib/openssl/crypto/stack/stack.h \
src/lib/openssl/crypto/store/store.h \
src/lib/openssl/crypto/symhacks.h \
src/lib/openssl/crypto/ts/ts.h \
src/lib/openssl/crypto/txt_db/txt_db.h \
src/lib/openssl/crypto/ui/ui.h \
src/lib/openssl/crypto/ui/ui_compat.h \
src/lib/openssl/crypto/whrlpool/whrlpool.h \
src/lib/openssl/crypto/x509/x509.h \
src/lib/openssl/crypto/x509/x509_vfy.h \
src/lib/openssl/e_os.h \
src/lib/openssl/e_os2.h \
src/lib/openssl/ssl/dtls1.h \
src/lib/openssl/ssl/kssl.h \
src/lib/openssl/ssl/srtp.h \
src/lib/openssl/ssl/ssl.h \
src/lib/openssl/ssl/ssl2.h \
src/lib/openssl/ssl/ssl23.h \
src/lib/openssl/ssl/ssl3.h \
src/lib/openssl/ssl/tls1.h \
src/lib/openssl/crypto/x509v3/x509v3.h
DIRS := include
DIR_CONTENT(include) = src/lib/openssl/include/openssl
PATCHES := $(addprefix src/lib/openssl/,rand_unix_c.patch ssl.patch constant_time_locl.patch)
PATCH_OPT := -p1 -d src/lib/openssl
#PATCHES := $(addprefix src/lib/openssl/,rand_unix_c.patch ssl.patch constant_time_locl.patch)
#PATCH_OPT := -p1 -d src/lib/openssl
PATCHES := src/lib/openssl/crypto.patch
PATCH_OPT := -p1
$(call check_tool,perl)
ASM_X86_32 := \
src/lib/openssl/crypto/aes/asm/aesni-x86.s \
src/lib/openssl/crypto/aes/asm/vpaes-x86.s \
src/lib/openssl/crypto/bf/asm/bf-586.s \
src/lib/openssl/crypto/bn/asm/bn-586.s \
src/lib/openssl/crypto/bn/asm/co-586.s \
src/lib/openssl/crypto/bn/asm/x86-gf2m.s \
src/lib/openssl/crypto/bn/asm/x86-mont.s \
src/lib/openssl/crypto/camellia/asm/cmll-x86.s \
src/lib/openssl/crypto/chacha/asm/chacha-x86.s \
src/lib/openssl/crypto/des/asm/des-586.s \
src/lib/openssl/crypto/ec/asm/ecp_nistz256-x86.s \
src/lib/openssl/crypto/md5/asm/md5-586.s \
src/lib/openssl/crypto/modes/asm/ghash-x86.s \
src/lib/openssl/crypto/poly1305/asm/poly1305-x86.s \
src/lib/openssl/crypto/rc4/asm/rc4-586.s \
src/lib/openssl/crypto/ripemd/asm/rmd-586.s \
src/lib/openssl/crypto/sha/asm/sha1-586.s \
src/lib/openssl/crypto/sha/asm/sha256-586.s \
src/lib/openssl/crypto/sha/asm/sha512-586.s \
src/lib/openssl/crypto/whrlpool/asm/wp-mmx.s \
src/lib/openssl/crypto/x86cpuid.s
ASM_X86_64 := \
src/lib/openssl/crypto/aes/asm/aesni-mb-x86_64.s \
src/lib/openssl/crypto/aes/asm/aesni-sha1-x86_64.s \
src/lib/openssl/crypto/aes/asm/aesni-sha256-x86_64.s \
src/lib/openssl/crypto/aes/asm/aesni-x86_64.s \
src/lib/openssl/crypto/aes/asm/vpaes-x86_64.s \
src/lib/openssl/crypto/bn/asm//rsaz-avx2.s \
src/lib/openssl/crypto/bn/asm//rsaz-x86_64.s \
src/lib/openssl/crypto/bn/asm//x86_64-gf2m.s \
src/lib/openssl/crypto/bn/asm//x86_64-mont.s \
src/lib/openssl/crypto/bn/asm//x86_64-mont5.s \
src/lib/openssl/crypto/camellia/asm/cmll-x86_64.s \
src/lib/openssl/crypto/chacha/asm/chacha-x86_64.s \
src/lib/openssl/crypto/ec/asm/ecp_nistz256-x86_64.s \
src/lib/openssl/crypto/ec/asm/x25519-x86_64.s \
src/lib/openssl/crypto/md5/asm/md5-x86_64.s \
src/lib/openssl/crypto/modes/asm/aesni-gcm-x86_64.s \
src/lib/openssl/crypto/modes/asm/ghash-x86_64.s \
src/lib/openssl/crypto/poly1305/asm/poly1305-x86_64.s \
src/lib/openssl/crypto/rc4/asm/rc4-md5-x86_64.s \
src/lib/openssl/crypto/rc4/asm/rc4-x86_64.s \
src/lib/openssl/crypto/sha/asm/keccak1600-x86_64.s \
src/lib/openssl/crypto/sha/asm/sha1-mb-x86_64.s \
src/lib/openssl/crypto/sha/asm/sha1-x86_64.s \
src/lib/openssl/crypto/sha/asm/sha256-mb-x86_64.s \
src/lib/openssl/crypto/sha/asm/sha256-x86_64.s \
src/lib/openssl/crypto/sha/asm/sha512-x86_64.s \
src/lib/openssl/crypto/whrlpool/asm/wp-x86_64.s \
src/lib/openssl/crypto/x86_64cpuid.s
ASM_ARM_32 := \
src/lib/openssl/crypto/aes/asm/aes-armv4.S \
src/lib/openssl/crypto/aes/asm/aesv8-arm32.S \
src/lib/openssl/crypto/bn/asm/armv4-gf2m.S \
src/lib/openssl/crypto/bn/asm/armv4-mont.S \
src/lib/openssl/crypto/chacha/asm/chacha-armv4.S \
src/lib/openssl/crypto/ec/asm/ecp_nistz256-armv4.S \
src/lib/openssl/crypto/modes/asm/ghash-armv4.S \
src/lib/openssl/crypto/modes/asm/ghashv8-arm32.S \
src/lib/openssl/crypto/poly1305/asm/poly1305-armv4.S \
src/lib/openssl/crypto/sha/asm/keccak1600-armv4.S \
src/lib/openssl/crypto/sha/asm/sha1-armv4-large.S \
src/lib/openssl/crypto/sha/asm/sha256-armv4.S \
src/lib/openssl/crypto/sha/asm/sha512-armv4.S \
src/lib/openssl/crypto/armv4cpuid.S
ASM_ARM_64 := $(addprefix src/lib/openssl/crypto/, \
aes/asm/aesv8-arm64.S \
aes/asm/vpaes-armv8.S \
bn/asm/armv8-mont.S \
chacha/asm/chacha-armv8.S \
ec/asm/ecp_nistz256-armv8.S \
modes/asm/ghashv8-arm64.S \
poly1305/asm/poly1305-armv8.S \
sha/asm/keccak1600-armv8.S \
sha/asm/sha1-armv8.S \
sha/asm/sha256-armv8.S \
sha/asm/sha512-armv8.S \
arm64cpuid.S)
$(ASM_X86_32): PERLASM_SCHEME=elf -m32 -fPIC -DOPENSSL_IA32_SSE2 -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
$(ASM_X86_64): PERLASM_SCHEME=elf
$(ASM_ARM_32): PERLASM_SCHEME=linux32
$(ASM_ARM_64): PERLASM_SCHEME=linux64
%.s: %.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
%.S: %.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/sha/asm/sha256-x86_64.s: src/lib/openssl/crypto/sha/asm/sha512-x86_64.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/sha/asm/sha256-armv8.S: src/lib/openssl/crypto/sha/asm/sha512-armv8.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/aes/asm/aesv8-arm32.S: src/lib/openssl/crypto/aes/asm/aesv8-armx.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/aes/asm/aesv8-arm64.S: src/lib/openssl/crypto/aes/asm/aesv8-armx.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/modes/asm/ghashv8-arm32.S: src/lib/openssl/crypto/modes/asm/ghashv8-armx.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
src/lib/openssl/crypto/modes/asm/ghashv8-arm64.S: src/lib/openssl/crypto/modes/asm/ghashv8-armx.pl
@$(MSG_GENERATE)$@
$(VERBOSE)perl $< $(PERLASM_SCHEME) $@
_dirs: $(ASM_X86_32) $(ASM_X86_64) $(ASM_ARM_32) $(ASM_ARM_64)

View File

@ -1 +0,0 @@
2020-05-17 a49ac7204c84467772f0ad744e5c0e77beba94b3

View File

@ -1,24 +0,0 @@
MIRROR_FROM_REP_DIR := lib/import/import-libssl.mk \
lib/symbols/libssl
content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
content: include
include:
mkdir $@
cp -r $(PORT_DIR)/include/* $@/
cp $(PORT_DIR)/include/openssl/e_os* $@/
cp -r $(PORT_DIR)/src/lib/openssl/crypto/o_time.h $@/
mkdir -p $@/crypto
cp -r $(PORT_DIR)/src/lib/openssl/crypto/constant_time_locl.h $@/crypto
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/openssl/LICENSE $@

View File

@ -1 +0,0 @@
2020-05-17 e04b653b5ced730e4e6761f3690ff6b5ff887a37

View File

@ -1,5 +1,8 @@
MIRROR_FROM_REP_DIR := lib/import/import-libcrypto.mk \
lib/symbols/libcrypto
MIRROR_FROM_REP_DIR := \
lib/import/import-libcrypto.mk \
lib/import/import-libssl.mk \
lib/symbols/libcrypto \
lib/symbols/libssl
content: $(MIRROR_FROM_REP_DIR)
@ -11,13 +14,18 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
content: include
include:
mkdir -p $@
mkdir $@
cp -r $(PORT_DIR)/include/* $@/
mkdir -p $@/crypto/ec
cp -r $(PORT_DIR)/src/lib/openssl/crypto/ec/ec_lcl.h $@/crypto/ec
cp -r $(PORT_DIR)/src/lib/openssl/crypto/o_dir.h $@/crypto
content: src/lib/openssl
src/lib/openssl:
mkdir -p $@
cp -r $(REP_DIR)/src/lib/openssl/crypto $@/
cp -r $(REP_DIR)/src/lib/openssl/spec $@/
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/openssl/LICENSE $@

View File

@ -0,0 +1 @@
2020-06-02 474a70e50525c17f4e7f121d1f306166731bd018

View File

@ -1,5 +1,4 @@
libc
libcrypto
zlib
libssh
libssl
openssl

View File

@ -1 +0,0 @@
libcrypto

View File

@ -1,27 +0,0 @@
content: src/lib/libcrypto/target.mk src/lib/openssl lib/mk LICENSE
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
src/lib/libcrypto:
mkdir -p $@
src/lib/openssl:
mkdir -p $@
cp -r $(PORT_DIR)/src/lib/openssl/e_os.h $@
cp -r $(REP_DIR)/src/lib/openssl/* $@
mkdir -p $@/crypto
cp -r $(PORT_DIR)/src/lib/openssl/crypto/* $@/crypto
src/lib/libcrypto/target.mk: src/lib/libcrypto src/lib/openssl
echo "LIBS += libcrypto" > $@
lib/mk:
mkdir -p $@
cp $(REP_DIR)/lib/mk/libcrypto.inc $@
for spec in x86_32 x86_64 arm arm_64; do \
mkdir -p $@/spec/$$spec; \
cp $(REP_DIR)/$@/spec/$$spec/libcrypto.mk $@/spec/$$spec/; \
done
LICENSE:
cp $(PORT_DIR)/src/lib/openssl/LICENSE $@

View File

@ -1 +0,0 @@
2020-12-09 ff58b554b3c0866104d92e04286a92aa00172a18

View File

@ -1,4 +1,3 @@
libc
zlib
libcrypto
libssl
openssl

View File

@ -1 +0,0 @@
libssl

View File

@ -1,27 +0,0 @@
content: src/lib/libssl/target.mk src/lib/openssl lib/mk LICENSE
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
src/lib/libssl:
mkdir -p $@
src/lib/openssl:
mkdir -p $@
cp -r $(PORT_DIR)/src/lib/openssl/e_os.h $@
cp -r $(REP_DIR)/src/lib/openssl/* $@
mkdir -p $@/ssl
cp -r $(PORT_DIR)/src/lib/openssl/ssl/* $@/ssl
src/lib/libssl/target.mk: src/lib/libssl src/lib/openssl
echo "LIBS += libssl" > $@
lib/mk:
mkdir -p $@
cp $(REP_DIR)/lib/mk/libssl.inc $@
for spec in x86_32 x86_64 arm arm_64; do \
mkdir -p $@/spec/$$spec; \
cp $(REP_DIR)/$@/spec/$$spec/libssl.mk $@/spec/$$spec/; \
done
LICENSE:
cp $(PORT_DIR)/src/lib/openssl/LICENSE $@

View File

@ -1 +0,0 @@
2020-12-09 787bf42242ffd71159611dda1de521849bd66755

View File

@ -1,2 +0,0 @@
libc
libcrypto

View File

@ -0,0 +1 @@
openssl

View File

@ -0,0 +1,36 @@
MIRROR_FROM_REP_DIR := \
lib/mk/libcrypto.inc \
lib/mk/spec/arm/libcrypto.mk \
lib/mk/spec/arm_64/libcrypto.mk \
lib/mk/spec/x86_32/libcrypto.mk \
lib/mk/spec/x86_64/libcrypto.mk \
lib/mk/libssl.mk
content: $(MIRROR_FROM_REP_DIR)
$(MIRROR_FROM_REP_DIR):
$(mirror_from_rep_dir)
content: src/lib/openssl/target.mk
src/lib/openssl/target.mk: src/lib/openssl
mkdir -p $(dir $@)
echo "LIBS += libcrypto libssl" > $@
PORT_DIR := $(call port_dir,$(REP_DIR)/ports/openssl)
content: src/lib/openssl
src/lib/openssl:
mkdir -p $@
cp -r $(PORT_DIR)/src/lib/openssl/crypto $@/
cp $(PORT_DIR)/src/lib/openssl/e_os.h $@/
cp -r $(PORT_DIR)/src/lib/openssl/include $@/
cp -r $(PORT_DIR)/src/lib/openssl/ssl $@/
cp -r $(REP_DIR)/src/lib/openssl/crypto $@/
cp -r $(REP_DIR)/src/lib/openssl/spec $@/
content: LICENSE
LICENSE:
cp $(PORT_DIR)/src/lib/openssl/LICENSE $@

View File

@ -0,0 +1 @@
2020-06-02-a 1d689c930f43078b29ad9ea7f8838dd273f50351

View File

@ -47,9 +47,8 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/libc \
[depot_user]/src/nic_router \
[depot_user]/src/libcrypto \
[depot_user]/src/libssh \
[depot_user]/src/libssl \
[depot_user]/src/openssl \
[depot_user]/src/report_rom \
[depot_user]/src/vfs \
[depot_user]/src/vfs_[ip_stack] \

View File

@ -18,6 +18,9 @@
/* Define to 1 if you have the <aprpa/inet.h> header file. */
#define HAVE_ARPA_INET_H 1
/* Define to 1 if you have the <glob.h> header file. */
#define HAVE_GLOB_H 1
/* Define to 1 if you have the <pty.h> header file. */
#define HAVE_PTY_H 1
@ -72,8 +75,29 @@
/* Define to 1 if you have eliptic curve cryptography */
#define HAVE_ECC 1
/* Define to 1 if you have DSA */
#define HAVE_DSA 1
/* Define to 1 if you have gl_flags as a glob_t sturct member */
#define HAVE_GLOB_GL_FLAGS_MEMBER 1
/*************************** FUNCTIONS ***************************/
/* Define to 1 if you have the `EVP_aes128_ctr' function. */
#define HAVE_OPENSSL_EVP_AES_CTR 1
/* Define to 1 if you have the `EVP_aes128_cbc' function. */
#define HAVE_OPENSSL_EVP_AES_CBC 1
/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */
#define HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1
/* Define to 1 if you have the `CRYPTO_ctr128_encrypt' function. */
#define HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1
/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
#define HAVE_OPENSSL_EVP_CIPHER_CTX_NEW 1
/* Define to 1 if you have the `snprintf' function. */
#define HAVE_SNPRINTF 1
@ -98,6 +122,9 @@
/* Define to 1 if you have the `strncpy' function. */
#define HAVE_STRNCPY 1
/* Define to 1 if you have the `strndup' function. */
#define HAVE_STRNDUP 1
/* Define to 1 if you have the `cfmakeraw' function. */
/* #undef HAVE_CFMAKERAW */

View File

@ -1,30 +0,0 @@
+++ a/ssl/s2_srvr.c
@@ -111,7 +111,7 @@
#include "ssl_locl.h"
#ifndef OPENSSL_NO_SSL2
-#include "../crypto/constant_time_locl.h"
+#include <crypto/constant_time_locl.h>
# include <stdio.h>
# include <openssl/bio.h>
# include <openssl/rand.h>
+++ a/ssl/s3_cbc.c
@@ -53,7 +53,7 @@
*
*/
-#include "../crypto/constant_time_locl.h"
+#include <crypto/constant_time_locl.h>
#include "ssl_locl.h"
#include <openssl/md5.h>
+++ a/ssl/s3_srvr.c
@@ -154,7 +154,7 @@
#include <stdio.h>
#include "ssl_locl.h"
#include "kssl_lcl.h"
-#include "../crypto/constant_time_locl.h"
+#include <crypto/constant_time_locl.h>
#include <openssl/buffer.h>
#include <openssl/rand.h>
#include <openssl/objects.h>

View File

@ -0,0 +1,147 @@
--- a/src/lib/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
+++ b/src/lib/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
@@ -55,6 +55,8 @@
$avx=0;
+$avx=2; # force AVX support on Genode
+
if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.19) + ($1>=2.22);
--- a/src/lib/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
+++ b/src/lib/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
@@ -102,6 +102,9 @@
$avx=1 if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
$1>=2.19);
+
+$avx=2; # force AVX support on Genode
+
$avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
$1>=2.09);
--- a/src/lib/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
+++ b/src/lib/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
@@ -77,6 +77,8 @@
$shaext=$avx; ### set to zero if compiling for 1.0.1
$avx=1 if (!$shaext && $avx);
+$avx=2; # force AVX support on Genode
+
open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
*STDOUT=*OUT;
--- a/src/lib/openssl/crypto/armcap.c
+++ b/src/lib/openssl/crypto/armcap.c
@@ -114,6 +114,10 @@
return;
}
+ /* Genode: only NEON for now */
+ //OPENSSL_armcap_P |= ARMV7_NEON;
+ return;
+
# if defined(__APPLE__) && !defined(__aarch64__)
/*
* Capability probing by catching SIGILL appears to be problematic
--- a/src/lib/openssl/crypto/bn/asm/rsaz-avx2.pl
+++ b/src/lib/openssl/crypto/bn/asm/rsaz-avx2.pl
@@ -54,6 +54,8 @@
$addx = ($1>=2.23);
}
+$avx=2; # force AVX support on Genode
+
if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.09) + ($1>=2.10);
--- a/src/lib/openssl/crypto/chacha/asm/chacha-x86.pl
+++ b/src/lib/openssl/crypto/chacha/asm/chacha-x86.pl
@@ -53,6 +53,9 @@
=~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
($gasver=$1)>=2.19); # first version supporting AVX
+$gasver=2.32; # GAS version since Genode 19.05
+$ymm=1; # force YMM on Genode
+
$ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
$1>=2.03); # first version supporting AVX
--- a/src/lib/openssl/crypto/poly1305/asm/poly1305-x86.pl
+++ b/src/lib/openssl/crypto/poly1305/asm/poly1305-x86.pl
@@ -55,6 +55,8 @@
$sse2=$avx=0;
for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+$avx=2; # force AVX support on Genode
+
if ($sse2) {
&static_label("const_sse2");
&static_label("enter_blocks");
--- a/src/lib/openssl/crypto/sha/asm/sha1-586.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha1-586.pl
@@ -136,6 +136,8 @@
=~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
$1>=2.19); # first version supporting AVX
+$ymm=1; # force YMM support on Genode
+
$ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
$1>=2.03); # first version supporting AVX
--- a/src/lib/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
@@ -51,6 +51,8 @@
$avx=0;
+$avx=2; # force AVX support on Genode
+
if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.19) + ($1>=2.22);
--- a/src/lib/openssl/crypto/sha/asm/sha1-x86_64.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha1-x86_64.pl
@@ -104,6 +104,8 @@
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
die "can't locate x86_64-xlate.pl";
+$avx=2; # force AVX support on Genode
+
if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.19) + ($1>=2.22);
--- a/src/lib/openssl/crypto/sha/asm/sha256-586.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha256-586.pl
@@ -86,6 +86,8 @@
$avx = ($1>=2.19) + ($1>=2.22);
}
+$avx=2; # force AVX support on Genode
+
if ($xmm && !$avx && $ARGV[0] eq "win32n" &&
`nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.03) + ($1>=2.10);
--- a/src/lib/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
@@ -52,6 +52,8 @@
$avx=0;
+$avx=2; # force AVX support on Genode
+
if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.19) + ($1>=2.22);
--- a/src/lib/openssl/crypto/sha/asm/sha512-x86_64.pl
+++ b/src/lib/openssl/crypto/sha/asm/sha512-x86_64.pl
@@ -120,6 +120,8 @@
( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
die "can't locate x86_64-xlate.pl";
+$avx=2; # force AVX support on Genode
+
if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
=~ /GNU assembler version ([2-9]\.[0-9]+)/) {
$avx = ($1>=2.19) + ($1>=2.22);

View File

@ -0,0 +1,17 @@
/* WARNING: do not edit! */
/* Generated by Makefile from ../include/crypto/dso_conf.h.in */
/*
* Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_DSO_CONF_H
# define OSSL_CRYPTO_DSO_CONF_H
# define DSO_DLFCN
# define HAVE_DLFCN_H
# define DSO_EXTENSION ".so"
#endif

View File

@ -1,29 +0,0 @@
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -222,6 +222,26 @@
}
return 1;
}
+# elif defined RAND_GENODE
+int RAND_poll(void)
+{
+ unsigned char buf[ENTROPY_NEEDED];
+ char const *rand_file = "/dev/random";
+
+ int fd = open(rand_file, O_RDONLY);
+ if (fd == -1) {
+ fprintf(stderr, "libcrypto: open(%s) failed with '%s'\n",
+ rand_file, strerror(errno));
+ return 0;
+ }
+
+ read(fd, buf, sizeof(buf)); /* XXX check read */
+
+ RAND_add(buf, sizeof(buf), ENTROPY_NEEDED);
+ memset(buf, 0, sizeof(buf)); /* XXX make explicit */
+
+ return 1;
+}
# elif defined __OpenBSD__
int RAND_poll(void)
{

View File

@ -0,0 +1,28 @@
/* WARNING: do not edit! */
/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_BN_CONF_H
# define OSSL_CRYPTO_BN_CONF_H
/*
* The contents of this file are not used in the UEFI build, as
* both 32-bit and 64-bit builds are supported from a single run
* of the Configure script.
*/
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif

View File

@ -0,0 +1,198 @@
/*
* WARNING: do not edit!
* Generated by Makefile from ../include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#include <openssl/opensslv.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef OPENSSL_ALGORITHM_DEFINES
# error OPENSSL_ALGORITHM_DEFINES no longer supported
#endif
/*
* OpenSSL was configured with the following options:
*/
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
#endif
#ifndef OPENSSL_NO_AFALGENG
# define OPENSSL_NO_AFALGENG
#endif
#ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
#endif
#ifndef OPENSSL_NO_DEVCRYPTOENG
# define OPENSSL_NO_DEVCRYPTOENG
#endif
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_EGD
# define OPENSSL_NO_EGD
#endif
#ifndef OPENSSL_NO_EXTERNAL_TESTS
# define OPENSSL_NO_EXTERNAL_TESTS
#endif
#ifndef OPENSSL_NO_FUZZ_AFL
# define OPENSSL_NO_FUZZ_AFL
#endif
#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
# define OPENSSL_NO_FUZZ_LIBFUZZER
#endif
#ifndef OPENSSL_NO_HEARTBEATS
# define OPENSSL_NO_HEARTBEATS
#endif
#ifndef OPENSSL_NO_MSAN
# define OPENSSL_NO_MSAN
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_SSL_TRACE
# define OPENSSL_NO_SSL_TRACE
#endif
#ifndef OPENSSL_NO_SSL3
# define OPENSSL_NO_SSL3
#endif
#ifndef OPENSSL_NO_SSL3_METHOD
# define OPENSSL_NO_SSL3_METHOD
#endif
#ifndef OPENSSL_NO_UBSAN
# define OPENSSL_NO_UBSAN
#endif
#ifndef OPENSSL_NO_UI_CONSOLE
# define OPENSSL_NO_UI_CONSOLE
#endif
#ifndef OPENSSL_NO_UNIT_TEST
# define OPENSSL_NO_UNIT_TEST
#endif
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
# define OPENSSL_NO_WEAK_SSL_CIPHERS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/*
* Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
* don't like that. This will hopefully silence them.
*/
#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
/*
* Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
* declarations of functions deprecated in or before <version>. Otherwise, they
* still won't see them if the library has been built to disable deprecated
* functions.
*/
#ifndef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f;
# ifdef __GNUC__
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif
#ifndef OPENSSL_FILE
# ifdef OPENSSL_NO_FILENAMES
# define OPENSSL_FILE ""
# define OPENSSL_LINE 0
# else
# define OPENSSL_FILE __FILE__
# define OPENSSL_LINE __LINE__
# endif
#endif
#ifndef OPENSSL_MIN_API
# define OPENSSL_MIN_API 0
#endif
#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
# undef OPENSSL_API_COMPAT
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
#endif
/*
* Do not deprecate things to be deprecated in version 1.2.0 before the
* OpenSSL version number matches.
*/
#if OPENSSL_VERSION_NUMBER < 0x10200000L
# define DEPRECATEDIN_1_2_0(f) f;
#elif OPENSSL_API_COMPAT < 0x10200000L
# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_2_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x10100000L
# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_1_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x10000000L
# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_0_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x00908000L
# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_0_9_8(f)
#endif
/* Generate 80386 code? */
#undef I386_ONLY
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
/*
* The following are cipher-specific, but are part of the public API.
*/
#if !defined(OPENSSL_SYS_UEFI)
# define BN_LLONG
/* Only one for the following should be defined */
# undef SIXTY_FOUR_BIT_LONG
# undef SIXTY_FOUR_BIT
# define THIRTY_TWO_BIT
#endif
#define RC4_INT unsigned int
#ifdef __cplusplus
}
#endif

View File

@ -0,0 +1,28 @@
/* WARNING: do not edit! */
/* Generated by Makefile from ../include/crypto/bn_conf.h.in */
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#ifndef OSSL_CRYPTO_BN_CONF_H
# define OSSL_CRYPTO_BN_CONF_H
/*
* The contents of this file are not used in the UEFI build, as
* both 32-bit and 64-bit builds are supported from a single run
* of the Configure script.
*/
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#define SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#undef THIRTY_TWO_BIT
#endif

View File

@ -0,0 +1,198 @@
/*
* WARNING: do not edit!
* Generated by Makefile from ../include/openssl/opensslconf.h.in
*
* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/
#include <openssl/opensslv.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifdef OPENSSL_ALGORITHM_DEFINES
# error OPENSSL_ALGORITHM_DEFINES no longer supported
#endif
/*
* OpenSSL was configured with the following options:
*/
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_RAND_SEED_OS
# define OPENSSL_RAND_SEED_OS
#endif
#ifndef OPENSSL_NO_AFALGENG
# define OPENSSL_NO_AFALGENG
#endif
#ifndef OPENSSL_NO_ASAN
# define OPENSSL_NO_ASAN
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
# define OPENSSL_NO_CRYPTO_MDEBUG
#endif
#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
#endif
#ifndef OPENSSL_NO_DEVCRYPTOENG
# define OPENSSL_NO_DEVCRYPTOENG
#endif
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_EGD
# define OPENSSL_NO_EGD
#endif
#ifndef OPENSSL_NO_EXTERNAL_TESTS
# define OPENSSL_NO_EXTERNAL_TESTS
#endif
#ifndef OPENSSL_NO_FUZZ_AFL
# define OPENSSL_NO_FUZZ_AFL
#endif
#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
# define OPENSSL_NO_FUZZ_LIBFUZZER
#endif
#ifndef OPENSSL_NO_HEARTBEATS
# define OPENSSL_NO_HEARTBEATS
#endif
#ifndef OPENSSL_NO_MSAN
# define OPENSSL_NO_MSAN
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_SSL_TRACE
# define OPENSSL_NO_SSL_TRACE
#endif
#ifndef OPENSSL_NO_SSL3
# define OPENSSL_NO_SSL3
#endif
#ifndef OPENSSL_NO_SSL3_METHOD
# define OPENSSL_NO_SSL3_METHOD
#endif
#ifndef OPENSSL_NO_UBSAN
# define OPENSSL_NO_UBSAN
#endif
#ifndef OPENSSL_NO_UI_CONSOLE
# define OPENSSL_NO_UI_CONSOLE
#endif
#ifndef OPENSSL_NO_UNIT_TEST
# define OPENSSL_NO_UNIT_TEST
#endif
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
# define OPENSSL_NO_WEAK_SSL_CIPHERS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/*
* Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
* don't like that. This will hopefully silence them.
*/
#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
/*
* Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
* declarations of functions deprecated in or before <version>. Otherwise, they
* still won't see them if the library has been built to disable deprecated
* functions.
*/
#ifndef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f;
# ifdef __GNUC__
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
# undef DECLARE_DEPRECATED
# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
# endif
# endif
#endif
#ifndef OPENSSL_FILE
# ifdef OPENSSL_NO_FILENAMES
# define OPENSSL_FILE ""
# define OPENSSL_LINE 0
# else
# define OPENSSL_FILE __FILE__
# define OPENSSL_LINE __LINE__
# endif
#endif
#ifndef OPENSSL_MIN_API
# define OPENSSL_MIN_API 0
#endif
#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
# undef OPENSSL_API_COMPAT
# define OPENSSL_API_COMPAT OPENSSL_MIN_API
#endif
/*
* Do not deprecate things to be deprecated in version 1.2.0 before the
* OpenSSL version number matches.
*/
#if OPENSSL_VERSION_NUMBER < 0x10200000L
# define DEPRECATEDIN_1_2_0(f) f;
#elif OPENSSL_API_COMPAT < 0x10200000L
# define DEPRECATEDIN_1_2_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_2_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x10100000L
# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_1_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x10000000L
# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_1_0_0(f)
#endif
#if OPENSSL_API_COMPAT < 0x00908000L
# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
#else
# define DEPRECATEDIN_0_9_8(f)
#endif
/* Generate 80386 code? */
#undef I386_ONLY
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
/*
* The following are cipher-specific, but are part of the public API.
*/
#if !defined(OPENSSL_SYS_UEFI)
# undef BN_LLONG
/* Only one for the following should be defined */
# define SIXTY_FOUR_BIT_LONG
# undef SIXTY_FOUR_BIT
# undef THIRTY_TWO_BIT
#endif
#define RC4_INT unsigned int
#ifdef __cplusplus
}
#endif

View File

@ -1,4 +0,0 @@
- 'opensslconf.h' was created by running './Configure linux-armv4'
- modifications:
- disabled the definition of OPENSSL_CPUID_OBJ
- changed the definition of OPENSSL_NO_DYNAMIC_ENGINE to OPENSSL_NO_STATIC_ENGINE

View File

@ -1,234 +0,0 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
# define NO_EC_NISTP_64_GCC_128
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
#endif
//#define OPENSSL_CPUID_OBJ
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/local/ssl/lib/engines"
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif
#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned char
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#define RC4_CHUNK unsigned long
#endif
#endif
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned int
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#define BN_LLONG
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#define BF_PTR
#endif /* HEADER_BF_LOCL_H */
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#undef DES_RISC1
#endif
#ifndef DES_RISC2
#undef DES_RISC2
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#endif
/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif
#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */

View File

@ -1,226 +0,0 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
#endif
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/lib/engines"
#define OPENSSLDIR "/etc/ssl"
#endif
#endif
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif
#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned int
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#define RC4_CHUNK unsigned long
#endif
#endif
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned int
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#undef BN_LLONG
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#define SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#undef THIRTY_TWO_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#undef DES_RISC1
#endif
#ifndef DES_RISC2
#undef DES_RISC2
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#endif
/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif
#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */

View File

@ -1,232 +0,0 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
# define NO_EC_NISTP_64_GCC_128
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
#endif
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/lib/engines"
#define OPENSSLDIR "/etc/ssl"
#endif
#endif
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif
#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned int
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#undef RC4_CHUNK
#endif
#endif
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned long
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#define BN_LLONG
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#define RC4_INDEX
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#define DES_PTR
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#define DES_RISC1
#endif
#ifndef DES_RISC2
#undef DES_RISC2
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#endif
/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif
#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */

View File

@ -1,226 +0,0 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_STATIC_ENGINE
# define OPENSSL_NO_STATIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
#endif
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/lib/engines"
#define OPENSSLDIR "/etc/ssl"
#endif
#endif
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif
#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned int
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#define RC4_CHUNK unsigned long
#endif
#endif
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned int
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#undef BN_LLONG
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#define SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#undef THIRTY_TWO_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#undef DES_RISC1
#endif
#ifndef DES_RISC2
#undef DES_RISC2
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#endif
/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif
#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */

View File

@ -1,10 +0,0 @@
+++ a/ssl/ssl_cert.c
@@ -121,7 +121,7 @@
# include <sys/types.h>
#endif
-#include "o_dir.h"
+#include <crypto/o_dir.h>
#include <openssl/objects.h>
#include <openssl/bio.h>
#include <openssl/pem.h>

View File

@ -1,5 +1,5 @@
TARGET = test-libssl
LIBS = libc libcrypto libssl
LIBS = libc libssl
SRC_CC = main.cc
vpath main.cc $(PRG_DIR)/..

View File

@ -1,5 +1,4 @@
libc
posix
libssl
libcrypto
openssl
zlib

View File

@ -15,10 +15,9 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/nic_router \
[depot_user]/src/libc \
[depot_user]/src/libcrypto \
[depot_user]/src/libssh \
[depot_user]/src/libssl \
[depot_user]/src/lighttpd \
[depot_user]/src/openssl \
[depot_user]/src/posix \
[depot_user]/src/vfs \
[depot_user]/src/vfs_lwip \

View File

@ -26,10 +26,9 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/init \
[depot_user]/src/nic_router \
[depot_user]/src/libc \
[depot_user]/src/libcrypto \
[depot_user]/src/libssh \
[depot_user]/src/libssl \
[depot_user]/src/lighttpd \
[depot_user]/src/openssl \
[depot_user]/src/posix \
[depot_user]/src/vfs \
[depot_user]/src/vfs_[ip_stack] \

View File

@ -157,8 +157,7 @@ append_if $use_wifi_driver packages " [depot_user]/src/fs_rom "
append_if $use_wifi_driver packages " [depot_user]/src/vfs_import "
append_if $use_wifi_driver packages " [depot_user]/src/report_rom "
append_if $use_wifi_driver packages " [depot_user]/src/wifi_drv "
append_if $use_wifi_driver packages " [depot_user]/src/libcrypto "
append_if $use_wifi_driver packages " [depot_user]/src/libssl "
append_if $use_wifi_driver packages " [depot_user]/src/openssl "
append_if $use_wifi_driver packages " [depot_user]/src/vfs_jitterentropy "
append_if $use_wifi_driver packages " [depot_user]/raw/wifi_firmware "

View File

@ -48,4 +48,4 @@ INC_DIR += $(LIGHTTPD_DIR)/src
LIBS += posix
LIBS += zlib
LIBS += libcrypto libssl
LIBS += libssl