Module Name: src Committed By: spz Date: Sun Aug 10 08:07:50 UTC 2014
Modified Files: src/crypto/external/bsd/openssl/dist: Configure Makefile src/crypto/external/bsd/openssl/dist/apps: ca.c ocsp.c s_client.c s_server.c src/crypto/external/bsd/openssl/dist/crypto: opensslconf.h opensslv.h ppccap.c ppccpuid.pl src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_mime.c tasn_enc.c src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c src/crypto/external/bsd/openssl/dist/crypto/ec: ecp_smpl.c ectest.c src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c src/crypto/external/bsd/openssl/dist/crypto/idea: ideatest.c src/crypto/external/bsd/openssl/dist/crypto/pkcs7: bio_ber.c dec.c des.pem doc enc.c es1.pem example.c example.h info.pem infokey.pem server.pem sign.c verify.c src/crypto/external/bsd/openssl/dist/crypto/pkcs7/p7: a1 a2 src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t: 3des.pem 3dess.pem c.pem ff msie-e msie-e.pem msie-enc-01 msie-enc-01.pem msie-enc-02 msie-enc-02.pem msie-s-a-e msie-s-a-e.pem nav-smime s.pem server.pem src/crypto/external/bsd/openssl/dist/crypto/rand: md_rand.c randfile.c src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_eay.c src/crypto/external/bsd/openssl/dist/demos/eay: Makefile base64.c conn.c loadrsa.c src/crypto/external/bsd/openssl/dist/demos/maurice: Makefile README cert.pem example1.c example2.c example3.c example4.c loadkeys.c loadkeys.h privkey.pem src/crypto/external/bsd/openssl/dist/doc/ssl: SSL_CTX_set_client_CA_list.pod src/crypto/external/bsd/openssl/dist/ssl: d1_srvr.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c ssl.h ssl_ciph.c ssl_err.c ssl_locl.h t1_enc.c t1_lib.c tls_srp.c src/crypto/external/bsd/openssl/lib/libcrypto: shlib_version src/crypto/external/bsd/openssl/lib/libssl: shlib_version ssl.inc src/distrib/sets/lists/base: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.arm ad.mips ad.powerpc md.amd64 md.sparc64 shl.mi Added Files: src/crypto/external/bsd/openssl/dist/test: heartbeat_test.c Removed Files: src/crypto/external/bsd/openssl/lib/libssl: ssl.diff Log Message: merge openssl 1.0.1i To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/Configure cvs rdiff -u -r1.1.1.7 -r1.2 src/crypto/external/bsd/openssl/dist/Makefile cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/apps/ca.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/apps/ocsp.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.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/opensslconf.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/dist/crypto/opensslv.h cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/crypto/ppccap.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/ppccpuid.pl cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c cvs rdiff -u -r1.1.1.2 -r1.2 \ 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/bn/bn_exp.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/cms/cms_pwri.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c cvs rdiff -u -r1.1.1.4 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ecp_smpl.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/crypto/ec/ectest.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/dist/crypto/evp/e_aes.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/idea/ideatest.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/bio_ber.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/dec.c \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/des.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/doc \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/enc.c \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/es1.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/example.c \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/example.h \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/info.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/infokey.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/server.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/sign.c \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/verify.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a1 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/p7/a2 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3des.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/3dess.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/c.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/ff \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-e \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-e.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-enc-01 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-enc-01.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-enc-02 \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-enc-02.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-s-a-e \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/msie-s-a-e.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/nav-smime \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/s.pem \ src/crypto/external/bsd/openssl/dist/crypto/pkcs7/t/server.pem cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/openssl/dist/crypto/rand/md_rand.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/rand/randfile.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/dist/crypto/rsa/rsa_eay.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/demos/eay/Makefile \ src/crypto/external/bsd/openssl/dist/demos/eay/base64.c \ src/crypto/external/bsd/openssl/dist/demos/eay/conn.c \ src/crypto/external/bsd/openssl/dist/demos/eay/loadrsa.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssl/dist/demos/maurice/Makefile \ src/crypto/external/bsd/openssl/dist/demos/maurice/README \ src/crypto/external/bsd/openssl/dist/demos/maurice/cert.pem \ src/crypto/external/bsd/openssl/dist/demos/maurice/example1.c \ src/crypto/external/bsd/openssl/dist/demos/maurice/example2.c \ src/crypto/external/bsd/openssl/dist/demos/maurice/example3.c \ src/crypto/external/bsd/openssl/dist/demos/maurice/example4.c \ src/crypto/external/bsd/openssl/dist/demos/maurice/loadkeys.c \ src/crypto/external/bsd/openssl/dist/demos/maurice/loadkeys.h \ src/crypto/external/bsd/openssl/dist/demos/maurice/privkey.pem cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/dist/doc/ssl/SSL_CTX_set_client_CA_list.pod cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/ssl/d1_srvr.c \ src/crypto/external/bsd/openssl/dist/ssl/s3_enc.c \ src/crypto/external/bsd/openssl/dist/ssl/ssl_err.c cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/openssl/dist/ssl/s3_clnt.c \ src/crypto/external/bsd/openssl/dist/ssl/t1_enc.c cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/dist/ssl/s3_lib.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssl/dist/ssl/s3_pkt.c \ src/crypto/external/bsd/openssl/dist/ssl/s3_srvr.c cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssl/dist/ssl/ssl.h \ src/crypto/external/bsd/openssl/dist/ssl/ssl_locl.h cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/ssl/ssl_ciph.c cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c cvs rdiff -u -r1.1.1.4 -r1.2 \ src/crypto/external/bsd/openssl/dist/ssl/tls_srp.c cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssl/dist/test/heartbeat_test.c cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libssl/shlib_version cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/openssl/lib/libssl/ssl.diff cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/lib/libssl/ssl.inc cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.243 -r1.244 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.231 -r1.232 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.711 -r1.712 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.