Module Name: src
Committed By: christos
Date: Wed Mar 2 01:52:36 UTC 2016
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Configure Makefile NEWS
README openssl.spec
src/crypto/external/bsd/openssl/dist/apps: s_server.c
src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h opensslv.h
src/crypto/external/bsd/openssl/dist/crypto/bn: bn.h bn_exp.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_sign.c
src/crypto/external/bsd/openssl/dist/crypto/threads: mttest.c
src/crypto/external/bsd/openssl/dist/ssl: Makefile s2_lib.c s3_lib.c
ssl_lib.c
src/crypto/external/bsd/openssl/dist/util: mk1mf.pl
src/crypto/external/bsd/openssl/lib/libcrypto: shlib_version
src/crypto/external/bsd/openssl/lib/libcrypto_rc5: shlib_version
src/crypto/external/bsd/openssl/lib/libdes: shlib_version
src/crypto/external/bsd/openssl/lib/libssl: shlib_version
Log Message:
merge conflicts, bump libraries to 11 for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.14 -r1.15 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h
cvs rdiff -u -r1.18 -r1.19 \
src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/crypto/bn/bn.h
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_exp.c
cvs rdiff -u -r1.4 -r1.5 \
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/rsa/rsa_sign.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/crypto/threads/mttest.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/Makefile \
src/crypto/external/bsd/openssl/dist/ssl/s2_lib.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/ssl_lib.c
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/util/mk1mf.pl
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto_rc5/shlib_version
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libdes/shlib_version
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libssl/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
