| db8334b | Matt Caswell | 19 March 2015, 13:47:27 UTC | Prepare for 0.9.8zf release Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:47:27 UTC |
| fcc5e89 | Matt Caswell | 19 March 2015, 13:47:27 UTC | make update Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:47:27 UTC |
| b78c9e4 | Matt Caswell | 19 March 2015, 11:35:33 UTC | Fix unsigned/signed warnings Fix some unsigned/signed warnings introduced as part of the fix for CVE-2015-0293 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:00:45 UTC |
| c380bff | Matt Caswell | 19 March 2015, 10:16:32 UTC | Fix a failure to NULL a pointer freed on error. Reported by the LibreSSL project as a follow on to CVE-2015-0209 Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:00:45 UTC |
| 6655ac4 | Richard Levitte | 18 March 2015, 11:06:56 UTC | VMS build fix Reviewed-by: Andy Polyakov <appro@openssl.org> | 19 March 2015, 13:00:45 UTC |
| c7395fb | Matt Caswell | 17 March 2015, 17:01:09 UTC | Update NEWS file Update the NEWS file with the latest entries from CHANGES ready for the release. Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:00:45 UTC |
| d53f920 | Matt Caswell | 17 March 2015, 16:56:27 UTC | Update CHANGES for release Update CHANGES fiel with all the latest fixes ready for the release. Conflicts: CHANGES Conflicts: CHANGES Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:00:45 UTC |
| 65c588c | Emilia Kasper | 04 March 2015, 17:05:02 UTC | Fix reachable assert in SSLv2 servers. This assert is reachable for servers that support SSLv2 and export ciphers. Therefore, such servers can be DoSed by sending a specially crafted SSLv2 CLIENT-MASTER-KEY. Also fix s2_srvr.c to error out early if the key lengths are malformed. These lengths are sent unencrypted, so this does not introduce an oracle. CVE-2015-0293 This issue was discovered by Sean Burford (Google) and Emilia Käsper of the OpenSSL development team. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> | 19 March 2015, 13:00:45 UTC |
| 544e3e3 | Emilia Kasper | 27 February 2015, 15:52:23 UTC | PKCS#7: avoid NULL pointer dereferences with missing content In PKCS#7, the ASN.1 content component is optional. This typically applies to inner content (detached signatures), however we must also handle unexpected missing outer content correctly. This patch only addresses functions reachable from parsing, decryption and verification, and functions otherwise associated with reading potentially untrusted data. Correcting all low-level API calls requires further work. CVE-2015-0289 Thanks to Michal Zalewski (Google) for reporting this issue. Reviewed-by: Steve Henson <steve@openssl.org> Conflicts: crypto/pkcs7/pk7_doit.c | 19 March 2015, 13:00:45 UTC |
| 497d0b0 | Dr. Stephen Henson | 09 March 2015, 23:11:45 UTC | Fix ASN1_TYPE_cmp Fix segmentation violation when ASN1_TYPE_cmp is passed a boolean type. This can be triggered during certificate verification so could be a DoS attack against a client or a server enabling client authentication. CVE-2015-0286 Reviewed-by: Richard Levitte <levitte@openssl.org> | 19 March 2015, 13:00:44 UTC |
| 674341f | Dr. Stephen Henson | 23 February 2015, 02:32:44 UTC | Free up ADB and CHOICE if already initialised. CVE-2015-0287 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 18 March 2015, 11:52:58 UTC |
| c58f4f7 | Dr. Stephen Henson | 14 March 2015, 14:10:35 UTC | Tolerate test_sqr errors for FIPS builds. Reviewed-by: Tim Hudson <tjh@openssl.org> | 14 March 2015, 22:21:21 UTC |
| c85c1e0 | Kurt Roeckx | 08 March 2015, 14:11:33 UTC | Disable export and SSLv2 ciphers by default They are moved to the COMPLEMENTOFDEFAULT instead. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 14 March 2015, 17:46:31 UTC |
| c2f5de1 | Matt Caswell | 09 March 2015, 13:59:58 UTC | Cleanse buffers Cleanse various intermediate buffers used by the PRF (backported version from master). Conflicts: ssl/s3_enc.c Conflicts: ssl/t1_enc.c Conflicts: ssl/t1_enc.c Reviewed-by: Richard Levitte <levitte@openssl.org> | 11 March 2015, 10:57:14 UTC |
| 01320ad | Dr. Stephen Henson | 08 March 2015, 17:01:28 UTC | Fix warnings. Fix compiler warnings (similar to commit 25012d5e79) Reviewed-by: Richard Levitte <levitte@openssl.org> | 08 March 2015, 17:23:40 UTC |
| a065737 | Matt Caswell | 06 March 2015, 13:00:47 UTC | Update mkerr.pl for new format Make the output from mkerr.pl consistent with the newly reformatted code. Reviewed-by: Richard Levitte <levitte@openssl.org> | 06 March 2015, 14:10:30 UTC |
| 241cff6 | Dr. Stephen Henson | 18 February 2015, 00:34:59 UTC | Check public key is not NULL. CVE-2015-0288 PR#3708 Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 28a00bcd8e318da18031b2ac8778c64147cd54f9) | 02 March 2015, 15:26:57 UTC |
| 8a8ba07 | Dr. Stephen Henson | 02 March 2015, 13:26:29 UTC | Fix format script. The format script didn't correctly recognise some ASN.1 macros and didn't reformat some files as a result. Fix script and reformat affected files. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a) Conflicts: crypto/asn1/x_long.c | 02 March 2015, 13:50:01 UTC |
| 1b4a8df | Matt Caswell | 09 February 2015, 11:38:41 UTC | Fix a failure to NULL a pointer freed on error. Inspired by BoringSSL commit 517073cd4b by Eric Roman <eroman@chromium.org> CVE-2015-0209 Reviewed-by: Emilia Käsper <emilia@openssl.org> | 25 February 2015, 20:40:38 UTC |
| 6d4655c | Andy Polyakov | 09 February 2015, 14:59:09 UTC | Bring objects.pl output even closer to new format. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 849037169d98d070c27d094ac341fc6aca1ed2ca) | 09 February 2015, 15:07:51 UTC |
| 9eca2cb | Andy Polyakov | 07 February 2015, 09:15:32 UTC | Harmonize objects.pl output with new format. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 7ce38623194f6df6a846cd01753b63f361c88e57) | 09 February 2015, 09:03:30 UTC |
| d7efe7e | Matt Caswell | 05 February 2015, 10:19:55 UTC | Fix error handling in ssltest Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit ae632974f905c59176fa5f312826f8f692890b67) | 06 February 2015, 10:15:22 UTC |
| 49fa6b6 | Rich Salz | 05 February 2015, 14:44:30 UTC | Fixed bad formatting in crypto/des/spr.h Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 7e35f06ea908e47f87b723b5e951ffc55463eb8b) | 05 February 2015, 14:46:24 UTC |
| d64a227 | Dr. Stephen Henson | 01 February 2015, 13:06:32 UTC | Check PKCS#8 pkey field is valid before cleansing. PR:3683 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 52e028b9de371da62c1e51b46592517b1068d770) | 03 February 2015, 14:02:51 UTC |
| 6844c12 | Matt Caswell | 22 January 2015, 11:44:18 UTC | Fix for reformat problems with e_padlock.c Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit d3b7cac41b957704932a0cdbc74d4d48ed507cd0) | 22 January 2015, 14:17:04 UTC |
| ead95e7 | Matt Caswell | 22 January 2015, 10:42:48 UTC | Fix formatting error in pem.h Reviewed-by: Andy Polyakov <appro@openssl.org> Conflicts: crypto/pem/pem.h Conflicts: crypto/pem/pem.h | 22 January 2015, 14:17:02 UTC |
| 02f0c26 | Matt Caswell | 05 January 2015, 11:30:03 UTC | Re-align some comments after running the reformat script. This should be a one off operation (subsequent invokation of the script should not move them) This commit is for the 0.9.8 changes Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:53:07 UTC |
| 6f1f3c6 | Matt Caswell | 22 January 2015, 02:48:18 UTC | Rerun util/openssl-format-source -v -c . Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:53:02 UTC |
| 40720ce | Matt Caswell | 22 January 2015, 02:47:42 UTC | Run util/openssl-format-source -v -c . Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:55 UTC |
| 9d03aab | Matt Caswell | 22 January 2015, 02:41:39 UTC | More comment changes required for indent Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:49 UTC |
| 117e79d | Matt Caswell | 22 January 2015, 00:57:19 UTC | Yet more changes to comments Conflicts: ssl/t1_enc.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:44 UTC |
| bc91221 | Matt Caswell | 21 January 2015, 23:54:59 UTC | More tweaks for comments due indent issues Conflicts: ssl/ssl_ciph.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:40 UTC |
| b9006da | Matt Caswell | 21 January 2015, 22:03:55 UTC | Backport hw_ibmca.c from master due to failed merge Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:34 UTC |
| d26667b | Matt Caswell | 21 January 2015, 21:22:49 UTC | Tweaks for comments due to indent's inability to handle them Conflicts: ssl/s3_srvr.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:28 UTC |
| 1327047 | Matt Caswell | 21 January 2015, 19:18:47 UTC | Move more comments that confuse indent Conflicts: crypto/dsa/dsa.h demos/engines/ibmca/hw_ibmca.c ssl/ssl_locl.h Conflicts: crypto/bn/rsaz_exp.c crypto/evp/e_aes_cbc_hmac_sha1.c crypto/evp/e_aes_cbc_hmac_sha256.c ssl/ssl_locl.h Conflicts: crypto/ec/ec2_oct.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c crypto/ec/ecp_nistputil.c crypto/ec/ecp_oct.c crypto/modes/gcm128.c ssl/ssl_locl.h Conflicts: apps/apps.c crypto/crypto.h crypto/rand/md_rand.c ssl/d1_pkt.c ssl/ssl.h ssl/ssl_locl.h ssl/ssltest.c ssl/t1_enc.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:21 UTC |
| 3600d5a | Dr. Stephen Henson | 21 January 2015, 15:32:54 UTC | Delete trailing whitespace from output. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:17 UTC |
| 2b2f5ac | Dr. Stephen Henson | 20 January 2015, 18:53:56 UTC | Add -d debug option to save preprocessed files. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:12 UTC |
| 7d3081c | Dr. Stephen Henson | 20 January 2015, 18:49:04 UTC | Test option -nc Add option -nc which sets COMMENTS=true but disables all indent comment reformatting options. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:05 UTC |
| 9a5d775 | Matt Caswell | 21 January 2015, 16:37:58 UTC | Add ecp_nistz256.c to list of files skipped by openssl-format-source Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:52:00 UTC |
| e29126f | Matt Caswell | 21 January 2015, 16:34:27 UTC | Manually reformat aes_x86core.c and add it to the list of files skipped by openssl-format-source Conflicts: crypto/aes/aes_x86core.c Conflicts: crypto/aes/aes_x86core.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:54 UTC |
| 175af9d | Matt Caswell | 21 January 2015, 16:12:59 UTC | Fix indent comment corruption issue Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:49 UTC |
| 53d6e67 | Matt Caswell | 21 January 2015, 15:28:57 UTC | Amend openssl-format-source so that it give more repeatable output Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:43 UTC |
| 4191a11 | Andy Polyakov | 21 January 2015, 12:18:42 UTC | bn/bn_const.c: make it indent-friendly. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:38 UTC |
| f6e4701 | Andy Polyakov | 21 January 2015, 10:54:03 UTC | bn/asm/x86_64-gcc.cL make it indent-friendly. Conflicts: crypto/bn/asm/x86_64-gcc.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:32 UTC |
| 8618379 | Andy Polyakov | 21 January 2015, 10:50:56 UTC | bn/bn_asm.c: make it indent-friendly. Conflicts: crypto/bn/bn_asm.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:26 UTC |
| b527959 | Andy Polyakov | 21 January 2015, 10:45:23 UTC | bn/bn_exp.c: make it indent-friendly. Conflicts: crypto/bn/bn_exp.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:21 UTC |
| 25ca15e | Matt Caswell | 21 January 2015, 14:01:16 UTC | Manually reformat aes_core.c Add aes_core.c to the list of files not processed by openssl-format-source Conflicts: crypto/aes/aes_core.c Conflicts: crypto/aes/aes_core.c Conflicts: crypto/aes/aes_core.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:15 UTC |
| d1d4b4f | Matt Caswell | 21 January 2015, 13:51:38 UTC | Add obj_dat.h to the list of files that will not be processed by openssl-format-source Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:09 UTC |
| 2a3e745 | Matt Caswell | 21 January 2015, 12:19:08 UTC | Fix strange formatting by indent Conflicts: crypto/hmac/hmac.h Conflicts: crypto/evp/e_aes_cbc_hmac_sha256.c Conflicts: crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c crypto/ec/ectest.c Conflicts: crypto/asn1/asn1_par.c crypto/evp/e_des3.c crypto/hmac/hmac.h crypto/sparcv9cap.c engines/ccgost/gost94_keyx.c ssl/t1_enc.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:51:04 UTC |
| c7c7a43 | Matt Caswell | 21 January 2015, 11:09:58 UTC | indent has problems with comments that are on the right hand side of a line. Sometimes it fails to format them very well, and sometimes it corrupts them! This commit moves some particularly problematic ones. Conflicts: crypto/bn/bn.h crypto/ec/ec_lcl.h crypto/rsa/rsa.h demos/engines/ibmca/hw_ibmca.c ssl/ssl.h ssl/ssl3.h Conflicts: crypto/ec/ec_lcl.h ssl/tls1.h Conflicts: crypto/ec/ecp_nistp224.c crypto/evp/evp.h ssl/d1_both.c ssl/ssl.h ssl/ssl_lib.c Conflicts: crypto/bio/bss_file.c crypto/ec/ec_lcl.h crypto/evp/evp.h crypto/store/str_mem.c crypto/whrlpool/wp_block.c crypto/x509/x509_vfy.h ssl/ssl.h ssl/ssl3.h ssl/ssltest.c ssl/t1_lib.c ssl/tls1.h Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:57 UTC |
| 5ba9d5b | Andy Polyakov | 20 January 2015, 22:45:19 UTC | crypto/mem_dbg.c: make it indent-friendly. Conflicts: crypto/mem_dbg.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:52 UTC |
| 883a4d5 | Matt Caswell | 21 January 2015, 09:33:22 UTC | More indent fixes for STACK_OF Conflicts: ssl/s3_lib.c Conflicts: apps/cms.c crypto/x509/x509_lu.c crypto/x509/x509_vfy.h ssl/s3_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:46 UTC |
| b4f1dbd | Matt Caswell | 20 January 2015, 22:17:03 UTC | Fix indent issue with engine.h Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:41 UTC |
| 5741067 | Matt Caswell | 20 January 2015, 22:13:39 UTC | Fix logic to check for indent.pro Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:37 UTC |
| dd7ad2c | Andy Polyakov | 20 January 2015, 14:49:55 UTC | crypto/cryptlib.c: make it indent-friendly. Conflicts: crypto/cryptlib.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:31 UTC |
| 366b193 | Andy Polyakov | 20 January 2015, 14:22:42 UTC | bn/bntest.c: make it indent-friendly. Conflicts: crypto/bn/bntest.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:26 UTC |
| 402eec1 | Andy Polyakov | 20 January 2015, 14:12:07 UTC | bn/bn_recp.c: make it indent-friendly. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:22 UTC |
| 44759a0 | Andy Polyakov | 20 January 2015, 13:57:46 UTC | engines/e_ubsec.c: make it indent-friendly. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:17 UTC |
| 9b8089b | Andy Polyakov | 20 January 2015, 13:15:44 UTC | apps/speed.c: make it indent-friendly. Conflicts: apps/speed.c Conflicts: apps/speed.c Conflicts: apps/speed.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:09 UTC |
| 4fd2e6b | Matt Caswell | 14 January 2015, 21:26:14 UTC | Fix make errors Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:50:03 UTC |
| a2a2bba | Richard Levitte | 20 January 2015, 15:18:23 UTC | Make the script a little more location agnostic Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:57 UTC |
| b0727cd | Matt Caswell | 20 January 2015, 12:37:42 UTC | Provide script for filtering data initialisers for structs/unions. indent just can't handle it. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:52 UTC |
| d808ebd | Dr. Stephen Henson | 20 January 2015, 14:12:10 UTC | Script fixes. Don't use double newline for headers. Don't interpret ASN1_PCTX as start of an ASN.1 module. Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:46 UTC |
| 23f5f5b | Richard Levitte | 20 January 2015, 14:17:02 UTC | Run expand before perl, to make sure things are properly aligned Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:40 UTC |
| 5e12109 | Richard Levitte | 20 January 2015, 14:14:24 UTC | Force the use of our indent profile Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:35 UTC |
| 7ef6c2b | Tim Hudson | 05 January 2015, 10:17:50 UTC | Provide source reformating script. Requires GNU indent to be available. Script written by Tim Hudson, with amendments by Steve Henson, Rich Salz and Matt Caswell Reviewed-by: Matt Caswell <matt@openssl.org> | 22 January 2015, 09:49:20 UTC |
| 00ea17f | Matt Caswell | 19 January 2015, 12:42:01 UTC | Fix source where indent will not be able to cope Conflicts: apps/ciphers.c ssl/s3_pkt.c Conflicts: crypto/ec/ec_curve.c Conflicts: crypto/ec/ec_curve.c ssl/s3_clnt.c ssl/s3_srvr.c ssl/ssl_sess.c Conflicts: apps/ciphers.c crypto/bn/bn.h crypto/ec/ec_curve.c ssl/t1_enc.c ssl/t1_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:13 UTC |
| 3e8042c | Matt Caswell | 16 January 2015, 09:21:50 UTC | Additional comment changes for reformat of 0.9.8 Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:49:06 UTC |
| 564ccc5 | Matt Caswell | 05 January 2015, 00:34:00 UTC | Further comment amendments to preserve formatting prior to source reformat (cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Conflicts: apps/apps.c ssl/ssltest.c Conflicts: apps/apps.c crypto/ec/ec2_oct.c crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c ssl/s3_cbc.c ssl/ssl_sess.c ssl/t1_lib.c Conflicts: crypto/bio/b_sock.c crypto/pem/pem.h crypto/x509/x509_vfy.c crypto/x509v3/pcy_tree.c ssl/s3_both.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:48:59 UTC |
| b558c8d | Tim Hudson | 28 December 2014, 02:48:40 UTC | mark all block comments that need format preserving so that indent will not alter them when reformatting comments (cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960) Conflicts: crypto/bn/bn_lcl.h crypto/bn/bn_prime.c crypto/engine/eng_all.c crypto/rc4/rc4_utl.c crypto/sha/sha.h ssl/kssl.c ssl/t1_lib.c Conflicts: crypto/rc4/rc4_enc.c crypto/x509v3/v3_scts.c crypto/x509v3/v3nametest.c ssl/d1_both.c ssl/s3_srvr.c ssl/ssl.h ssl/ssl_locl.h ssl/ssltest.c ssl/t1_lib.c Conflicts: crypto/asn1/a_sign.c crypto/bn/bn_div.c crypto/dsa/dsa_asn1.c crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c crypto/ec/ecp_nistputil.c crypto/modes/gcm128.c crypto/opensslv.h ssl/d1_both.c ssl/heartbeat_test.c ssl/s3_clnt.c ssl/s3_srvr.c ssl/ssl_sess.c ssl/t1_lib.c test/testutil.h Conflicts: apps/openssl.c apps/ts.c apps/vms_decc_init.c crypto/aes/aes_core.c crypto/aes/aes_x86core.c crypto/dsa/dsa_ameth.c crypto/ec/ec2_mult.c crypto/evp/evp.h crypto/objects/objects.h crypto/rsa/rsa_pss.c crypto/stack/safestack.h crypto/ts/ts.h crypto/ts/ts_rsp_verify.c crypto/whrlpool/wp_dgst.c crypto/x509v3/v3_ncons.c e_os2.h engines/ccgost/gost89.c engines/ccgost/gost_ctl.c engines/ccgost/gost_keywrap.c engines/ccgost/gost_keywrap.h engines/ccgost/gost_sign.c ssl/kssl.c ssl/s3_srvr.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 22 January 2015, 09:48:44 UTC |
| ba442a7 | Matt Caswell | 15 January 2015, 15:08:48 UTC | Prepare for 0.9.8zf-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 15 January 2015, 15:08:48 UTC |
| e8ccaee | Matt Caswell | 15 January 2015, 15:05:59 UTC | Prepare for 0.9.8ze release Reviewed-by: Stephen Henson <steve@openssl.org> | 15 January 2015, 15:05:59 UTC |
| 60431d0 | Matt Caswell | 15 January 2015, 15:05:59 UTC | make update Reviewed-by: Stephen Henson <steve@openssl.org> | 15 January 2015, 15:05:59 UTC |
| 346a46f | Matt Caswell | 15 January 2015, 13:04:01 UTC | Updates to CHANGES and NEWS Reviewed-by: Dr Stephen Henson <steve@openssl.org> | 15 January 2015, 13:19:56 UTC |
| 56abaa1 | Matt Caswell | 10 January 2015, 23:36:28 UTC | Fix warning where BIO_FLAGS_UPLINK was being redefined. This warning breaks the build in 1.0.0 and 0.9.8 Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit b1ffc6ca1c387efad0772c16dfe426afef45dc4f) | 13 January 2015, 11:26:07 UTC |
| 8b8a48d | Matt Caswell | 09 January 2015, 14:06:36 UTC | Avoid deprecation problems in Visual Studio 13 Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef) Conflicts: e_os.h | 13 January 2015, 09:50:04 UTC |
| 09caf4f | Dr. Stephen Henson | 25 February 2014, 12:11:22 UTC | Avoid Windows 8 Getversion deprecated errors. Windows 8 SDKs complain that GetVersion() is deprecated. We only use GetVersion like this: (GetVersion() < 0x80000000) which checks if the Windows version is NT based. Use a macro check_winnt() which uses GetVersion() on older SDK versions and true otherwise. (cherry picked from commit a4cc3c8041104896d51ae12ef7b678c31808ce52) Conflicts: apps/apps.c crypto/bio/bss_log.c Backported by Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openss.org> | 13 January 2015, 09:30:24 UTC |
| 9793a07 | Matt Caswell | 09 January 2015, 23:01:20 UTC | Further windows specific .gitignore entries Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 41c9cfbc4ee7345547fb98cccb8511f082f0910b) | 09 January 2015, 23:41:18 UTC |
| aa9296e | Matt Caswell | 09 January 2015, 10:19:10 UTC | Update .gitignore with windows files to be excluded from git Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: .gitignore (cherry picked from commit 04f670cf3d8f22e0d197a071d2db536fb7ebd9c7) Conflicts: .gitignore | 09 January 2015, 11:32:46 UTC |
| bc253b0 | Matt Caswell | 08 January 2015, 14:36:15 UTC | Prepare for 0.9.8ze-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 08 January 2015, 14:36:15 UTC |
| b873409 | Matt Caswell | 08 January 2015, 14:33:47 UTC | Prepare for 0.9.8zd release Reviewed-by: Stephen Henson <steve@openssl.org> | 08 January 2015, 14:33:47 UTC |
| f89250f | Matt Caswell | 08 January 2015, 14:33:47 UTC | make update Reviewed-by: Stephen Henson <steve@openssl.org> | 08 January 2015, 14:33:47 UTC |
| 1dc6a54 | Matt Caswell | 08 January 2015, 13:37:28 UTC | CHANGES and NEWS updates for release Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Steve Henson <steve@openssl.org> | 08 January 2015, 14:31:42 UTC |
| a4aa188 | Dr. Stephen Henson | 06 January 2015, 14:28:34 UTC | Fix typo. Fix typo in ssl3_get_cert_verify: we can only skip certificate verify message if certificate is absent. NB: OpenSSL 0.9.8 is NOT vulnerable to CVE-2015-0205 as it doesn't support DH certificates and this typo prohibits skipping of certificate verify message for sign only certificates anyway. Reviewed-by: Matt Caswell <matt@openssl.org> | 08 January 2015, 14:31:19 UTC |
| 50befdb | Matt Caswell | 03 January 2015, 00:54:35 UTC | Follow on from CVE-2014-3571. This fixes the code that was the original source of the crash due to p being NULL. Steve's fix prevents this situation from occuring - however this is by no means obvious by looking at the code for dtls1_get_record. This fix just makes things look a bit more sane. Conflicts: ssl/d1_pkt.c Reviewed-by: Dr Stephen Henson <steve@openssl.org> | 08 January 2015, 14:18:52 UTC |
| 46bf0ba | Dr. Stephen Henson | 03 January 2015, 00:45:13 UTC | Fix crash in dtls1_get_record whilst in the listen state where you get two separate reads performed - one for the header and one for the body of the handshake record. CVE-2014-3571 Reviewed-by: Matt Caswell <matt@openssl.org> Conflicts: ssl/s3_pkt.c | 08 January 2015, 11:28:17 UTC |
| 4b4c0a1 | Andy Polyakov | 05 January 2015, 13:52:56 UTC | Fix for CVE-2014-3570. Reviewed-by: Emilia Kasper <emilia@openssl.org> (cherry picked from commit e793809ba50c1e90ab592fb640a856168e50f3de) | 08 January 2015, 11:28:17 UTC |
| df70302 | Dr. Stephen Henson | 07 January 2015, 17:36:17 UTC | fix error discrepancy Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 4a4d4158572fd8b3dc641851b8378e791df7972d) | 07 January 2015, 18:11:27 UTC |
| 9c6c664 | Dr. Stephen Henson | 06 January 2015, 21:12:15 UTC | use correct credit in CHANGES Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 4138e3882556c762d77eb827b8be98507cde48df) Conflicts: CHANGES | 06 January 2015, 22:44:40 UTC |
| 11f719d | Dr. Stephen Henson | 06 January 2015, 20:55:38 UTC | use correct function name Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit cb62ab4b17818fe66d2fed0a7fe71969131c811b) | 06 January 2015, 21:05:22 UTC |
| 72f1815 | Dr. Stephen Henson | 23 October 2014, 16:09:57 UTC | Only allow ephemeral RSA keys in export ciphersuites. OpenSSL clients would tolerate temporary RSA keys in non-export ciphersuites. It also had an option SSL_OP_EPHEMERAL_RSA which enabled this server side. Remove both options as they are a protocol violation. Thanks to Karthikeyan Bhargavan for reporting this issue. (CVE-2015-0204) Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 4b4c1fcc88aec8c9e001b0a0077d3cd4de1ed0e6) Conflicts: CHANGES doc/ssl/SSL_CTX_set_options.pod ssl/d1_srvr.c ssl/s3_srvr.c | 06 January 2015, 13:27:22 UTC |
| e42a2ab | Dr. Stephen Henson | 24 October 2014, 11:30:33 UTC | ECDH downgrade bug fix. Fix bug where an OpenSSL client would accept a handshake using an ephemeral ECDH ciphersuites with the server key exchange message omitted. Thanks to Karthikeyan Bhargavan for reporting this issue. CVE-2014-3572 Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit b15f8769644b00ef7283521593360b7b2135cb63) Conflicts: CHANGES ssl/s3_clnt.c | 05 January 2015, 23:59:04 UTC |
| ec2fede | Dr. Stephen Henson | 20 December 2014, 15:09:50 UTC | Fix various certificate fingerprint issues. By using non-DER or invalid encodings outside the signed portion of a certificate the fingerprint can be changed without breaking the signature. Although no details of the signed portion of the certificate can be changed this can cause problems with some applications: e.g. those using the certificate fingerprint for blacklists. 1. Reject signatures with non zero unused bits. If the BIT STRING containing the signature has non zero unused bits reject the signature. All current signature algorithms require zero unused bits. 2. Check certificate algorithm consistency. Check the AlgorithmIdentifier inside TBS matches the one in the certificate signature. NB: this will result in signature failure errors for some broken certificates. 3. Check DSA/ECDSA signatures use DER. Reencode DSA/ECDSA signatures and compare with the original received signature. Return an error if there is a mismatch. This will reject various cases including garbage after signature (thanks to Antti Karjalainen and Tuomo Untinen from the Codenomicon CROSS program for discovering this case) and use of BER or invalid ASN.1 INTEGERs (negative or with leading zeroes). CVE-2014-8275 Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 208a6012be3077d83df4475f32dd1b1446f3a02e) Conflicts: crypto/dsa/dsa_vrf.c | 05 January 2015, 16:37:10 UTC |
| 63f3c9e | Dr. Stephen Henson | 05 January 2015, 15:35:55 UTC | Update ordinals. Reviewed-by: Emilia Käsper <emilia@openssl.org> | 05 January 2015, 16:04:46 UTC |
| c22e2dd | Dr. Stephen Henson | 14 December 2014, 23:14:15 UTC | Add ASN1_TYPE_cmp and X509_ALGOR_cmp. (these are needed for certificate fingerprint fixes) Reviewed-by: Emilia Käsper <emilia@openssl.org> | 05 January 2015, 15:34:49 UTC |
| 7fae32f | Kurt Roeckx | 15 December 2014, 16:15:16 UTC | Return error when a bit string indicates an invalid amount of bits left Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 86edf13b1c97526c0cf63c37342aaa01f5442688) | 05 January 2015, 15:23:42 UTC |
| 5260f1a | Dr. Stephen Henson | 17 December 2014, 14:34:36 UTC | Reject invalid constructed encodings. According to X6.90 null, object identifier, boolean, integer and enumerated types can only have primitive encodings: return an error if any of these are received with a constructed encoding. Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit f5e4b6b5b566320a8d774f9475540f7d0e6a704d) Conflicts: crypto/asn1/asn1_err.c | 05 January 2015, 15:22:34 UTC |
| 1cb10d9 | Emilia Kasper | 17 December 2014, 13:52:13 UTC | Revert "RT3425: constant-time evp_enc" Causes more problems than it fixes: even though error codes are not part of the stable API, several users rely on the specific error code, and the change breaks them. Conversely, we don't have any concrete use-cases for constant-time behaviour here. This reverts commit 1bb01b1b5f27a7de33e7a67946b8c001b54e09e9. Reviewed-by: Andy Polyakov <appro@openssl.org> | 17 December 2014, 13:57:16 UTC |
| 62abc80 | Kurt Roeckx | 10 November 2014, 18:03:03 UTC | Fix warning about negative unsigned intergers Reviewed-by: Richard Levitte <levitte@openssl.org> | 11 November 2014, 14:48:58 UTC |
| 722fa14 | Andy Polyakov | 29 October 2014, 09:48:39 UTC | md32_common.h: address compiler warning in HOST_c2l. Reviewed-by: Stephen Henson <steve@openssl.org> (cherry picked from commit d45282fc7cd9b97ed1479f8b8af713337fce57f5) | 29 October 2014, 09:56:27 UTC |
