Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl merge conflicts
details: https://anonhg.NetBSD.org/src/rev/135d6a642e66
branches: trunk
changeset: 970371:135d6a642e66
user: christos <christos%NetBSD.org@localhost>
date: Sun Mar 22 00:53:02 2020 +0000
description:
merge conflicts
diffstat:
crypto/external/bsd/openssl/dist/CHANGES | 85 +-
crypto/external/bsd/openssl/dist/Configure | 162 +-
crypto/external/bsd/openssl/dist/NEWS | 5 +
crypto/external/bsd/openssl/dist/README | 2 +-
crypto/external/bsd/openssl/dist/apps/ocsp.c | 6 +-
crypto/external/bsd/openssl/dist/apps/openssl.c | 7 +
crypto/external/bsd/openssl/dist/apps/req.c | 15 +-
crypto/external/bsd/openssl/dist/apps/s_client.c | 5 +-
crypto/external/bsd/openssl/dist/apps/s_server.c | 18 +-
crypto/external/bsd/openssl/dist/apps/s_time.c | 2 +-
crypto/external/bsd/openssl/dist/apps/speed.c | 43 +-
crypto/external/bsd/openssl/dist/crypto/aes/aes_locl.h | 48 -
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl | 12 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86_64.pl | 30 +-
crypto/external/bsd/openssl/dist/crypto/arm_arch.h | 6 +-
crypto/external/bsd/openssl/dist/crypto/armcap.c | 2 -
crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/asn1/asn1_locl.h | 83 -
crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/async/async_locl.h | 77 -
crypto/external/bsd/openssl/dist/crypto/bf/bf_locl.h | 84 -
crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bio_lcl.h | 190 -
crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/blake2/blake2_locl.h | 90 -
crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h | 671 --
crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/camellia/cmll_locl.h | 43 -
crypto/external/bsd/openssl/dist/crypto/cast/cast_lcl.h | 188 -
crypto/external/bsd/openssl/dist/crypto/cms/cms_lcl.h | 438 -
crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c | 26 +-
crypto/external/bsd/openssl/dist/crypto/comp/comp_lcl.h | 30 -
crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c | 17 +-
crypto/external/bsd/openssl/dist/crypto/conf/conf_lcl.h | 11 -
crypto/external/bsd/openssl/dist/crypto/cryptlib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ct/ct_locl.h | 216 -
crypto/external/bsd/openssl/dist/crypto/des/des_locl.h | 226 -
crypto/external/bsd/openssl/dist/crypto/dh/dh_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/dh/dh_locl.h | 57 -
crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/dsa/dsa_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/dsa/dsa_locl.h | 77 -
crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/dso/dso_locl.h | 107 -
crypto/external/bsd/openssl/dist/crypto/ec/curve448/curve448_lcl.h | 38 -
crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c | 23 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_key.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h | 739 --
crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_mont.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nist.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_int.h | 171 -
crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/err/openssl.ec | 10 +-
crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c | 35 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_locl.h | 68 -
crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c | 23 +-
crypto/external/bsd/openssl/dist/crypto/ex_data.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/hmac/hmac.c | 44 +-
crypto/external/bsd/openssl/dist/crypto/hmac/hmac_lcl.h | 25 -
crypto/external/bsd/openssl/dist/crypto/idea/i_cbc.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/idea/i_cfb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/idea/i_ecb.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/idea/i_ofb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/idea/i_skey.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/idea/idea_lcl.h | 95 -
crypto/external/bsd/openssl/dist/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H | 16 -
crypto/external/bsd/openssl/dist/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H | 20 -
crypto/external/bsd/openssl/dist/crypto/include/internal/aria.h | 50 -
crypto/external/bsd/openssl/dist/crypto/include/internal/asn1_int.h | 113 -
crypto/external/bsd/openssl/dist/crypto/include/internal/async.h | 15 -
crypto/external/bsd/openssl/dist/crypto/include/internal/bn_conf.h.in | 27 -
crypto/external/bsd/openssl/dist/crypto/include/internal/bn_dh.h | 24 -
crypto/external/bsd/openssl/dist/crypto/include/internal/bn_int.h | 90 -
crypto/external/bsd/openssl/dist/crypto/include/internal/bn_srp.h | 32 -
crypto/external/bsd/openssl/dist/crypto/include/internal/chacha.h | 42 -
crypto/external/bsd/openssl/dist/crypto/include/internal/cryptlib_int.h | 35 -
crypto/external/bsd/openssl/dist/crypto/include/internal/ctype.h | 82 -
crypto/external/bsd/openssl/dist/crypto/include/internal/dso_conf.h.in | 31 -
crypto/external/bsd/openssl/dist/crypto/include/internal/ec_int.h | 53 -
crypto/external/bsd/openssl/dist/crypto/include/internal/engine.h | 20 -
crypto/external/bsd/openssl/dist/crypto/include/internal/err_int.h | 19 -
crypto/external/bsd/openssl/dist/crypto/include/internal/evp_int.h | 442 -
crypto/external/bsd/openssl/dist/crypto/include/internal/lhash.h | 15 -
crypto/external/bsd/openssl/dist/crypto/include/internal/md32_common.h | 256 -
crypto/external/bsd/openssl/dist/crypto/include/internal/objects.h | 12 -
crypto/external/bsd/openssl/dist/crypto/include/internal/poly1305.h | 21 -
crypto/external/bsd/openssl/dist/crypto/include/internal/rand_int.h | 134 -
crypto/external/bsd/openssl/dist/crypto/include/internal/sha.h | 19 -
crypto/external/bsd/openssl/dist/crypto/include/internal/siphash.h | 25 -
crypto/external/bsd/openssl/dist/crypto/include/internal/sm2.h | 78 -
crypto/external/bsd/openssl/dist/crypto/include/internal/sm2err.h | 65 -
crypto/external/bsd/openssl/dist/crypto/include/internal/sm3.h | 39 -
crypto/external/bsd/openssl/dist/crypto/include/internal/sm4.h | 37 -
crypto/external/bsd/openssl/dist/crypto/include/internal/store.h | 10 -
crypto/external/bsd/openssl/dist/crypto/include/internal/store_int.h | 26 -
crypto/external/bsd/openssl/dist/crypto/include/internal/x509_int.h | 286 -
crypto/external/bsd/openssl/dist/crypto/lhash/lhash.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/lhash/lhash_lcl.h | 44 -
crypto/external/bsd/openssl/dist/crypto/md4/md4_dgst.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/md4/md4_locl.h | 60 -
crypto/external/bsd/openssl/dist/crypto/md5/asm/md5-x86_64.pl | 4 +-
crypto/external/bsd/openssl/dist/crypto/md5/md5_dgst.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/md5/md5_locl.h | 80 -
crypto/external/bsd/openssl/dist/crypto/mem.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/modes/modes_lcl.h | 190 -
crypto/external/bsd/openssl/dist/crypto/objects/o_names.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/objects/obj_lcl.h | 14 -
crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lcl.h | 236 -
crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_lcl.h | 43 -
crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_lib.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ppccap.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl | 25 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_lcl.h | 299 -
crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c | 66 +-
crypto/external/bsd/openssl/dist/crypto/rc2/rc2_cbc.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc2/rc2_ecb.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc2/rc2_local.h | 2 +
crypto/external/bsd/openssl/dist/crypto/rc2/rc2_locl.h | 121 -
crypto/external/bsd/openssl/dist/crypto/rc2/rc2cfb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc2/rc2ofb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc4/asm/rc4-x86_64.pl | 13 +-
crypto/external/bsd/openssl/dist/crypto/rc4/rc4_locl.h | 16 -
crypto/external/bsd/openssl/dist/crypto/rc5/rc5_ecb.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc5/rc5_enc.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc5/rc5_locl.h | 172 -
crypto/external/bsd/openssl/dist/crypto/rc5/rc5cfb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rc5/rc5ofb64.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_dgst.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_locl.h | 87 -
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_gen.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_locl.h | 132 -
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c | 24 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/seed/seed_locl.h | 112 -
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl | 8 +-
crypto/external/bsd/openssl/dist/crypto/sha/sha256.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/sha/sha_locl.h | 424 -
crypto/external/bsd/openssl/dist/crypto/sm3/sm3_locl.h | 79 -
crypto/external/bsd/openssl/dist/crypto/sparccpuid.S | 14 +-
crypto/external/bsd/openssl/dist/crypto/store/store_locl.h | 132 -
crypto/external/bsd/openssl/dist/crypto/ts/ts_lcl.h | 211 -
crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/ui/ui_locl.h | 109 -
crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/whrlpool/wp_locl.h | 12 -
crypto/external/bsd/openssl/dist/crypto/x509/x509_lcl.h | 147 -
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/pcy_int.h | 167 -
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_addr.c | 2 +-
crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl | 20 +-
crypto/external/bsd/openssl/dist/doc/HOWTO/proxy_certificates.txt | 319 -
crypto/external/bsd/openssl/dist/e_os.h | 8 +-
crypto/external/bsd/openssl/dist/include/internal/constant_time_locl.h | 387 -
crypto/external/bsd/openssl/dist/include/internal/refcount.h | 4 +-
crypto/external/bsd/openssl/dist/include/openssl/safestack.h | 4 +-
crypto/external/bsd/openssl/dist/ssl/d1_lib.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/d1_srtp.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/packet_locl.h | 874 ---
crypto/external/bsd/openssl/dist/ssl/record/record_locl.h | 116 -
crypto/external/bsd/openssl/dist/ssl/s3_cbc.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/s3_enc.c | 2 +-
crypto/external/bsd/openssl/dist/ssl/s3_lib.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl_err.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 86 +-
crypto/external/bsd/openssl/dist/ssl/ssl_locl.h | 2672 ----------
crypto/external/bsd/openssl/dist/ssl/ssl_sess.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_locl.h | 420 -
crypto/external/bsd/openssl/dist/ssl/t1_enc.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 99 +-
crypto/external/bsd/openssl/dist/ssl/tls_srp.c | 2 +-
crypto/external/bsd/openssl/dist/test/bntest.c | 338 +
crypto/external/bsd/openssl/dist/test/constant_time_test.c | 2 +-
crypto/external/bsd/openssl/dist/test/ectest.c | 103 +-
crypto/external/bsd/openssl/dist/test/evp_extra_test.c | 113 +-
crypto/external/bsd/openssl/dist/test/hmactest.c | 57 +-
crypto/external/bsd/openssl/dist/test/testutil/format_output.c | 16 +-
crypto/external/bsd/openssl/dist/test/testutil/init.c | 15 -
crypto/external/bsd/openssl/dist/test/testutil/main.c | 2 +-
crypto/external/bsd/openssl/dist/test/testutil/output.h | 42 +-
crypto/external/bsd/openssl/dist/test/testutil/tap_bio.c | 4 +-
crypto/external/bsd/openssl/dist/test/testutil/tests.c | 1 -
crypto/external/bsd/openssl/include/crypto/bn_conf.h | 30 +
crypto/external/bsd/openssl/include/crypto/dso_conf.h | 15 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/armv8-mont.S | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha-armv8.S | 8 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ecp_nistz256-armv8.S | 99 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/keccak1600-armv8.S | 40 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305-armv8.S | 2 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha512-armv8.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/vpaes-armv8.S | 18 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S | 8 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S | 185 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S | 99 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S | 190 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S | 40 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S | 2 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S | 18 +
crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ecp_nistz256-x86.S | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S | 6 +
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppc.S | 1 +
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S | 17 -
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/aesp8-ppc.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ppc.S | 1 +
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/des_enc-sparc.S | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ecp_nistz256-sparcv9.S | 1 -
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des_enc-sparc.S | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ecp_nistz256-sparcv9.S | 1 -
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-gcm-x86_64.S | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S | 4 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha256-x86_64.S | 32 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S | 8 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ecp_nistz256-x86_64.S | 54 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/keccak1600-x86_64.S | 2 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/poly1305-x86_64.S | 24 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S | 9 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rsaz-x86_64.S | 375 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x25519-x86_64.S | 10 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S | 18 +
crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S | 18 +
crypto/external/bsd/openssl/lib/libcrypto/crypto.map | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c | 2 +-
crypto/external/bsd/openssl/lib/libcryptotest/Makefile | 4 +-
259 files changed, 2343 insertions(+), 14681 deletions(-)
diffs (truncated from 23598 to 300 lines):
diff -r 16f3c5f7016b -r 135d6a642e66 crypto/external/bsd/openssl/dist/CHANGES
--- a/crypto/external/bsd/openssl/dist/CHANGES Sun Mar 22 00:49:02 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/CHANGES Sun Mar 22 00:53:02 2020 +0000
@@ -7,6 +7,73 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.
+ Changes between 1.1.1d and 1.1.1e [17 Mar 2020]
+ *) Properly detect EOF while reading in libssl. Previously if we hit an EOF
+ while reading in libssl then we would report an error back to the
+ application (SSL_ERROR_SYSCALL) but errno would be 0. We now add
+ an error to the stack (which means we instead return SSL_ERROR_SSL) and
+ therefore give a hint as to what went wrong.
+ [Matt Caswell]
+
+ *) Check that ed25519 and ed448 are allowed by the security level. Previously
+ signature algorithms not using an MD were not being checked that they were
+ allowed by the security level.
+ [Kurt Roeckx]
+
+ *) Fixed SSL_get_servername() behaviour. The behaviour of SSL_get_servername()
+ was not quite right. The behaviour was not consistent between resumption
+ and normal handshakes, and also not quite consistent with historical
+ behaviour. The behaviour in various scenarios has been clarified and
+ it has been updated to make it match historical behaviour as closely as
+ possible.
+ [Matt Caswell]
+
+ *) [VMS only] The header files that the VMS compilers include automatically,
+ __DECC_INCLUDE_PROLOGUE.H and __DECC_INCLUDE_EPILOGUE.H, use pragmas that
+ the C++ compiler doesn't understand. This is a shortcoming in the
+ compiler, but can be worked around with __cplusplus guards.
+
+ C++ applications that use OpenSSL libraries must be compiled using the
+ qualifier '/NAMES=(AS_IS,SHORTENED)' to be able to use all the OpenSSL
+ functions. Otherwise, only functions with symbols of less than 31
+ characters can be used, as the linker will not be able to successfully
+ resolve symbols with longer names.
+ [Richard Levitte]
+
+ *) Corrected the documentation of the return values from the EVP_DigestSign*
+ set of functions. The documentation mentioned negative values for some
+ errors, but this was never the case, so the mention of negative values
+ was removed.
+
+ Code that followed the documentation and thereby check with something
+ like 'EVP_DigestSignInit(...) <= 0' will continue to work undisturbed.
+ [Richard Levitte]
+
+ *) Fixed an an overflow bug in the x64_64 Montgomery squaring procedure
+ used in exponentiation with 512-bit moduli. No EC algorithms are
+ affected. Analysis suggests that attacks against 2-prime RSA1024,
+ 3-prime RSA1536, and DSA1024 as a result of this defect would be very
+ difficult to perform and are not believed likely. Attacks against DH512
+ are considered just feasible. However, for an attack the target would
+ have to re-use the DH512 private key, which is not recommended anyway.
+ Also applications directly using the low level API BN_mod_exp may be
+ affected if they use BN_FLG_CONSTTIME.
+ (CVE-2019-1551)
+ [Andy Polyakov]
+
+ *) Added a new method to gather entropy on VMS, based on SYS$GET_ENTROPY.
+ The presence of this system service is determined at run-time.
+ [Richard Levitte]
+
+ *) Added newline escaping functionality to a filename when using openssl dgst.
+ This output format is to replicate the output format found in the '*sum'
+ checksum programs. This aims to preserve backward compatibility.
+ [Matt Eaton, Richard Levitte, and Paul Dale]
+
+ *) Print all values for a PKCS#12 attribute with 'openssl pkcs12', not just
+ the first value.
+ [Jon Spillett]
+
Changes between 1.1.1c and 1.1.1d [10 Sep 2019]
*) Fixed a fork protection issue. OpenSSL 1.1.1 introduced a rewritten random
@@ -633,9 +700,9 @@
bytes long. In theory it is permissible in SSLv3 - TLSv1.2 to fragment such
alerts across multiple records (some of which could be empty). In practice
it make no sense to send an empty alert record, or to fragment one. TLSv1.3
- prohibts this altogether and other libraries (BoringSSL, NSS) do not
+ prohibits this altogether and other libraries (BoringSSL, NSS) do not
support this at all. Supporting it adds significant complexity to the
- record layer, and its removal is unlikely to cause inter-operability
+ record layer, and its removal is unlikely to cause interoperability
issues.
[Matt Caswell]
@@ -3652,7 +3719,7 @@
implementations).
[Emilia Käsper, Adam Langley, Bodo Moeller (Google)]
- *) Use type ossl_ssize_t instad of ssize_t which isn't available on
+ *) Use type ossl_ssize_t instead of ssize_t which isn't available on
all platforms. Move ssize_t definition from e_os.h to the public
header file e_os2.h as it now appears in public header file cms.h
[Steve Henson]
@@ -8373,7 +8440,7 @@
*) New OCSP utility. Allows OCSP requests to be generated or
read. The request can be sent to a responder and the output
- parsed, outputed or printed in text form. Not complete yet:
+ parsed, outputted or printed in text form. Not complete yet:
still needs to check the OCSP response validity.
[Steve Henson]
@@ -9368,7 +9435,7 @@
[Andy Polyakov]
*) Modified SSL library such that the verify_callback that has been set
- specificly for an SSL object with SSL_set_verify() is actually being
+ specifically for an SSL object with SSL_set_verify() is actually being
used. Before the change, a verify_callback set with this function was
ignored and the verify_callback() set in the SSL_CTX at the time of
the call was used. New function X509_STORE_CTX_set_verify_cb() introduced
@@ -10485,10 +10552,10 @@
as other interfaces in OpenSSL, like the BIO interface.
NCONF_dump_* dump the internal storage of the configuration file,
which is useful for debugging. All other functions take the same
- arguments as the old CONF_* functions wth the exception of the
+ arguments as the old CONF_* functions with the exception of the
first that must be a `CONF *' instead of a `LHASH *'.
- To make it easer to use the new classes with the old CONF_* functions,
+ To make it easier to use the new classes with the old CONF_* functions,
the function CONF_set_default_method is provided.
[Richard Levitte]
@@ -12331,7 +12398,7 @@
than the old method: it now uses a modified version of Ulf's parser to
read the ANSI prototypes in all header files (thus the old K&R definitions
aren't needed for error creation any more) and do a better job of
- translating function codes into names. The old 'ASN1 error code imbedded
+ translating function codes into names. The old 'ASN1 error code embedded
in a comment' is no longer necessary and it doesn't use .err files which
have now been deleted. Also the error code call doesn't have to appear all
on one line (which resulted in some large lines...).
@@ -12632,7 +12699,7 @@
*) Add a useful kludge to allow package maintainers to specify compiler and
other platforms details on the command line without having to patch the
- Configure script everytime: One now can use ``perl Configure
+ Configure script every time: One now can use ``perl Configure
<id>:<details>'', i.e. platform ids are allowed to have details appended
to them (separated by colons). This is treated as there would be a static
pre-configured entry in Configure's %table under key <id> with value
diff -r 16f3c5f7016b -r 135d6a642e66 crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure Sun Mar 22 00:49:02 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure Sun Mar 22 00:53:02 2020 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
# -*- mode: perl; -*-
-# Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2020 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
@@ -69,7 +69,15 @@
# no-sse2 disables IA-32 SSE2 code in assembly modules, the above
# mentioned '386' option implies this one
# no-<cipher> build without specified algorithm (rsa, idea, rc5, ...)
-# -<xxx> +<xxx> compiler options are passed through
+# -<xxx> +<xxx> All options which are unknown to the 'Configure' script are
+# /<xxx> passed through to the compiler. Unix-style options beginning
+# with a '-' or '+' are recognized, as well as Windows-style
+# options beginning with a '/'. If the option contains arguments
+# separated by spaces, then the URL-style notation %20 can be
+# used for the space character in order to avoid having to quote
+# the option. For example, -opt%20arg gets expanded to -opt arg.
+# In fact, any ASCII character can be encoded as %xx using its
+# hexadecimal encoding.
# -static while -static is also a pass-through compiler option (and
# as such is limited to environments where it's actually
# meaningful), it triggers a number configuration options,
@@ -152,6 +160,10 @@
-Wmissing-variable-declarations
);
+my @cl_devteam_warn = qw(
+ /WX
+);
+
# This adds backtrace information to the memory leak info. Is only used
# when crypto-mdebug-backtrace is enabled.
my $memleak_devteam_backtrace = "-rdynamic";
@@ -346,6 +358,7 @@
"dgram",
"dh",
"dsa",
+ "dso",
"dtls",
"dynamic-engine",
"ec",
@@ -423,7 +436,6 @@
"buf-freelists" => undef,
"ripemd" => "rmd160",
"ui" => "ui-console",
- "dso" => "", # Empty string means we're silent about it
);
# All of the following are disabled by default:
@@ -480,6 +492,7 @@
# Without position independent code, there can be no shared libraries or DSOs
"pic" => [ "shared" ],
"shared" => [ "dynamic-engine" ],
+ "dso" => [ "dynamic-engine" ],
"engine" => [ "afalgeng", "devcryptoeng" ],
# no-autoalginit is only useful when building non-shared
@@ -520,7 +533,7 @@
&usage if ($#ARGV < 0);
-# For the "make variables" CINCLUDES and CDEFINES, we support lists with
+# For the "make variables" CPPINCLUDES and CPPDEFINES, we support lists with
# platform specific list separators. Users from those platforms should
# recognise those separators from how you set up the PATH to find executables.
# The default is the Unix like separator, :, but as an exception, we also
@@ -776,7 +789,7 @@
{
die "FIPS mode not supported\n";
}
- elsif (/^[-+]/)
+ elsif (m|^[-+/]|)
{
if (/^--prefix=(.*)$/)
{
@@ -853,11 +866,11 @@
{
push @{$useradd{LDFLAGS}}, $_;
}
- elsif (/^-D(.*)$/)
+ elsif (m|^[-/]D(.*)$|)
{
push @{$useradd{CPPDEFINES}}, $1;
}
- elsif (/^-I(.*)$/)
+ elsif (m|^[-/]I(.*)$|)
{
push @{$useradd{CPPINCLUDES}}, $1;
}
@@ -867,11 +880,23 @@
}
else # common if (/^[-+]/), just pass down...
{
+ # Treat %xx as an ASCII code (e.g. replace %20 by a space character).
+ # This provides a simple way to pass options with arguments separated
+ # by spaces without quoting (e.g. -opt%20arg translates to -opt arg).
$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
push @{$useradd{CFLAGS}}, $_;
push @{$useradd{CXXFLAGS}}, $_;
}
}
+ elsif (m|^/|)
+ {
+ # Treat %xx as an ASCII code (e.g. replace %20 by a space character).
+ # This provides a simple way to pass options with arguments separated
+ # by spaces without quoting (e.g. /opt%20arg translates to /opt arg).
+ $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
+ push @{$useradd{CFLAGS}}, $_;
+ push @{$useradd{CXXFLAGS}}, $_;
+ }
else
{
die "target already defined - $target (offending arg: $_)\n" if ($target ne "");
@@ -949,7 +974,11 @@
if (defined $value) {
if (ref $user{$_} eq 'ARRAY') {
- $user{$_} = [ split /$list_separator_re/, $value ];
+ if ($_ eq 'CPPDEFINES' || $_ eq 'CPPINCLUDES') {
+ $user{$_} = [ split /$list_separator_re/, $value ];
+ } else {
+ $user{$_} = [ $value ];
+ }
} elsif (!defined $user{$_}) {
$user{$_} = $value;
}
@@ -1162,43 +1191,6 @@
# Allow overriding the build file name
$config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";
-my %disabled_info = (); # For configdata.pm
-foreach my $what (sort keys %disabled) {
- $config{options} .= " no-$what";
-
- if (!grep { $what eq $_ } ( 'buildtest-c++', 'threads', 'shared', 'pic',
- 'dynamic-engine', 'makedepend',
- 'zlib-dynamic', 'zlib', 'sse2' )) {
- (my $WHAT = uc $what) =~ s|-|_|g;
-
- # Fix up C macro end names
- $WHAT = "RMD160" if $what eq "ripemd";
-
- # fix-up crypto/directory name(s)
- $what = "ripemd" if $what eq "rmd160";
- $what = "whrlpool" if $what eq "whirlpool";
-
- my $macro = $disabled_info{$what}->{macro} = "OPENSSL_NO_$WHAT";
Home |
Main Index |
Thread Index |
Old Index