Module Name: src
Committed By: christos
Date: Tue May 3 17:21:32 UTC 2016
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Makefile NEWS README
openssl.spec
src/crypto/external/bsd/openssl/dist/crypto: opensslv.h
src/crypto/external/bsd/openssl/dist/crypto/asn1: a_d2i_fp.c a_type.c
tasn_dec.c tasn_enc.c
src/crypto/external/bsd/openssl/dist/crypto/evp: Makefile evp_enc.c
src/crypto/external/bsd/openssl/dist/ssl: d1_both.c s2_lib.c s3_clnt.c
s3_lib.c ssl.h ssl_ciph.c ssl_locl.h t1_lib.c
src/crypto/external/bsd/openssl/dist/util: mk1mf.pl mkdef.pl ssleay.num
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/CHANGES \
src/crypto/external/bsd/openssl/dist/NEWS \
src/crypto/external/bsd/openssl/dist/README \
src/crypto/external/bsd/openssl/dist/openssl.spec
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/a_d2i_fp.c \
src/crypto/external/bsd/openssl/dist/crypto/asn1/a_type.c
cvs rdiff -u -r1.4 -r1.5 \
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.5 -r1.6 \
src/crypto/external/bsd/openssl/dist/crypto/evp/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/evp/evp_enc.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/ssl/d1_both.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/ssl/s2_lib.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c \
src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/ssl.h
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/util/mk1mf.pl
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/util/mkdef.pl \
src/crypto/external/bsd/openssl/dist/util/ssleay.num
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
