Module Name: src Committed By: christos Date: Sat Jan 11 18:34:37 UTC 2014
Modified Files: src/crypto/external/bsd/openssl/dist: Configure src/crypto/external/bsd/openssl/dist/crypto: opensslv.h src/crypto/external/bsd/openssl/dist/crypto/buffer: buffer.c src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c src/crypto/external/bsd/openssl/dist/crypto/rand: md_rand.c src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c src/crypto/external/bsd/openssl/dist/doc/ssl: SSL_CTX_set_client_CA_list.pod SSL_accept.pod SSL_do_handshake.pod SSL_shutdown.pod src/crypto/external/bsd/openssl/dist/ssl: d1_pkt.c d1_srvr.c s23_clnt.c s3_clnt.c s3_lib.c s3_pkt.c s3_srvr.c ssl.h ssl3.h ssl_locl.h ssltest.c t1_enc.c t1_lib.c src/crypto/external/bsd/openssl/lib/libcrypto: shlib_version src/crypto/external/bsd/openssl/lib/libdes: shlib_version src/crypto/external/bsd/openssl/lib/libssl: shlib_version Removed Files: src/crypto/external/bsd/openssl/dist/test: test_aesni Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/dist/crypto/opensslv.h cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/buffer/buffer.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c cvs rdiff -u -r1.5 -r1.6 \ 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/x509/x509_vfy.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_client_CA_list.pod \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_accept.pod \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_do_handshake.pod \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_shutdown.pod cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/d1_pkt.c \ src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h \ src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/ssl/d1_srvr.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/ssl/s23_clnt.c \ src/crypto/external/bsd/openssl/dist/ssl/ssl.h \ src/crypto/external/bsd/openssl/dist/ssl/ssl3.h cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c \ src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/ssl/ssltest.c cvs rdiff -u -r1.3 -r0 src/crypto/external/bsd/openssl/dist/test/test_aesni cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libdes/shlib_version cvs rdiff -u -r1.7 -r1.8 \ 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.