-
由 h00416433 提交于
Conflicts: CHANGES CONTRIBUTING Configurations/50-win-onecore.conf Configurations/90-team.norelease.conf Configurations/unix-Makefile.tmpl Configure NEWS NOTES.ANDROID README apps/rehash.c apps/s_cb.c apps/s_server.c apps/speed.c config crypto/aes/asm/aes-s390x.pl crypto/aes/asm/aesni-x86_64.pl crypto/aes/asm/aesp8-ppc.pl crypto/aes/asm/aesv8-armx.pl crypto/aes/asm/vpaes-armv8.pl crypto/aes/asm/vpaes-x86_64.pl crypto/asn1/charmap.h crypto/asn1/x_bignum.c crypto/bio/b_addr.c crypto/bio/bss_file.c crypto/bn/asm/armv8-mont.pl crypto/bn/asm/mips.pl crypto/bn/asm/ppc.pl crypto/bn/asm/rsaz-avx2.pl crypto/bn/asm/rsaz-x86_64.pl crypto/bn/asm/x86_64-mont5.pl crypto/bn/bn_local.h crypto/bn/bn_prime.c crypto/bn/bn_prime.h crypto/chacha/asm/chacha-armv8.pl crypto/cms/cms_att.c crypto/conf/conf_def.h crypto/conf/conf_lib.c crypto/dh/dh_gen.c crypto/dso/dso_dlfcn.c crypto/ec/asm/ecp_nistz256-armv8.pl crypto/ec/asm/ecp_nistz256-sparcv9.pl crypto/ec/asm/ecp_nistz256-x86_64.pl crypto/ec/asm/x25519-ppc64.pl crypto/ec/ec_asn1.c crypto/ec/ec_local.h crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c crypto/ec/ecp_nistz256.c crypto/ec/ecx_meth.c crypto/engine/eng_openssl.c crypto/err/err.c crypto/err/openssl.txt crypto/evp/e_aes.c crypto/evp/evp_err.c crypto/hmac/hmac.c crypto/modes/asm/ghash-x86_64.pl crypto/objects/obj_dat.h crypto/objects/obj_xref.h crypto/perlasm/x86_64-xlate.pl crypto/poly1305/asm/poly1305-armv8.pl crypto/ppccpuid.pl crypto/rand/drbg_lib.c crypto/rand/rand_err.c crypto/rand/rand_lib.c crypto/rand/rand_local.h crypto/rand/rand_unix.c crypto/rand/rand_vms.c crypto/rsa/rsa_ossl.c crypto/rsa/rsa_pk1.c crypto/rsa/rsa_pmeth.c crypto/rsa/rsa_ssl.c crypto/sha/asm/keccak1600-armv4.pl crypto/sha/asm/keccak1600-armv8.pl crypto/sha/asm/sha512-armv8.pl crypto/sha/asm/sha512-sparcv9.pl crypto/threads_none.c crypto/threads_win.c crypto/x509/x509_cmp.c crypto/x509/x509_vfy.c crypto/x509/x_crl.c crypto/x509v3/v3_purp.c doc/HOWTO/proxy_certificates.txt doc/man1/enc.pod doc/man1/s_client.pod doc/man1/x509.pod doc/man3/BN_generate_prime.pod doc/man3/CRYPTO_memcmp.pod doc/man3/EC_GROUP_copy.pod doc/man3/EVP_DigestSignInit.pod doc/man3/EVP_DigestVerifyInit.pod doc/man3/EVP_PKEY_new.pod doc/man3/EVP_SignInit.pod doc/man3/OPENSSL_malloc.pod doc/man3/RAND_bytes.pod doc/man3/RAND_set_rand_method.pod doc/man3/RSA_get0_key.pod doc/man3/SSL_SESSION_get0_hostname.pod doc/man3/SSL_get_error.pod doc/man3/X509_LOOKUP_meth_new.pod doc/man3/X509_STORE_add_cert.pod doc/man3/X509_cmp.pod doc/man3/X509_get_extension_flags.pod doc/man3/d2i_X509.pod doc/man5/config.pod doc/man7/Ed25519.pod doc/man7/X25519.pod e_os.h engines/e_afalg.c include/crypto/dso_conf.h.in include/internal/constant_time.h include/openssl/bio.h include/openssl/evperr.h include/openssl/lhash.h include/openssl/obj_mac.h include/openssl/opensslv.h include/openssl/randerr.h include/openssl/sslerr.h krb5 ssl/record/rec_layer_s3.c ssl/s3_lib.c ssl/ssl_lib.c ssl/ssl_local.h ssl/statem/extensions.c ssl/statem/extensions_srvr.c ssl/statem/statem_lib.c ssl/statem/statem_srvr.c ssl/t1_lib.c ssl/tls13_enc.c test/bio_memleak_test.c test/bntest.c test/build.info test/certs/root-cert-rsa2.pem test/certs/server-pss-restrict-cert.pem test/certs/server-pss-restrict-key.pem test/certs/setup.sh test/dtlstest.c test/ec_internal_test.c test/ecdsatest.h test/ectest.c test/evp_extra_test.c test/recipes/02-test_errstr.t test/recipes/03-test_internal_ec.t test/recipes/30-test_evp_data/evpccmcavs.txt test/recipes/80-test_cms_data/bad_signtime_attr.cms test/recipes/80-test_cms_data/ct_multiple_attr.cms test/recipes/80-test_cms_data/no_ct_attr.cms test/recipes/80-test_cms_data/no_md_attr.cms test/recipes/90-test_bio_memleak.t test/recipes/90-test_includes_data/includes-eq-ws.cnf test/recipes/90-test_includes_data/includes-eq.cnf test/shlibloadtest.c test/ssl-tests/29-dtls-sctp-label-bug.conf test/ssl-tests/29-dtls-sctp-label-bug.conf.in test/sslapitest.c test/testutil.h test/testutil/random.c util/cavs-to-evptest.pl util/libcrypto.num util/perl/OpenSSL/Test.pm util/perl/TLSProxy/CertificateRequest.pm Change-Id: I388e77b9fc937720aaf18841949f5f954ef2131b
ab643991