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, regen
details: https://anonhg.NetBSD.org/src/rev/47425b945e24
branches: trunk
changeset: 978970:47425b945e24
user: christos <christos%NetBSD.org@localhost>
date: Thu Dec 10 00:33:08 2020 +0000
description:
merge conflicts, regen
diffstat:
crypto/external/bsd/openssl/dist/CHANGES | 63 +
crypto/external/bsd/openssl/dist/Configure | 38 +-
crypto/external/bsd/openssl/dist/NEWS | 12 +
crypto/external/bsd/openssl/dist/README | 2 +-
crypto/external/bsd/openssl/dist/apps/ca.c | 6 +-
crypto/external/bsd/openssl/dist/apps/s_client.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c | 21 +-
crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c | 18 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/ec/asm/ecp_nistz256-avx2.pl | 2080 ----------
crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c | 27 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c | 40 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_key.c | 83 +-
crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c | 1 +
crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c | 5 -
crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c | 24 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/rand/randfile.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl | 2 +-
crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c | 12 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c | 213 +-
crypto/external/bsd/openssl/dist/e_os.h | 2 +-
crypto/external/bsd/openssl/dist/include/openssl/bn.h | 4 +-
crypto/external/bsd/openssl/dist/ssl/s3_lib.c | 21 +-
crypto/external/bsd/openssl/dist/ssl/ssl_lib.c | 24 +-
crypto/external/bsd/openssl/dist/ssl/ssl_sess.c | 4 +-
crypto/external/bsd/openssl/dist/ssl/t1_lib.c | 74 +-
crypto/external/bsd/openssl/dist/test/ectest.c | 84 +-
crypto/external/bsd/openssl/dist/test/rsa_test.c | 26 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S | 38 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha-armv8.S | 1 +
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305-armv8.S | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha1-armv8.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha512-armv8.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S | 38 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S | 1 +
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S | 2 +-
crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S | 4 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ADMISSIONS.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_INTEGER_get_int64.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_ITEM_lookup.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_OBJECT_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_TABLE_add.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_length.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_STRING_print_ex.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_TIME_set.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_TYPE_get.3 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASN1_generate_nconf.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASYNC_WAIT_CTX_new.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ASYNC_start_job.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BF_encrypt.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ADDR.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ADDRINFO.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_connect.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_ctrl.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_base64.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_buffer.3 | 26 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_cipher.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_md.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_null.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_f_ssl.3 | 44 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_find_type.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_get_data.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_get_ex_new_index.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_meth_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_new_CMS.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_parse_hostserv.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_printf.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_push.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_read.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_accept.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_bio.3 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_connect.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_fd.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_file.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_mem.3 | 55 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_null.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_s_socket.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_set_callback.3 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BIO_should_retry.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_BLINDING_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_CTX_start.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_add_word.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_bn2bin.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_cmp.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_copy.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_generate_prime.3 | 28 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_inverse.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_montgomery.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_mod_mul_reciprocal.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_new.3 | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_num_bytes.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_rand.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_security_bits.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_set_bit.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_swap.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BN_zero.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/BUF_MEM_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add0_cert.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_recipient_cert.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_add1_signer.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_compress.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_decrypt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_encrypt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_final.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_RecipientInfos.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_SignerInfos.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get0_type.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_sign_receipt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_uncompress.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CMS_verify_receipt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_free.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CONF_modules_load_file.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CRYPTO_THREAD_run_once.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CRYPTO_get_ex_new_index.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CTLOG_STORE_get0_log_by_id.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CTLOG_STORE_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CTLOG_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/CT_POLICY_EVAL_CTX_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DEFINE_STACK_OF.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DES_random_key.3 | 22 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_key.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_generate_parameters.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_get0_pqg.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_get_1024_160.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_meth_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_new_by_nid.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_set_method.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DH_size.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_SIG_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_do_sign.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_dup_DH.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_key.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_generate_parameters.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_get0_pqg.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_meth_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_set_method.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_sign.3 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DSA_size.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DTLS_get_data_mtu.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DTLS_set_timer_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/DTLSv1_listen.3 | 24 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ECDSA_SIG_new.3 | 35 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ECPKParameters_print.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_GFp_simple_method.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_GROUP_copy.3 | 96 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_GROUP_new.3 | 100 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_KEY_get_enc_flags.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_KEY_new.3 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_POINT_add.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EC_POINT_new.3 | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ENGINE_add.3 | 28 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_GET_LIB.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_clear_error.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_error_string.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_get_error.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_crypto_strings.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_load_strings.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_print_errors.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_put_error.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_remove_state.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ERR_set_mark.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_BytesToKey.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_CIPHER_CTX_get_cipher_data.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_CIPHER_meth_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestInit.3 | 101 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestSignInit.3 | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_DigestVerifyInit.3 | 24 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_EncodeInit.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_EncryptInit.3 | 42 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_MD_meth_new.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_OpenInit.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_ASN1_METHOD.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 | 26 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_new.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_set1_pbe_pass.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_set_hkdf_md.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_set_scrypt_N.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_CTX_set_tls1_prf_md.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_asn1_get_count.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_cmp.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_decrypt.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_derive.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_encrypt.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_get_default_digest_nid.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_keygen.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_meth_get_count.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_meth_new.3 | 38 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_new.3 | 40 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_print_private.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_sign.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_PKEY_verify_recover.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SealInit.3 | 17 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_SignInit.3 | 61 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_VerifyInit.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_aes.3 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_aria.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_bf_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_blake2b512.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_camellia.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_cast5_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_chacha20.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_des.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_desx_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_idea_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_md2.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_md4.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_md5.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_mdc2.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_rc2_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_rc4.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_rc5_32_12_16_cbc.3 | 31 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_ripemd160.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_seed_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_sha1.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_sha224.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_sha3_224.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_sm3.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_sm4_cbc.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/EVP_whirlpool.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/Ed25519.7 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/HMAC.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/MD5.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/MDC2_Init.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OBJ_nid2obj.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_REQUEST_new.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_cert_to_id.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_request_add1_nonce.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_resp_find_status.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_response_status.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OCSP_sendreq_new.3 | 19 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_Applink.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_LH_COMPFUNC.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_LH_stats.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_config.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_fork_prepare.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_ia32cap.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_init_crypto.3 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_init_ssl.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_instrument_bus.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_malloc.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OPENSSL_secure_malloc.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OSSL_STORE_INFO.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OSSL_STORE_LOADER.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OSSL_STORE_SEARCH.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OSSL_STORE_expect.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OSSL_STORE_open.3 | 39 +-
crypto/external/bsd/openssl/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_bytes_read_bio.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_read.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_read_CMS.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_read_bio_PrivateKey.3 | 24 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_read_bio_ex.3 | 8 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_create.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_newpass.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS12_parse.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS5_PBKDF2_HMAC.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_decrypt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_encrypt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_sign_add_signer.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/PKCS7_verify.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND.7 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_generate.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_get0_master.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_new.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_reseed.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_set_callbacks.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_DRBG_set_ex_data.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_add.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_bytes.3 | 32 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_cleanup.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_egd.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_load_file.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RAND_set_rand_method.3 | 19 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RC4_set_key.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RIPEMD160_Init.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA-PSS.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_blinding_on.3 | 13 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_check_key.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_generate_key.3 | 21 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_get0_key.3 | 13 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_meth_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_print.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_private_encrypt.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_public_encrypt.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_set_method.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/RSA_size.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SCT_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SCT_print.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SCT_validate.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SHA256_Init.3 | 11 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SM2.7 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_CMS.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_read_PKCS7.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_CMS.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SMIME_write_PKCS7.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CIPHER_get_name.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_COMP_add_compression_method.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_CTX_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_CTX_set1_prefix.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_CTX_set_flags.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_CTX_set_ssl_ctx.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_cmd.3 | 45 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CONF_cmd_argv.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add1_chain_cert.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_add_session.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_config.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_ctrl.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_dane_enable.3 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_flush_sessions.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_free.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get0_param.3 | 24 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_get_verify_mode.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_has_client_custom_ext.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_load_verify_locations.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_new.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_number.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3 | 63 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_sessions.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set0_CA_list.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set1_curves.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set1_sigalgs.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set1_verify_cert_store.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_alpn_select_cb.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_store.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_cipher_list.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_client_hello_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ct_validation_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ctlog_list_file.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ex_data.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_generate_session_id.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_info_callback.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_keylog_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_max_cert_list.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_min_proto_version.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_mode.3 | 28 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_msg_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_num_tickets.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_options.3 | 26 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_psk_client_callback.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_read_ahead.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_record_padding_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_security_level.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_id_context.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_session_ticket_cb.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_split_send_fragment.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_ssl_version.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_stateless_cookie_generate_cb.3 | 72 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_timeout.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tlsext_servername_callback.3 | 105 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tlsext_status_cb.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tlsext_ticket_key_cb.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tlsext_use_srtp.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_set_verify.3 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_certificate.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_psk_identity_hint.3 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_CTX_use_serverinfo.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_free.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get0_cipher.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get0_hostname.3 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get0_id_context.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get0_peer.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_compress_id.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_ex_data.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_protocol_version.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_get_time.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_has_ticket.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_is_resumable.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_print.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_SESSION_set1_id.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_accept.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_alert_type_string.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_alloc_buffers.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_check_chain.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_clear.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_connect.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_do_handshake.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_export_keying_material.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_extension_supported.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_free.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get0_peer_scts.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_SSL_CTX.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_all_async_fds.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_ciphers.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_client_random.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_current_cipher.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_default_timeout.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_error.3 | 33 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_extms_support.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_fd.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_cert_chain.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_certificate.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_signature_nid.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_peer_tmp_key.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_psk_identity.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_rbio.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_session.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_shared_sigalgs.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_verify_result.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_get_version.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_in_init.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_key_update.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_library_init.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_load_client_CA_file.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_new.3 | 73 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_pending.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_read.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_read_early_data.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_rstate_string.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_session_reused.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set1_host.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_bio.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_connect_state.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_fd.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_session.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_shutdown.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_set_verify_result.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_shutdown.3 | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_state_string.3 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_want.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/SSL_write.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/UI_STRING.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/UI_UTIL_read_pw.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/UI_create_method.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/UI_new.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X25519.7 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509V3_get_d2i.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_ALGOR_dup.3 | 23 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_CRL_get0_by_serial.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_EXTENSION_set_object.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_LOOKUP_hash_dir.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_LOOKUP_meth_new.3 | 31 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_get0_der.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_NAME_print_ex.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_PUBKEY_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_SIG_get0.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_get_error.3 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_new.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_add_cert.3 | 27 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_get0_param.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_new.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 | 27 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_check_ca.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_check_host.3 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_check_issued.3 | 25 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_check_private_key.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_cmp_time.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_digest.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_dup.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get0_notBefore.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get0_signature.3 | 28 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get0_uids.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get_extension_flags.3 | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get_pubkey.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get_serialNumber.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get_subject_name.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_get_version.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_new.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_sign.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509_verify_cert.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/X509v3_get_ext_by_NID.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/bio.7 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/crypto.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ct.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_DHparams.3 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_PrivateKey.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_SSL_SESSION.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/d2i_X509.3 | 48 +-
crypto/external/bsd/openssl/lib/libcrypto/man/des_modes.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/evp.7 | 22 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_CMS_bio_stream.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/i2d_re_X509_tbs.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/o2i_SCT_LIST.3 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_CA.pl.1 | 16 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_asn1parse.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ca.1 | 15 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ciphers.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_cms.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_config.5 | 36 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_crl2pkcs7.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dgst.1 | 19 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dhparam.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsa.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_dsaparam.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ec.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ecparam.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_enc.1 | 18 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_engine.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_errstr.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_gendsa.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genpkey.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_genrsa.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_list.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_nseq.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ocsp.1 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_passwd.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs12.1 | 13 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs7.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkcs8.1 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkey.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyparam.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_pkeyutl.1 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_prime.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rand.1 | 40 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rehash.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_req.1 | 13 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsa.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_rsautl.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_client.1 | 20 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_server.1 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_s_time.1 | 14 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_sess_id.1 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_smime.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_speed.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_spkac.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_srp.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_storeutl.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_ts.1 | 100 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_tsget.1 | 36 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_verify.1 | 29 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_version.1 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509.1 | 30 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ossl_store-file.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ossl_store.7 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/passphrase-encoding.7 | 10 +-
crypto/external/bsd/openssl/lib/libcrypto/man/scrypt.7 | 12 +-
crypto/external/bsd/openssl/lib/libcrypto/man/ssl.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/x509.7 | 6 +-
crypto/external/bsd/openssl/lib/libcrypto/man/x509v3_config.5 | 16 +-
574 files changed, 4117 insertions(+), 5037 deletions(-)
diffs (truncated from 23488 to 300 lines):
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/CHANGES
--- a/crypto/external/bsd/openssl/dist/CHANGES Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/CHANGES Thu Dec 10 00:33:08 2020 +0000
@@ -7,6 +7,69 @@
https://github.com/openssl/openssl/commits/ and pick the appropriate
release branch.
+ Changes between 1.1.1h and 1.1.1i [8 Dec 2020]
+
+ *) Fixed NULL pointer deref in the GENERAL_NAME_cmp function
+ This function could crash if both GENERAL_NAMEs contain an EDIPARTYNAME.
+ If an attacker can control both items being compared then this could lead
+ to a possible denial of service attack. OpenSSL itself uses the
+ GENERAL_NAME_cmp function for two purposes:
+ 1) Comparing CRL distribution point names between an available CRL and a
+ CRL distribution point embedded in an X509 certificate
+ 2) When verifying that a timestamp response token signer matches the
+ timestamp authority name (exposed via the API functions
+ TS_RESP_verify_response and TS_RESP_verify_token)
+ (CVE-2020-1971)
+ [Matt Caswell]
+
+ *) Add support for Apple Silicon M1 Macs with the darwin64-arm64-cc target.
+ [Stuart Carnie]
+
+ *) The security callback, which can be customised by application code, supports
+ the security operation SSL_SECOP_TMP_DH. This is defined to take an EVP_PKEY
+ in the "other" parameter. In most places this is what is passed. All these
+ places occur server side. However there was one client side call of this
+ security operation and it passed a DH object instead. This is incorrect
+ according to the definition of SSL_SECOP_TMP_DH, and is inconsistent with all
+ of the other locations. Therefore this client side call has been changed to
+ pass an EVP_PKEY instead.
+ [Matt Caswell]
+
+ *) In 1.1.1h, an expired trusted (root) certificate was not anymore rejected
+ when validating a certificate path. This check is restored in 1.1.1i.
+ [David von Oheimb]
+
+ Changes between 1.1.1g and 1.1.1h [22 Sep 2020]
+
+ *) Certificates with explicit curve parameters are now disallowed in
+ verification chains if the X509_V_FLAG_X509_STRICT flag is used.
+ [Tomas Mraz]
+
+ *) The 'MinProtocol' and 'MaxProtocol' configuration commands now silently
+ ignore TLS protocol version bounds when configuring DTLS-based contexts, and
+ conversely, silently ignore DTLS protocol version bounds when configuring
+ TLS-based contexts. The commands can be repeated to set bounds of both
+ types. The same applies with the corresponding "min_protocol" and
+ "max_protocol" command-line switches, in case some application uses both TLS
+ and DTLS.
+
+ SSL_CTX instances that are created for a fixed protocol version (e.g.
+ TLSv1_server_method()) also silently ignore version bounds. Previously
+ attempts to apply bounds to these protocol versions would result in an
+ error. Now only the "version-flexible" SSL_CTX instances are subject to
+ limits in configuration files in command-line options.
+ [Viktor Dukhovni]
+
+ *) Handshake now fails if Extended Master Secret extension is dropped
+ on renegotiation.
+ [Tomas Mraz]
+
+ *) Accidentally, an expired trusted (root) certificate is not anymore rejected
+ when validating a certificate path.
+ [David von Oheimb]
+
+ *) The Oracle Developer Studio compiler will start reporting deprecated APIs
+
Changes between 1.1.1f and 1.1.1g [21 Apr 2020]
*) Fixed segmentation fault in SSL_check_chain()
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/Configure
--- a/crypto/external/bsd/openssl/dist/Configure Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/Configure Thu Dec 10 00:33:08 2020 +0000
@@ -217,12 +217,22 @@
# Unified build supports separate build dir
my $srcdir = catdir(absolutedir(dirname($0))); # catdir ensures local syntax
my $blddir = catdir(absolutedir(".")); # catdir ensures local syntax
+
+# File::Spec::Unix doesn't detect case insensitivity, so we make sure to
+# check if the source and build directory are really the same, and make
+# them so. This avoids all kinds of confusion later on.
+# We must check @File::Spec::ISA rather than using File::Spec->isa() to
+# know if File::Spec ended up loading File::Spec::Unix.
+$srcdir = $blddir
+ if (grep(/::Unix$/, @File::Spec::ISA)
+ && samedir($srcdir, $blddir));
+
my $dofile = abs2rel(catfile($srcdir, "util/dofile.pl"));
my $local_config_envname = 'OPENSSL_LOCAL_CONFIG_DIR';
-$config{sourcedir} = abs2rel($srcdir);
-$config{builddir} = abs2rel($blddir);
+$config{sourcedir} = abs2rel($srcdir, $blddir);
+$config{builddir} = abs2rel($blddir, $blddir);
# Collect reconfiguration information if needed
my @argvcopy=@ARGV;
@@ -1049,6 +1059,9 @@
print "Using os-specific seed configuration\n";
push @seed_sources, 'os';
}
+if (scalar(grep { $_ eq 'egd' } @seed_sources) > 0) {
+ delete $disabled{'egd'};
+}
if (scalar(grep { $_ eq 'none' } @seed_sources) > 0) {
die "Cannot seed with none and anything else" if scalar(@seed_sources) > 1;
warn <<_____ if scalar(@seed_sources) == 1;
@@ -3424,6 +3437,27 @@
return realpath($dir);
}
+# Check if all paths are one and the same, using stat. They must both exist
+# We need this for the cases when File::Spec doesn't detect case insensitivity
+# (File::Spec::Unix assumes case sensitivity)
+sub samedir {
+ die "samedir expects two arguments\n" unless scalar @_ == 2;
+
+ my @stat0 = stat($_[0]); # First argument
+ my @stat1 = stat($_[1]); # Second argument
+
+ die "Couldn't stat $_[0]" unless @stat0;
+ die "Couldn't stat $_[1]" unless @stat1;
+
+ # Compare device number
+ return 0 unless ($stat0[0] == $stat1[0]);
+ # Compare "inode". The perl manual recommends comparing as
+ # string rather than as number.
+ return 0 unless ($stat0[1] eq $stat1[1]);
+
+ return 1; # All the same
+}
+
sub quotify {
my %processors = (
perl => sub { my $x = shift;
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/NEWS
--- a/crypto/external/bsd/openssl/dist/NEWS Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/NEWS Thu Dec 10 00:33:08 2020 +0000
@@ -5,6 +5,18 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
+ Major changes between OpenSSL 1.1.1h and OpenSSL 1.1.1i [8 Dec 2020]
+
+ o Fixed NULL pointer deref in GENERAL_NAME_cmp (CVE-2020-1971)
+
+ Major changes between OpenSSL 1.1.1g and OpenSSL 1.1.1h [22 Sep 2020]
+
+ o Disallow explicit curve parameters in verifications chains when
+ X509_V_FLAG_X509_STRICT is used
+ o Enable 'MinProtocol' and 'MaxProtocol' to configure both TLS and DTLS
+ contexts
+ o Oracle Developer Studio will start reporting deprecation warnings
+
Major changes between OpenSSL 1.1.1f and OpenSSL 1.1.1g [21 Apr 2020]
o Fixed segmentation fault in SSL_check_chain() (CVE-2020-1967)
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/README
--- a/crypto/external/bsd/openssl/dist/README Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/README Thu Dec 10 00:33:08 2020 +0000
@@ -1,5 +1,5 @@
- OpenSSL 1.1.1g 21 Apr 2020
+ OpenSSL 1.1.1i 8 Dec 2020
Copyright (c) 1998-2020 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/apps/ca.c
--- a/crypto/external/bsd/openssl/dist/apps/ca.c Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/ca.c Thu Dec 10 00:33:08 2020 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-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
@@ -1862,8 +1862,8 @@
row[DB_exp_date][tm->length] = '\0';
row[DB_rev_date] = NULL;
row[DB_file] = OPENSSL_strdup("unknown");
- if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
- (row[DB_file] == NULL) || (row[DB_name] == NULL)) {
+ if ((row[DB_type] == NULL) || (row[DB_file] == NULL)
+ || (row[DB_name] == NULL)) {
BIO_printf(bio_err, "Memory allocation failure\n");
goto end;
}
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/apps/s_client.c
--- a/crypto/external/bsd/openssl/dist/apps/s_client.c Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/s_client.c Thu Dec 10 00:33:08 2020 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
@@ -1283,22 +1283,42 @@
case OPT_SSL3:
min_version = SSL3_VERSION;
max_version = SSL3_VERSION;
+ socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+ isdtls = 0;
+#endif
break;
case OPT_TLS1_3:
min_version = TLS1_3_VERSION;
max_version = TLS1_3_VERSION;
+ socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+ isdtls = 0;
+#endif
break;
case OPT_TLS1_2:
min_version = TLS1_2_VERSION;
max_version = TLS1_2_VERSION;
+ socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+ isdtls = 0;
+#endif
break;
case OPT_TLS1_1:
min_version = TLS1_1_VERSION;
max_version = TLS1_1_VERSION;
+ socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+ isdtls = 0;
+#endif
break;
case OPT_TLS1:
min_version = TLS1_VERSION;
max_version = TLS1_VERSION;
+ socket_type = SOCK_STREAM;
+#ifndef OPENSSL_NO_DTLS
+ isdtls = 0;
+#endif
break;
case OPT_DTLS:
#ifndef OPENSSL_NO_DTLS
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl
--- a/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl Thu Dec 10 00:33:08 2020 +0000
@@ -108,7 +108,7 @@
$avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
`ml64 2>&1` =~ /Version ([0-9]+)\./ &&
$1>=10);
-$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/ && $2>=3.0);
+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/ && $2>=3.0);
$shaext=1; ### set to zero if compiling for 1.0.1
diff -r 102e775bab79 -r 47425b945e24 crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c Thu Dec 10 00:12:35 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c Thu Dec 10 00:33:08 2020 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -182,6 +182,15 @@
tag, aclass, opt, ctx);
case ASN1_ITYPE_MSTRING:
+ /*
+ * It never makes sense for multi-strings to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+ if (tag != -1) {
+ ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_BAD_TEMPLATE);
+ goto err;
+ }
+
p = *in;
/* Just read in tag and class */
ret = asn1_check_tlen(NULL, &otag, &oclass, NULL, NULL,
@@ -199,6 +208,7 @@
ASN1err(ASN1_F_ASN1_ITEM_EMBED_D2I, ASN1_R_MSTRING_NOT_UNIVERSAL);
goto err;
}
+
/* Check tag matches bit map */
if (!(ASN1_tag2bit(otag) & it->utype)) {
/* If OPTIONAL, assume this is OK */
@@ -215,6 +225,15 @@
return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);
case ASN1_ITYPE_CHOICE:
+ /*
+ * It never makes sense for CHOICE types to have implicit tagging, so
+ * if tag != -1, then this looks like an error in the template.
+ */
+ if (tag != -1) {
Home |
Main Index |
Thread Index |
Old Index