Module Name: src
Committed By: christos
Date: Fri Apr 6 23:04:46 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Configure NEWS README
src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c openssl.c
s_client.c s_server.c s_time.c speed.c
src/crypto/external/bsd/openssl/dist/crypto: cryptlib.c mem.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: a_strex.c asn_mime.c
tasn_dec.c
src/crypto/external/bsd/openssl/dist/crypto/bio: 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
src/crypto/external/bsd/openssl/dist/crypto/bn/asm: x86_64-gcc.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/dsa: dsa_ameth.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ecp_smpl.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_cryptodev.c
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c evp_enc.c
m_sha1.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/ocsp: ocsp_vfy.c
src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c
src/crypto/external/bsd/openssl/dist/crypto/rand: md_rand.c rand_egd.c
rand_unix.c
src/crypto/external/bsd/openssl/dist/doc/apps: openssl.pod
src/crypto/external/bsd/openssl/dist/doc/crypto: EVP_EncryptInit.pod
d2i_X509.pod
src/crypto/external/bsd/openssl/dist/ssl: s3_lib.c ssl_ciph.c ssl_err.c
ssl_lib.c ssl_locl.h ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: bftest.c bntest.c dhtest.c
dsatest.c ectest.c exptest.c rsa_test.c
src/crypto/external/bsd/openssl/dist/util: mkdef.pl
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile libc-sha512.c
sha.inc
Removed Files:
src/crypto/external/bsd/openssl/dist/test/testlib/OpenSSL: Test.pm
src/crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test:
Simple.pm Utils.pm
src/crypto/external/bsd/openssl/dist/util: with_fallback.pm
src/crypto/external/bsd/openssl/dist/util/TLSProxy: ClientHello.pm
Message.pm NewSessionTicket.pm Proxy.pm Record.pm ServerHello.pm
ServerKeyExchange.pm
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.18 -r1.19 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/apps/ca.c \
src/crypto/external/bsd/openssl/dist/apps/s_client.c \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/apps/ocsp.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/openssl.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/apps/s_time.c
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/apps/speed.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/cryptlib.c \
src/crypto/external/bsd/openssl/dist/crypto/mem.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/a_strex.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/tasn_dec.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bss_file.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bss_log.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_mont.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-gcc.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/comp/c_zlib.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/dsa/dsa_ameth.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_cryptodev.c
cvs rdiff -u -r1.14 -r1.15 \
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/evp/evp_enc.c
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/lhash/lhash.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/ocsp/ocsp_vfy.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/pkcs7/pk7_doit.c
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/rand/rand_egd.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/rand/rand_unix.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/doc/apps/openssl.pod
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/doc/crypto/EVP_EncryptInit.pod \
src/crypto/external/bsd/openssl/dist/doc/crypto/d2i_X509.pod
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c \
src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/test/bftest.c \
src/crypto/external/bsd/openssl/dist/test/bntest.c \
src/crypto/external/bsd/openssl/dist/test/dhtest.c \
src/crypto/external/bsd/openssl/dist/test/dsatest.c \
src/crypto/external/bsd/openssl/dist/test/ectest.c \
src/crypto/external/bsd/openssl/dist/test/exptest.c \
src/crypto/external/bsd/openssl/dist/test/rsa_test.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test.pm
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test/Simple.pm \
src/crypto/external/bsd/openssl/dist/test/testlib/OpenSSL/Test/Utils.pm
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/util/mkdef.pl
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssl/dist/util/with_fallback.pm
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/ClientHello.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/Message.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/NewSessionTicket.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/Proxy.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/Record.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/ServerHello.pm \
src/crypto/external/bsd/openssl/dist/util/TLSProxy/ServerKeyExchange.pm
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/sha.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
