Soren Jacobsen
2014-10-19 20:11:09 UTC
Module Name: src
Committed By: snj
Date: Sun Oct 19 20:11:09 UTC 2014
Modified Files:
src/crypto/dist/openssl/apps [netbsd-5-2]: s_client.c
src/crypto/dist/openssl/crypto [netbsd-5-2]: LPdir_vms.c LPdir_win.c
Makefile
src/crypto/dist/openssl/crypto/bn [netbsd-5-2]: bn_exp.c exptest.c
src/crypto/dist/openssl/crypto/bn/asm [netbsd-5-2]: x86_64-gcc.c
src/crypto/dist/openssl/crypto/dsa [netbsd-5-2]: dsa_ameth.c
src/crypto/dist/openssl/crypto/ec [netbsd-5-2]: ec.h ec_ameth.c
ec_asn1.c ec_key.c ecp_smpl.c
src/crypto/dist/openssl/crypto/err [netbsd-5-2]: openssl.ec
src/crypto/dist/openssl/crypto/evp [netbsd-5-2]: Makefile evp_enc.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-2]: pkcs7.h
src/crypto/dist/openssl/crypto/rsa [netbsd-5-2]: Makefile rsa.h
rsa_err.c rsa_oaep.c rsa_pk1.c rsa_sign.c
src/crypto/dist/openssl/doc/apps [netbsd-5-2]: s_client.pod
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: BIO_s_accept.pod
EVP_DigestInit.pod EVP_DigestVerifyInit.pod EVP_EncryptInit.pod
EVP_PKEY_set1_RSA.pod EVP_PKEY_sign.pod
src/crypto/dist/openssl/doc/ssl [netbsd-5-2]: SSL_CTX_set_mode.pod
SSL_CTX_set_tmp_dh_callback.pod
src/crypto/dist/openssl/ssl [netbsd-5-2]: Makefile s23_clnt.c
s23_srvr.c s2_lib.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c
ssl-lib.com ssl.h ssl3.h ssl_err.c ssl_lib.c t1_enc.c t1_lib.c
tls1.h
src/crypto/dist/openssl/test [netbsd-5-2]: Makefile
Added Files:
src/crypto/dist/openssl/crypto [netbsd-5-2]: constant_time_locl.h
constant_time_test.c
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: CMS_add1_signer.pod
src/crypto/dist/openssl/test [netbsd-5-2]: constant_time_test.c
Log Message:
Apply patch (requested by spz in ticket #1927):
Apply OpenSSL security fixes derived from the diff between
OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568,
and adding POODLE mitigation via support for TLS_FALLBACK_SCSV.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.1.1.11.2.1 \
src/crypto/dist/openssl/apps/s_client.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \
src/crypto/dist/openssl/crypto/LPdir_vms.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
src/crypto/dist/openssl/crypto/LPdir_win.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 src/crypto/dist/openssl/crypto/Makefile
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/dist/openssl/crypto/constant_time_locl.h \
src/crypto/dist/openssl/crypto/constant_time_test.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/crypto/dist/openssl/crypto/bn/bn_exp.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/crypto/dist/openssl/crypto/bn/exptest.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.36.1 \
src/crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/crypto/dsa/dsa_ameth.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/crypto/dist/openssl/crypto/ec/ec.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/crypto/ec/ec_ameth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \
src/crypto/dist/openssl/crypto/ec/ec_asn1.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
src/crypto/dist/openssl/crypto/err/openssl.ec
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
src/crypto/dist/openssl/crypto/evp/Makefile
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.30.1 \
src/crypto/dist/openssl/crypto/evp/evp_enc.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/crypto/dist/openssl/crypto/rsa/Makefile
cvs rdiff -u -r1.14 -r1.14.2.1 src/crypto/dist/openssl/crypto/rsa/rsa.h
cvs rdiff -u -r1.7 -r1.7.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_err.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.38.1 \
src/crypto/dist/openssl/crypto/rsa/rsa_oaep.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.50.1 \
src/crypto/dist/openssl/crypto/rsa/rsa_pk1.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/doc/apps/s_client.pod
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \
src/crypto/dist/openssl/doc/crypto/BIO_s_accept.pod
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod
cvs rdiff -u -r1.6 -r1.6.38.1 \
src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \
src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod \
src/crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.50.1 \
src/crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \
src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.54.1 \
src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
cvs rdiff -u -r1.3 -r1.3.2.1 src/crypto/dist/openssl/ssl/Makefile
cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 src/crypto/dist/openssl/ssl/s23_clnt.c
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/crypto/dist/openssl/ssl/s23_srvr.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/crypto/dist/openssl/ssl/s2_lib.c
cvs rdiff -u -r1.12.4.3.4.2 -r1.12.4.3.4.3 \
src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -u -r1.1.1.12.4.2 -r1.1.1.12.4.2.2.1 \
src/crypto/dist/openssl/ssl/s3_enc.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.1.6.1 src/crypto/dist/openssl/ssl/s3_lib.c
cvs rdiff -u -r1.9.4.3.6.1 -r1.9.4.3.6.2 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -u -r1.15.4.4.4.1 -r1.15.4.4.4.2 \
src/crypto/dist/openssl/ssl/s3_srvr.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.38.1 src/crypto/dist/openssl/ssl/ssl-lib.com
cvs rdiff -u -r1.18.4.1 -r1.18.4.1.6.1 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/crypto/dist/openssl/ssl/ssl3.h
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.6.1 src/crypto/dist/openssl/ssl/ssl_err.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/crypto/dist/openssl/ssl/ssl_lib.c
cvs rdiff -u -r1.1.1.12.4.1 -r1.1.1.12.4.1.6.1 \
src/crypto/dist/openssl/ssl/t1_enc.c
cvs rdiff -u -r1.2.4.3.2.1 -r1.2.4.3.2.2 src/crypto/dist/openssl/ssl/t1_lib.c
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 src/crypto/dist/openssl/ssl/tls1.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 src/crypto/dist/openssl/test/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/crypto/dist/openssl/test/constant_time_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Committed By: snj
Date: Sun Oct 19 20:11:09 UTC 2014
Modified Files:
src/crypto/dist/openssl/apps [netbsd-5-2]: s_client.c
src/crypto/dist/openssl/crypto [netbsd-5-2]: LPdir_vms.c LPdir_win.c
Makefile
src/crypto/dist/openssl/crypto/bn [netbsd-5-2]: bn_exp.c exptest.c
src/crypto/dist/openssl/crypto/bn/asm [netbsd-5-2]: x86_64-gcc.c
src/crypto/dist/openssl/crypto/dsa [netbsd-5-2]: dsa_ameth.c
src/crypto/dist/openssl/crypto/ec [netbsd-5-2]: ec.h ec_ameth.c
ec_asn1.c ec_key.c ecp_smpl.c
src/crypto/dist/openssl/crypto/err [netbsd-5-2]: openssl.ec
src/crypto/dist/openssl/crypto/evp [netbsd-5-2]: Makefile evp_enc.c
src/crypto/dist/openssl/crypto/pkcs7 [netbsd-5-2]: pkcs7.h
src/crypto/dist/openssl/crypto/rsa [netbsd-5-2]: Makefile rsa.h
rsa_err.c rsa_oaep.c rsa_pk1.c rsa_sign.c
src/crypto/dist/openssl/doc/apps [netbsd-5-2]: s_client.pod
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: BIO_s_accept.pod
EVP_DigestInit.pod EVP_DigestVerifyInit.pod EVP_EncryptInit.pod
EVP_PKEY_set1_RSA.pod EVP_PKEY_sign.pod
src/crypto/dist/openssl/doc/ssl [netbsd-5-2]: SSL_CTX_set_mode.pod
SSL_CTX_set_tmp_dh_callback.pod
src/crypto/dist/openssl/ssl [netbsd-5-2]: Makefile s23_clnt.c
s23_srvr.c s2_lib.c s3_clnt.c s3_enc.c s3_lib.c s3_pkt.c s3_srvr.c
ssl-lib.com ssl.h ssl3.h ssl_err.c ssl_lib.c t1_enc.c t1_lib.c
tls1.h
src/crypto/dist/openssl/test [netbsd-5-2]: Makefile
Added Files:
src/crypto/dist/openssl/crypto [netbsd-5-2]: constant_time_locl.h
constant_time_test.c
src/crypto/dist/openssl/doc/crypto [netbsd-5-2]: CMS_add1_signer.pod
src/crypto/dist/openssl/test [netbsd-5-2]: constant_time_test.c
Log Message:
Apply patch (requested by spz in ticket #1927):
Apply OpenSSL security fixes derived from the diff between
OpenSSL 1.0.0n and 1.0.0o, fixing CVE-2014-3567, CVE-2014-3568,
and adding POODLE mitigation via support for TLS_FALLBACK_SCSV.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.11 -r1.1.1.11.2.1 \
src/crypto/dist/openssl/apps/s_client.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \
src/crypto/dist/openssl/crypto/LPdir_vms.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
src/crypto/dist/openssl/crypto/LPdir_win.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 src/crypto/dist/openssl/crypto/Makefile
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/dist/openssl/crypto/constant_time_locl.h \
src/crypto/dist/openssl/crypto/constant_time_test.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/crypto/dist/openssl/crypto/bn/bn_exp.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/crypto/dist/openssl/crypto/bn/exptest.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.36.1 \
src/crypto/dist/openssl/crypto/bn/asm/x86_64-gcc.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/crypto/dsa/dsa_ameth.c
cvs rdiff -u -r1.6 -r1.6.2.1 src/crypto/dist/openssl/crypto/ec/ec.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/crypto/ec/ec_ameth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \
src/crypto/dist/openssl/crypto/ec/ec_asn1.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.38.1 \
src/crypto/dist/openssl/crypto/ec/ec_key.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \
src/crypto/dist/openssl/crypto/ec/ecp_smpl.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \
src/crypto/dist/openssl/crypto/err/openssl.ec
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 \
src/crypto/dist/openssl/crypto/evp/Makefile
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.30.1 \
src/crypto/dist/openssl/crypto/evp/evp_enc.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/crypto/pkcs7/pkcs7.h
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
src/crypto/dist/openssl/crypto/rsa/Makefile
cvs rdiff -u -r1.14 -r1.14.2.1 src/crypto/dist/openssl/crypto/rsa/rsa.h
cvs rdiff -u -r1.7 -r1.7.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_err.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.38.1 \
src/crypto/dist/openssl/crypto/rsa/rsa_oaep.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.50.1 \
src/crypto/dist/openssl/crypto/rsa/rsa_pk1.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/crypto/dist/openssl/crypto/rsa/rsa_sign.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/crypto/dist/openssl/doc/apps/s_client.pod
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \
src/crypto/dist/openssl/doc/crypto/BIO_s_accept.pod
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/dist/openssl/doc/crypto/CMS_add1_signer.pod
cvs rdiff -u -r1.6 -r1.6.38.1 \
src/crypto/dist/openssl/doc/crypto/EVP_DigestInit.pod \
src/crypto/dist/openssl/doc/crypto/EVP_EncryptInit.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
src/crypto/dist/openssl/doc/crypto/EVP_DigestVerifyInit.pod \
src/crypto/dist/openssl/doc/crypto/EVP_PKEY_sign.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.50.1 \
src/crypto/dist/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.50.1 \
src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_mode.pod
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.54.1 \
src/crypto/dist/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
cvs rdiff -u -r1.3 -r1.3.2.1 src/crypto/dist/openssl/ssl/Makefile
cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 src/crypto/dist/openssl/ssl/s23_clnt.c
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 src/crypto/dist/openssl/ssl/s23_srvr.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/crypto/dist/openssl/ssl/s2_lib.c
cvs rdiff -u -r1.12.4.3.4.2 -r1.12.4.3.4.3 \
src/crypto/dist/openssl/ssl/s3_clnt.c
cvs rdiff -u -r1.1.1.12.4.2 -r1.1.1.12.4.2.2.1 \
src/crypto/dist/openssl/ssl/s3_enc.c
cvs rdiff -u -r1.14.4.1 -r1.14.4.1.6.1 src/crypto/dist/openssl/ssl/s3_lib.c
cvs rdiff -u -r1.9.4.3.6.1 -r1.9.4.3.6.2 src/crypto/dist/openssl/ssl/s3_pkt.c
cvs rdiff -u -r1.15.4.4.4.1 -r1.15.4.4.4.2 \
src/crypto/dist/openssl/ssl/s3_srvr.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.38.1 src/crypto/dist/openssl/ssl/ssl-lib.com
cvs rdiff -u -r1.18.4.1 -r1.18.4.1.6.1 src/crypto/dist/openssl/ssl/ssl.h
cvs rdiff -u -r1.8.2.1 -r1.8.2.2 src/crypto/dist/openssl/ssl/ssl3.h
cvs rdiff -u -r1.12.4.1 -r1.12.4.1.6.1 src/crypto/dist/openssl/ssl/ssl_err.c
cvs rdiff -u -r1.5 -r1.5.2.1 src/crypto/dist/openssl/ssl/ssl_lib.c
cvs rdiff -u -r1.1.1.12.4.1 -r1.1.1.12.4.1.6.1 \
src/crypto/dist/openssl/ssl/t1_enc.c
cvs rdiff -u -r1.2.4.3.2.1 -r1.2.4.3.2.2 src/crypto/dist/openssl/ssl/t1_lib.c
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 src/crypto/dist/openssl/ssl/tls1.h
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 src/crypto/dist/openssl/test/Makefile
cvs rdiff -u -r0 -r1.1.6.2 src/crypto/dist/openssl/test/constant_time_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.