Module Name: src
Committed By: christos
Date: Thu Jul 9 14:31:02 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Makefile NEWS README
openssl.spec
src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h opensslv.h
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c
src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/ssl: s3_clnt.c s3_srvr.c
src/crypto/external/bsd/openssl/dist/test: Makefile testssl
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.7 -r1.8 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/test/testssl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
