Module Name: src
Committed By: christos
Date: Thu Jan 23 02:54:57 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README
e_os.h
src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c openssl.c req.c
s_client.c speed.c
src/crypto/external/bsd/openssl/dist/crypto: threads_pthread.c uid.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: a_type.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bss_file.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lcl.h bn_lib.c
bn_rand.c
src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl
src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c
src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec_asn1.c ec_lcl.h
ec_lib.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_devcrypto.c
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c
src/crypto/external/bsd/openssl/dist/crypto/rand: rand_unix.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_err.c rsa_gen.c
rsa_lib.c
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/include/internal: refcount.h
tsan_assist.h
src/crypto/external/bsd/openssl/dist/ssl: s3_lib.c ssl_ciph.c ssl_lib.c
ssl_locl.h ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: bntest.c dhtest.c ectest.c
enginetest.c evp_extra_test.c evp_test.c
src/crypto/external/bsd/openssl/dist/test/testutil: driver.c
src/crypto/external/bsd/openssl/dist/util: mkdef.pl
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.map
src/crypto/external/bsd/openssl/lib/libssl: ssl.map
Removed Files:
src/crypto/external/bsd/openssl/dist/crypto/aes/asm: aes-586.pl
aes-x86_64.pl bsaes-x86_64.pl
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.24 -r1.25 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/e_os.h
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssl/dist/apps/ca.c \
src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssl/dist/apps/ocsp.c \
src/crypto/external/bsd/openssl/dist/apps/s_client.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/apps/openssl.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/req.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/crypto/uid.c
cvs rdiff -u -r1.1.1.6 -r0 \
src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-586.pl
cvs rdiff -u -r1.6 -r0 \
src/crypto/external/bsd/openssl/dist/crypto/aes/asm/aes-x86_64.pl
cvs rdiff -u -r1.1.1.7 -r0 \
src/crypto/external/bsd/openssl/dist/crypto/aes/asm/bsaes-x86_64.pl
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lcl.h
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_rand.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/bn/asm/mips.pl
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/dh/dh_lib.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/dso/dso_dlfcn.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/ec/ec_asn1.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lcl.h \
src/crypto/external/bsd/openssl/dist/crypto/ec/ec_lib.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_err.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_gen.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_lib.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/ui/ui_openssl.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/include/internal/refcount.h
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/include/internal/tsan_assist.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.18 -r1.19 \
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_lib.c
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.29 -r1.30 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/test/bntest.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/dhtest.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/test/ectest.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/test/enginetest.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c \
src/crypto/external/bsd/openssl/dist/test/evp_test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/driver.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/util/mkdef.pl
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.map
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libssl/ssl.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
