Module Name: src Committed By: christos Date: Sun Mar 22 00:53:13 UTC 2020
Modified Files: src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README e_os.h src/crypto/external/bsd/openssl/dist/apps: ocsp.c openssl.c req.c s_client.c s_server.c s_time.c speed.c src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h armcap.c cryptlib.c ex_data.c mem.c ppccap.c ppccpuid.pl sparccpuid.S x86_64cpuid.pl src/crypto/external/bsd/openssl/dist/crypto/aes/asm: aesni-sha1-x86_64.pl aesni-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/asn1: a_d2i_fp.c a_strex.c a_type.c asn_mime.c tasn_dec.c tasn_enc.c src/crypto/external/bsd/openssl/dist/crypto/bio: b_sock.c bio_lib.c bss_file.c bss_log.c src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c bn_mont.c bn_nist.c bn_rand.c src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl x86_64-gcc.c x86_64-gf2m.pl src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c src/crypto/external/bsd/openssl/dist/crypto/comp: c_zlib.c src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c dsa_lib.c src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c ec_asn1.c ec_key.c ec_lib.c ecp_mont.c ecp_nist.c ecp_smpl.c src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c eng_devcrypto.c eng_lib.c src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c evp_enc.c m_sha1.c src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac.c src/crypto/external/bsd/openssl/dist/crypto/idea: i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c src/crypto/external/bsd/openssl/dist/crypto/md4: md4_dgst.c src/crypto/external/bsd/openssl/dist/crypto/md5: md5_dgst.c src/crypto/external/bsd/openssl/dist/crypto/md5/asm: md5-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c src/crypto/external/bsd/openssl/dist/crypto/objects: o_names.c src/crypto/external/bsd/openssl/dist/crypto/ocsp: ocsp_vfy.c src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_lib.c src/crypto/external/bsd/openssl/dist/crypto/rand: rand_unix.c src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2_cbc.c rc2_ecb.c rc2_local.h rc2cfb64.c rc2ofb64.c src/crypto/external/bsd/openssl/dist/crypto/rc4/asm: rc4-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/rc5: rc5_ecb.c rc5_enc.c rc5cfb64.c rc5ofb64.c src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmd_dgst.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_gen.c rsa_lib.c rsa_oaep.c rsa_pk1.c rsa_sign.c src/crypto/external/bsd/openssl/dist/crypto/sha: sha256.c src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.c ui_openssl.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/crypto/x509v3: v3_addr.c src/crypto/external/bsd/openssl/dist/include/internal: refcount.h src/crypto/external/bsd/openssl/dist/include/openssl: safestack.h src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c d1_srtp.c s3_cbc.c s3_enc.c s3_lib.c ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c t1_enc.c t1_lib.c tls_srp.c src/crypto/external/bsd/openssl/dist/test: bntest.c constant_time_test.c ectest.c evp_extra_test.c hmactest.c src/crypto/external/bsd/openssl/dist/test/testutil: format_output.c main.c output.h tap_bio.c tests.c src/crypto/external/bsd/openssl/lib/libcrypto: crypto.map libc-sha2xx.c src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: armv8-mont.S chacha-armv8.S ecp_nistz256-armv8.S keccak1600-armv8.S poly1305-armv8.S sha512-armv8.S vpaes-armv8.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S armv8-mont.S bsaes-armv7.S chacha-armv8.S ecp_nistz256-armv4.S ecp_nistz256-armv8.S keccak1600-armv4.S keccak1600-armv8.S poly1305-armv8.S sha256-armv4.S sha512-armv4.S sha512-armv8.S vpaes-armv8.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ecp_nistz256-x86.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: mips.S mips64.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: aesp8-ppc.S ppc.S ppccpuid.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: aesp8-ppc.S ppc.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: des_enc-sparc.S ecp_nistz256-sparcv9.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: des_enc-sparc.S ecp_nistz256-sparcv9.S src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: aesni-gcm-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S aesni-x86_64.S cmll-x86_64.S ecp_nistz256-x86_64.S keccak1600-x86_64.S poly1305-x86_64.S rc4-x86_64.S rsaz-x86_64.S sha1-x86_64.S sha512-x86_64.S x25519-x86_64.S x86_64-mont5.S x86_64cpuid.S src/crypto/external/bsd/openssl/lib/libcryptotest: Makefile Added Files: src/crypto/external/bsd/openssl/include/crypto: bn_conf.h dso_conf.h Removed Files: src/crypto/external/bsd/openssl/dist/crypto/aes: aes_locl.h src/crypto/external/bsd/openssl/dist/crypto/asn1: asn1_locl.h src/crypto/external/bsd/openssl/dist/crypto/async: async_locl.h src/crypto/external/bsd/openssl/dist/crypto/bf: bf_locl.h src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lcl.h src/crypto/external/bsd/openssl/dist/crypto/blake2: blake2_locl.h src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lcl.h src/crypto/external/bsd/openssl/dist/crypto/camellia: cmll_locl.h src/crypto/external/bsd/openssl/dist/crypto/cast: cast_lcl.h src/crypto/external/bsd/openssl/dist/crypto/cms: cms_lcl.h src/crypto/external/bsd/openssl/dist/crypto/comp: comp_lcl.h src/crypto/external/bsd/openssl/dist/crypto/conf: conf_lcl.h src/crypto/external/bsd/openssl/dist/crypto/ct: ct_locl.h src/crypto/external/bsd/openssl/dist/crypto/des: des_locl.h src/crypto/external/bsd/openssl/dist/crypto/dh: dh_locl.h src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_locl.h src/crypto/external/bsd/openssl/dist/crypto/dso: dso_locl.h src/crypto/external/bsd/openssl/dist/crypto/ec: ec_lcl.h src/crypto/external/bsd/openssl/dist/crypto/ec/curve448: curve448_lcl.h src/crypto/external/bsd/openssl/dist/crypto/engine: eng_int.h src/crypto/external/bsd/openssl/dist/crypto/evp: evp_locl.h src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac_lcl.h src/crypto/external/bsd/openssl/dist/crypto/idea: idea_lcl.h src/crypto/external/bsd/openssl/dist/crypto/include/internal: __DECC_INCLUDE_EPILOGUE.H __DECC_INCLUDE_PROLOGUE.H aria.h asn1_int.h async.h bn_conf.h.in bn_dh.h bn_int.h bn_srp.h chacha.h cryptlib_int.h ctype.h dso_conf.h.in ec_int.h engine.h err_int.h evp_int.h lhash.h md32_common.h objects.h poly1305.h rand_int.h sha.h siphash.h sm2.h sm2err.h sm3.h sm4.h store.h store_int.h x509_int.h src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash_lcl.h src/crypto/external/bsd/openssl/dist/crypto/md4: md4_locl.h src/crypto/external/bsd/openssl/dist/crypto/md5: md5_locl.h src/crypto/external/bsd/openssl/dist/crypto/modes: modes_lcl.h src/crypto/external/bsd/openssl/dist/crypto/objects: obj_lcl.h src/crypto/external/bsd/openssl/dist/crypto/ocsp: ocsp_lcl.h src/crypto/external/bsd/openssl/dist/crypto/pkcs12: p12_lcl.h src/crypto/external/bsd/openssl/dist/crypto/rand: rand_lcl.h src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2_locl.h src/crypto/external/bsd/openssl/dist/crypto/rc4: rc4_locl.h src/crypto/external/bsd/openssl/dist/crypto/rc5: rc5_locl.h src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmd_locl.h src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_locl.h src/crypto/external/bsd/openssl/dist/crypto/seed: seed_locl.h src/crypto/external/bsd/openssl/dist/crypto/sha: sha_locl.h src/crypto/external/bsd/openssl/dist/crypto/sm3: sm3_locl.h src/crypto/external/bsd/openssl/dist/crypto/store: store_locl.h src/crypto/external/bsd/openssl/dist/crypto/ts: ts_lcl.h src/crypto/external/bsd/openssl/dist/crypto/ui: ui_locl.h src/crypto/external/bsd/openssl/dist/crypto/whrlpool: wp_locl.h src/crypto/external/bsd/openssl/dist/crypto/x509: x509_lcl.h src/crypto/external/bsd/openssl/dist/crypto/x509v3: pcy_int.h src/crypto/external/bsd/openssl/dist/doc/HOWTO: proxy_certificates.txt src/crypto/external/bsd/openssl/dist/include/internal: constant_time_locl.h src/crypto/external/bsd/openssl/dist/ssl: packet_locl.h ssl_locl.h src/crypto/external/bsd/openssl/dist/ssl/record: record_locl.h src/crypto/external/bsd/openssl/dist/ssl/statem: statem_locl.h src/crypto/external/bsd/openssl/dist/test/testutil: init.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssl/dist/CHANGES \ src/crypto/external/bsd/openssl/dist/NEWS \ src/crypto/external/bsd/openssl/dist/README cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/e_os.h cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \ src/crypto/external/bsd/openssl/dist/apps/s_client.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/apps/openssl.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/req.c cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/openssl/dist/apps/s_server.c \ src/crypto/external/bsd/openssl/dist/apps/speed.c cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/apps/s_time.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/arm_arch.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/armcap.c cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/ex_data.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/crypto/mem.c \ src/crypto/external/bsd/openssl/dist/crypto/ppccap.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl \ src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S \ src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl cvs rdiff -u -r1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/aes/aes_locl.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-sha1-x86_64.pl cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86_64.pl cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c cvs rdiff -u -r1.1.1.6 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn1_locl.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c \ src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_enc.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/async/async_locl.h cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/bf/bf_locl.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/bio/b_sock.c \ src/crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lcl.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/blake2/blake2_locl.h cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c cvs rdiff -u -r1.9 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gf2m.pl cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/camellia/cmll_locl.h cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/cast/cast_lcl.h cvs rdiff -u -r1.1.1.9 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/cms/cms_lcl.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/comp/comp_lcl.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/conf/conf_lcl.h cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ct/ct_locl.h cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/des/des_locl.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/dh/dh_lib.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/dh/dh_locl.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_lib.c cvs rdiff -u -r1.1.1.6 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_locl.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/dso/dso_locl.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec2_smpl.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_ameth.c \ src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_key.c cvs rdiff -u -r1.7 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_mont.c \ src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_nist.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ec/curve448/curve448_lcl.h cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_all.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/engine/eng_int.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/err/openssl.ec cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c cvs rdiff -u -r1.1.1.8 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/evp/evp_locl.h cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/hmac/hmac.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/hmac/hmac_lcl.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/idea/i_cbc.c \ src/crypto/external/bsd/openssl/dist/crypto/idea/i_cfb64.c \ src/crypto/external/bsd/openssl/dist/crypto/idea/i_ofb64.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/idea/i_ecb.c cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/idea/i_skey.c cvs rdiff -u -r1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/idea/idea_lcl.h cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/__DECC_INCLUDE_EPILOGUE.H \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/__DECC_INCLUDE_PROLOGUE.H \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/async.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/bn_dh.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/chacha.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/ctype.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/ec_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/engine.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/err_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/md32_common.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/poly1305.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/sm2err.h cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/aria.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/bn_conf.h.in \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/bn_srp.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/lhash.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/objects.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/sha.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/siphash.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/sm2.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/sm3.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/sm4.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/store.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/store_int.h cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/asn1_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/cryptlib_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/dso_conf.h.in \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/evp_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/rand_int.h \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/x509_int.h cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/include/internal/bn_int.h cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash_lcl.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/md4/md4_dgst.c cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/md4/md4_locl.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/md5/md5_dgst.c cvs rdiff -u -r1.7 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/md5/md5_locl.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/md5/asm/md5-x86_64.pl cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/modes/gcm128.c cvs rdiff -u -r1.1.1.7 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/modes/modes_lcl.h cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/objects/o_names.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/objects/obj_lcl.h cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_lcl.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs12/p12_lcl.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_lib.c cvs rdiff -u -r1.1.1.7 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/rand/rand_lcl.h cvs rdiff -u -r1.14 -r1.15 \ src/crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2_cbc.c \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2cfb64.c \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2ofb64.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2_ecb.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2_local.h cvs rdiff -u -r1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/rc2/rc2_locl.h cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/rc4/rc4_locl.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/rc4/asm/rc4-x86_64.pl cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5_ecb.c \ src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5_enc.c \ src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5cfb64.c \ src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5ofb64.c cvs rdiff -u -r1.6 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/rc5/rc5_locl.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_dgst.c cvs rdiff -u -r1.6 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ripemd/rmd_locl.h cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_gen.c cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_locl.h cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_oaep.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_pk1.c \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_sign.c cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/seed/seed_locl.h cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/sha/sha256.c cvs rdiff -u -r1.7 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/sha/sha_locl.h cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/sm3/sm3_locl.h cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/store/store_locl.h cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ts/ts_lcl.h cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/ui/ui_locl.h cvs rdiff -u -r1.15 -r1.16 \ src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/whrlpool/wp_locl.h cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_lcl.h cvs rdiff -u -r1.17 -r1.18 \ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/crypto/x509v3/pcy_int.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/x509v3/v3_addr.c cvs rdiff -u -r1.1.1.7 -r0 \ src/crypto/external/bsd/openssl/dist/doc/HOWTO/proxy_certificates.txt cvs rdiff -u -r1.1.1.4 -r0 \ src/crypto/external/bsd/openssl/dist/include/internal/constant_time_locl.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/include/internal/refcount.h cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/include/openssl/safestack.h cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/ssl/d1_lib.c \ src/crypto/external/bsd/openssl/dist/ssl/s3_cbc.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/d1_srtp.c \ src/crypto/external/bsd/openssl/dist/ssl/tls_srp.c cvs rdiff -u -r1.1.1.2 -r0 \ src/crypto/external/bsd/openssl/dist/ssl/packet_locl.h cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c cvs rdiff -u -r1.19 -r1.20 \ src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c cvs rdiff -u -r1.23 -r0 src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c cvs rdiff -u -r1.1.1.3 -r0 \ src/crypto/external/bsd/openssl/dist/ssl/record/record_locl.h cvs rdiff -u -r1.1.1.5 -r0 \ src/crypto/external/bsd/openssl/dist/ssl/statem/statem_locl.h cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/test/bntest.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/test/constant_time_test.c \ src/crypto/external/bsd/openssl/dist/test/hmactest.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/ectest.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c \ src/crypto/external/bsd/openssl/dist/test/testutil/main.c \ src/crypto/external/bsd/openssl/dist/test/testutil/tests.c cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssl/dist/test/testutil/init.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/test/testutil/output.h \ src/crypto/external/bsd/openssl/dist/test/testutil/tap_bio.c cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssl/include/crypto/bn_conf.h \ src/crypto/external/bsd/openssl/include/crypto/dso_conf.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha2xx.c cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/armv8-mont.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/keccak1600-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305-armv8.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ecp_nistz256-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha512-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/vpaes-armv8.S cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ecp_nistz256-x86.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips.S cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/mips64.S cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/aesp8-ppc.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppc.S cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/aesp8-ppc.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ppc.S cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/des_enc-sparc.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ecp_nistz256-sparcv9.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/des_enc-sparc.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ecp_nistz256-sparcv9.S cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-gcm-x86_64.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha256-x86_64.S cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S cvs rdiff -u -r1.10 -r1.11 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ecp_nistz256-x86_64.S cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/keccak1600-x86_64.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x25519-x86_64.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/poly1305-x86_64.S cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rsaz-x86_64.S cvs rdiff -u -r1.13 -r1.14 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/lib/libcryptotest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.