| 027381f | Matt Caswell | 03 December 2014, 09:21:09 UTC | Remove "#if 0" code Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 4bb8eb9ce4f794fecf020a15b54e8505fced0edf) | 03 December 2014, 09:43:49 UTC |
| a900b3b | Matt Caswell | 02 December 2014, 11:16:35 UTC | Only use the fallback mtu after 2 unsuccessful retransmissions if it is less than the mtu we are already using Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 047f21593eebbc617a410a208ded01e65ca11028) | 03 December 2014, 09:43:49 UTC |
| 82d7247 | Matt Caswell | 01 December 2014, 23:57:44 UTC | Updates to s_client and s_server to remove the constant 28 (for IPv4 header and UDP header) when setting an mtu. This constant is not always correct (e.g. if using IPv6). Use the new DTLS_CTRL functions instead. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 464ce92026bd0c79186cbefa75470f39607110be) | 03 December 2014, 09:43:49 UTC |
| ceb4c68 | Matt Caswell | 02 December 2014, 00:16:55 UTC | If we really get a situation where the underlying mtu is less than the minimum we will support then dtls1_do_write can go into an infinite loop. This commit fixes that. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit d3d9eef31661633f5b003a9e115c1822f79d1870) | 03 December 2014, 09:43:49 UTC |
| a8da754 | Matt Caswell | 01 December 2014, 22:18:18 UTC | Fix dtls_query_mtu so that it will always either complete with an mtu that is at least the minimum or it will fail. There were some instances in dtls1_query_mtu where the final mtu can end up being less than the minimum, i.e. where the user has set an mtu manually. This shouldn't be allowed. Also remove dtls1_guess_mtu that, despite having logic for guessing an mtu, was actually only ever used to work out the minimum mtu to use. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 1620a2e49c777f31f2ce57966ae74006b48ad759) | 03 December 2014, 09:43:49 UTC |
| 8ccb44e | Matt Caswell | 01 December 2014, 23:58:05 UTC | Remove instances in libssl of the constant 28 (for size of IPv4 header + UDP) and instead use the value provided by the underlying BIO. Also provide some new DTLS_CTRLs so that the library user can set the mtu without needing to know this constant. These new DTLS_CTRLs provide the capability to set the link level mtu to be used (i.e. including this IP/UDP overhead). The previous DTLS_CTRLs required the library user to subtract this overhead first. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 59669b6abf620d1ed2ef4d1e2df25c998b89b64d) Conflicts: ssl/d1_both.c ssl/ssl.h ssl/ssl_lib.c | 03 December 2014, 09:43:47 UTC |
| bbfdd1f | Matt Caswell | 01 December 2014, 23:49:47 UTC | There are a number of instances throughout the code where the constant 28 is used with no explanation. Some of this was introduced as part of RT#1929. The value 28 is the length of the IP header (20 bytes) plus the UDP header (8 bytes). However use of this constant is incorrect because there may be instances where a different value is needed, e.g. an IPv4 header is 20 bytes but an IPv6 header is 40. Similarly you may not be using UDP (e.g. SCTP). This commit introduces a new BIO_CTRL that provides the value to be used for this mtu "overhead". It will be used by subsequent commits. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 0d3ae34df573f477b6b1aaf614d52dcdfcff5fce) Conflicts: crypto/bio/bio.h crypto/bio/bss_dgram.c | 03 December 2014, 09:41:16 UTC |
| 8724f9f | Matt Caswell | 01 December 2014, 11:41:25 UTC | The first call to query the mtu in dtls1_do_write correctly checks that the mtu that we have received is not less than the minimum. If its less it uses the minimum instead. The second call to query the mtu does not do that, but instead uses whatever comes back. We have seen an instance in RT#3592 where we have got an unreasonably small mtu come back. This commit makes both query checks consistent. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 6abb0d1f8e702a0daa9c32b8021d01eda0483018) | 03 December 2014, 09:38:10 UTC |
| 6d41cbb | Matt Caswell | 01 December 2014, 11:13:15 UTC | The SSL_OP_NO_QUERY_MTU option is supposed to stop the mtu from being automatically updated, and we should use the one provided instead. Unfortunately there are a couple of locations where this is not respected. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 001235778a6e9c645dc0507cad6092d99c9af8f5) | 03 December 2014, 09:38:10 UTC |
| 04a73c8 | Matt Caswell | 01 December 2014, 11:10:38 UTC | Verify that we have a sensible message len and fail if not RT#3592 provides an instance where the OPENSSL_assert that this commit replaces can be hit. I was able to recreate this issue by forcing the underlying BIO to misbehave and come back with very small mtu values. This happens the second time around the while loop after we have detected that the MTU has been exceeded following the call to dtls1_write_bytes. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit cf75017bfd60333ff65edf9840001cd2c49870a3) | 03 December 2014, 09:38:10 UTC |
| 87ff17a | Richard Levitte | 28 November 2014, 22:06:20 UTC | Check for FindNextFile when defining it rather than FindFirstFile Reviewed-by: Matt Caswell <matt@openssl.org> | 28 November 2014, 22:31:53 UTC |
| d93112a | Richard Levitte | 28 November 2014, 19:40:10 UTC | [PR3597] Advance to the next state variant when reusing messages. Previously, state variant was not advanced, which resulted in state being stuck in the st1 variant (usually "_A"). This broke certificate callback retry logic when accepting connections that were using SSLv2 ClientHello (hence reusing the message), because their state never advanced to SSL3_ST_SR_CLNT_HELLO_C variant required for the retry code path. Reported by Yichun Zhang (agentzh). Signed-off-by: Piotr Sikora <piotr@cloudflare.com> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 28 November 2014, 22:31:53 UTC |
| 875a33d | Richard Levitte | 28 November 2014, 15:31:10 UTC | Correct some layout issues, convert all remaining tabs to appropriate amounts of spaces. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 8123d158ab6f0a6a468748c133e33c2063ff36b5) | 28 November 2014, 16:04:32 UTC |
| cf48a6d | Alok Menghrajani | 14 November 2014, 18:39:41 UTC | Improves the proxy certificates howto doc. The current documentation contains a bunch of spelling and grammar mistakes. I also found it hard to understand some paragraphs, so here is my attempt to improve its readability. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 03b637a730e4a298c360cc143de7564060c06324) | 28 November 2014, 16:04:32 UTC |
| 7f3490e | Matt Caswell | 27 November 2014, 20:40:18 UTC | Fixed warning in ssl2_enc Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 2db95e094d23b41d2305c0a01db66694ea77f936) | 27 November 2014, 21:58:32 UTC |
| dcf7a2d | Matt Caswell | 18 November 2014, 15:03:55 UTC | Check EVP_Cipher return values for SSL2 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 5fc8bb6ab71b5f7ce2dd67a47494bb5b5c6dc374) | 27 November 2014, 21:58:32 UTC |
| 6ff76b3 | Matt Caswell | 18 November 2014, 12:56:26 UTC | Add checks to the return value of EVP_Cipher to prevent silent encryption failure. PR#1767 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 244d0955adc027c0f41a3251e55d145bf940f9ce) | 27 November 2014, 21:58:31 UTC |
| 3b12515 | Matt Caswell | 27 November 2014, 11:06:43 UTC | Remove redundant checks in ssl_cert_dup. This was causing spurious error messages when using GOST PR#3613 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit fc3968a25ce0c16cab8730ec0d68a59856158029) | 27 November 2014, 20:55:52 UTC |
| 4e73dc5 | Matt Caswell | 17 November 2014, 14:22:10 UTC | Remove duplicated code Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 27 November 2014, 14:33:55 UTC |
| 67eb85d | Matt Caswell | 27 November 2014, 10:15:47 UTC | Tidy up ocsp help output Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 5e31a40f47c6bfd09c718d2af42ba8d8fe6bb932) Conflicts: apps/ocsp.c (cherry picked from commit e16458269036f4334525009906d346f68a73b2a4) | 27 November 2014, 14:21:42 UTC |
| 915a3b1 | André Guerreiro | 27 November 2014, 10:11:33 UTC | Add documentation on -timeout option in the ocsp utility PR#3612 Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit de87dd46c1283f899a9ecf4ccc72db74f36afbf2) (cherry picked from commit 4d3df37bc7fd33d0bec5da04d2572caa0cdbab75) | 27 November 2014, 14:21:42 UTC |
| e1b1d82 | Matt Caswell | 25 November 2014, 13:36:00 UTC | Fixed memory leak due to incorrect freeing of DTLS reassembly bit mask PR#3608 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 8a35dbb6d89a16d792b79b157b3e89443639ec94) | 26 November 2014, 10:18:15 UTC |
| c254566 | Matt Caswell | 25 November 2014, 17:23:24 UTC | Corrected comments in ssl.h about SSLv23_method and friends PR#3574 Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 3a0765882c4b3b67960b7efb203570764dd4ed29) | 25 November 2014, 22:28:42 UTC |
| aaf9335 | Dr. Stephen Henson | 01 November 2014, 00:10:56 UTC | Fix cross reference table generator. If the hash or public key algorithm is "undef" the signature type will receive special handling and shouldn't be included in the cross reference table. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 55f7fb8848b6e4bec291724a479e1580d6f407d6) Conflicts: crypto/objects/obj_xref.h | 13 November 2014, 13:40:41 UTC |
| cee17f9 | Alok Menghrajani | 11 November 2014, 22:39:11 UTC | Fixes a minor typo in the EVP docs. Out is the buffer which needs to contain at least inl + cipher_block_size - 1 bytes. Outl is just an int*. Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 5211e094dec9486a540ac480f345df1a8d2b2862) | 12 November 2014, 21:05:44 UTC |
| bd36615 | Michal Bozon | 12 November 2014, 15:59:04 UTC | Correct timestamp output when clock_precision_digits > 0 PR#3535 Reviewed-by: Stephen Henson <steve@openssl.org> | 12 November 2014, 20:55:32 UTC |
| db85611 | Matt Caswell | 12 November 2014, 11:18:09 UTC | Fix free of garbage pointer. PR#3595 Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit e04d426bf98ebb22abf0f15b6f09d333a6e8b2ad) | 12 November 2014, 20:33:24 UTC |
| 9e5267f | 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:18 UTC |
| 0d330ce | Samuel Neves | 03 October 2014, 23:13:36 UTC | Use only unsigned arithmetic in constant-time operations Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 28 October 2014, 19:54:34 UTC |
| 2a303a5 | Bodo Moeller | 21 October 2014, 20:41:07 UTC | Fix and improve SSL_MODE_SEND_FALLBACK_SCSV documentation. Reviewed-by: Rich Salz <rsalz@openssl.org> | 21 October 2014, 20:41:07 UTC |
| 8d81dfd | Bodo Moeller | 21 October 2014, 20:32:44 UTC | When processing ClientHello.cipher_suites, don't ignore cipher suites listed after TLS_FALLBACK_SCSV. RT: 3575 Reviewed-by: Emilia Kasper <emilia@openssl.org> | 21 October 2014, 20:32:44 UTC |
| 69c163a | Kurt Roeckx | 21 October 2014, 18:45:15 UTC | Keep old method in case of an unsupported protocol When we're configured with no-ssl3 and we receive an SSL v3 Client Hello, we set the method to NULL. We didn't used to do that, and it breaks things. This is a regression introduced in 62f45cc27d07187b59551e4fad3db4e52ea73f2c. Keep the old method since the code is not able to deal with a NULL method at this time. CVE-2014-3569, PR#3571 Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 392fa7a952e97d82eac6958c81ed1e256e6b8ca5) | 21 October 2014, 19:15:58 UTC |
| b7eaea7 | Tim Hudson | 20 October 2014, 05:12:17 UTC | no-ssl2 with no-ssl3 does not mean drop the ssl lib Reviewed-by: Geoff Thorpe <geoff@openssl.org> (cherry picked from commit c882abd52269a59ed8e0510e5febf667428ece85) | 20 October 2014, 05:25:13 UTC |
| 2d2965d | Andy Polyakov | 30 September 2014, 19:05:33 UTC | e_os.h: refine inline override logic (to address warnings in debug build). Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit 55c7a4cf112bf154ed405ee05a6b7924b6b1ba92) | 17 October 2014, 09:55:07 UTC |
| 56cee26 | Andy Polyakov | 24 September 2014, 22:32:56 UTC | e_os.h: allow inline functions to be compiled by legacy compilers. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 40155f408985aff2e9f1b61b7cb04a3e518633a1) | 17 October 2014, 09:55:02 UTC |
| e2e13b8 | Kurt Cancemi | 28 September 2014, 19:28:49 UTC | RT3547: Add missing static qualifier Reviewed-by: Ben Laurie <ben@openssl.org> (cherry picked from commit 87d388c955c14a7c1371f9c7555fb429a406a3d3) | 17 October 2014, 09:48:47 UTC |
| 13b2a4d | Matt Caswell | 15 October 2014, 12:52:37 UTC | Prepare for 1.0.0p-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 15 October 2014, 12:52:37 UTC |
| 41da918 | Matt Caswell | 15 October 2014, 12:52:08 UTC | Prepare for 1.0.0o release Reviewed-by: Stephen Henson <steve@openssl.org> | 15 October 2014, 12:52:08 UTC |
| e9fe4b1 | Matt Caswell | 15 October 2014, 11:29:06 UTC | Updates to NEWS Reviewed-by: Dr Stephen Henson <steve@openssl.org> | 15 October 2014, 12:49:50 UTC |
| 6469c94 | Matt Caswell | 15 October 2014, 09:50:25 UTC | Update to CHANGES file Reviewed-by: Bodo Möller <bodo@openssl.org> | 15 October 2014, 12:49:50 UTC |
| 9bf3ff1 | Geoff Thorpe | 15 October 2014, 07:25:50 UTC | Fix no-ssl3 configuration option CVE-2014-3568 Reviewed-by: Emilia Kasper <emilia@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> | 15 October 2014, 12:49:50 UTC |
| 74f77d4 | Dr. Stephen Henson | 15 October 2014, 01:01:16 UTC | Fix for session tickets memory leak. CVE-2014-3567 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 15 October 2014, 12:49:50 UTC |
| 55513f3 | Bodo Moeller | 15 October 2014, 12:47:17 UTC | Fix SSL_R naming inconsistency. Reviewed-by: Tim Hudson <tjh@openssl.org> | 15 October 2014, 12:47:17 UTC |
| c8dd719 | Tim Hudson | 25 September 2014, 06:04:35 UTC | Add constant_time_locl.h to HEADERS, so the Win32 compile picks it up correctly. Reviewed-by: Richard Levitte <levitte@openssl.org> | 15 October 2014, 09:32:17 UTC |
| 0bfd0bf | Richard Levitte | 25 September 2014, 04:47:23 UTC | Add the constant time test to the VMS build and tests Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: test/maketests.com test/tests.com | 15 October 2014, 09:32:17 UTC |
| eb26952 | Richard Levitte | 24 September 2014, 20:59:37 UTC | Include "constant_time_locl.h" rather than "../constant_time_locl.h". The different -I compiler parameters will take care of the rest... Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: crypto/evp/evp_enc.c | 15 October 2014, 09:32:17 UTC |
| 802feda | Richard Levitte | 16 June 2014, 11:24:04 UTC | Spaces were added in some strings for better readability. However, those spaces do not belong in file names, so when picking out the individual parts, remove the spaces Reviewed-by: Tim Hudson <tjh@openssl.org> | 15 October 2014, 09:32:17 UTC |
| cdad6ad | Richard Levitte | 06 August 2014, 02:37:27 UTC | Adjust VMS build to Unix build. Most of all, make it so the disabled algorithms MD2 and RC5 don't get built. Also, disable building the test apps in crypto/des and crypto/pkcs7, as they have no support at all. Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: crypto/crypto-lib.com makevms.com ssl/ssl-lib.com | 15 October 2014, 09:32:17 UTC |
| 4eca4cf | Richard Levitte | 18 June 2014, 11:41:54 UTC | Make sure test/tests.com exit gracefully, even when openssl.exe wasn't properly built. Reviewed-by: Tim Hudson <tjh@openssl.org> | 15 October 2014, 09:32:17 UTC |
| 7e29be2 | Richard Levitte | 14 June 2014, 13:13:44 UTC | Make sure that disabling the MAYLOSEDATA3 warning is only done when the compiler supports it. Otherwise, there are warnings about it lacking everywhere, which is quite tedious to read through while trying to check for other warnings. Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: ssl/ssl-lib.com | 15 October 2014, 09:32:15 UTC |
| 8745c08 | Bodo Moeller | 15 October 2014, 09:14:34 UTC | Add TLS_FALLBACK_SCSV documentation, and move s_client -fallback_scsv handling out of #ifndef OPENSSL_NO_DTLS1 section. Reviewed-by: Rich Salz <rsalz@openssl.org> | 15 October 2014, 09:14:34 UTC |
| 68828f1 | Bodo Moeller | 15 October 2014, 02:25:41 UTC | Oops -- fix typo in coment added with TLS_FALLBACK_SCSV support. Reviewed-by: Steve Henson <steve@openss.org> | 15 October 2014, 02:25:41 UTC |
| 59dcfa2 | Bodo Moeller | 15 October 2014, 02:05:57 UTC | Support TLS_FALLBACK_SCSV. Reviewed-by: Rich Salz <rsalz@openssl.org> | 15 October 2014, 02:05:57 UTC |
| 13f8dda | Matt Caswell | 03 October 2014, 22:48:49 UTC | Removed duplicate definition of PKCS7_type_is_encrypted Patch supplied by Matthieu Patou <mat@matws.net>, and modified to also remove duplicate definition of PKCS7_type_is_digest. PR#3551 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit e0fdea3e49e7454aa76bd5ecf3a3747641354c68) | 06 October 2014, 22:48:39 UTC |
| ad8b204 | Dr. Stephen Henson | 25 September 2014, 22:28:48 UTC | Add additional DigestInfo checks. Reencode DigestInto in DER and check against the original: this will reject any improperly encoded DigestInfo structures. Note: this is a precautionary measure, there is no known attack which can exploit this. Thanks to Brian Smith for reporting this issue. Reviewed-by: Tim Hudson <tjh@openssl.org> | 29 September 2014, 11:30:47 UTC |
| 7b7aef9 | Emilia Kasper | 25 September 2014, 11:39:21 UTC | Add missing tests Accidentally omitted from commit 455b65dfab0de51c9f67b3c909311770f2b3f801 Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit fdc35a9d3e8cf4cfd9330d5df9883f42cf5648ad) | 25 September 2014, 11:47:42 UTC |
| 9354029 | Dr. Stephen Henson | 20 September 2014, 00:00:55 UTC | Use correct function name: CMS_add1_signer() Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 5886354dcca4f8445ed35b6995a035b75409590c) | 24 September 2014, 23:07:26 UTC |
| 1db7287 | Andy Polyakov | 24 September 2014, 22:42:26 UTC | crypto/bn/bn_nist.c: work around MSC ARM compiler bug. RT: 3541 Reviewed-by: Emilia Kasper <emilia@openssl.org> (cherry picked from commit 8b07c005fe006044d0e4a795421447deca3c9f2c) | 24 September 2014, 22:48:40 UTC |
| b55ff31 | Emilia Kasper | 05 September 2014, 12:47:33 UTC | RT3425: constant-time evp_enc Do the final padding check in EVP_DecryptFinal_ex in constant time to avoid a timing leak from padding failure. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4aac102f75b517bdb56b1bcfd0a856052d559f6e) Conflicts: crypto/evp/evp_enc.c (cherry picked from commit 738911cde68b2b3706e502cf8daf5b14738f2f42) Conflicts: crypto/evp/evp_enc.c | 24 September 2014, 14:29:02 UTC |
| 9a6940a | Emilia Kasper | 04 September 2014, 11:04:42 UTC | RT3067: simplify patch (Original commit adb46dbc6dd7347750df2468c93e8c34bcb93a4b) Use the new constant-time methods consistently in s3_srvr.c Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 455b65dfab0de51c9f67b3c909311770f2b3f801) Conflicts: ssl/Makefile | 24 September 2014, 13:58:20 UTC |
| c36ceb0 | Adam Langley | 24 April 2013, 18:45:44 UTC | This change alters the processing of invalid, RSA pre-master secrets so that bad encryptions are treated like random session keys in constant time. (cherry picked from commit adb46dbc6dd7347750df2468c93e8c34bcb93a4b) Reviewed-by: Rich Salz <rsalz@openssl.org> | 24 September 2014, 13:56:09 UTC |
| 904fcce | Emilia Kasper | 28 August 2014, 17:43:49 UTC | RT3066: rewrite RSA padding checks to be slightly more constant time. Also tweak s3_cbc.c to use new constant-time methods. Also fix memory leaks from internal errors in RSA_padding_check_PKCS1_OAEP_mgf1 This patch is based on the original RT submission by Adam Langley <agl@chromium.org>, as well as code from BoringSSL and OpenSSL. Reviewed-by: Kurt Roeckx <kurt@openssl.org> Conflicts: crypto/rsa/rsa_oaep.c | 24 September 2014, 12:35:03 UTC |
| 2518a35 | Tim Hudson | 21 September 2014, 11:54:31 UTC | Fixed error introduced in commit f2be92b94dad3c6cbdf79d99a324804094cf1617 that fixed PR#3450 where an existing cast masked an issue when i was changed from int to long in that commit Picked up on z/linux (s390) where sizeof(int)!=sizeof(long) Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit b5ff559ff90124c6fd53bbb49dae5edb4e821e0a) | 21 September 2014, 20:32:42 UTC |
| 442ca2b | Adam Langley | 20 June 2014, 19:00:00 UTC | psk_client_callback, 128-byte id bug. Fix a bug in handling of 128 byte long PSK identity in psk_client_callback. OpenSSL supports PSK identities of up to (and including) 128 bytes in length. PSK identity is obtained via the psk_client_callback, implementors of which are expected to provide a NULL-terminated identity. However, the callback is invoked with only 128 bytes of storage thus making it impossible to return a 128 byte long identity and the required additional NULL byte. This CL fixes the issue by passing in a 129 byte long buffer into the psk_client_callback. As a safety precaution, this CL also zeroes out the buffer before passing it into the callback, uses strnlen for obtaining the length of the identity returned by the callback, and aborts the handshake if the identity (without the NULL terminator) is longer than 128 bytes. (Original patch amended to achieve strnlen in a different way.) Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit be0d851732bad7370640702bc9c4a33189ede287) | 05 September 2014, 10:25:20 UTC |
| 09e62af | Adam Langley | 23 April 2013, 16:13:51 UTC | Ensure that x**0 mod 1 = 0. (cherry picked from commit 2b0180c37fa6ffc48ee40caa831ca398b828e680) Reviewed-by: Ben Laurie <ben@openssl.org> | 04 September 2014, 14:07:16 UTC |
| 88f0c97 | Richard Levitte | 14 August 2014, 23:24:34 UTC | Followup on RT3334 fix: make sure that a directory that's the empty string returns 0 with errno = ENOENT. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 360928b7d0f16dde70e26841bbf9e1af727e8b8f) | 03 September 2014, 20:26:19 UTC |
| 74f5307 | Phil Mesnier | 14 August 2014, 17:35:07 UTC | RT3334: Fix crypto/LPdir_win.c Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 6a14fe7576e7a14a46ba14df8be8fe478536b4fb) | 03 September 2014, 20:26:19 UTC |
| da8dd61 | Emilia Kasper | 28 August 2014, 17:45:55 UTC | Make the inline const-time functions static. "inline" without static is not correct as the compiler may choose to ignore it and will then either emit an external definition, or expect one. Reviewed-by: Geoff Thorpe <geoff@openssl.org> (cherry picked from commit 86f50b36e63275a916b147f9d8764e3c0c060fdb) | 02 September 2014, 13:25:04 UTC |
| 43711a5 | Andy Polyakov | 30 August 2014, 17:17:09 UTC | md5-x86_64.pl: work around warning. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4d86e8df6be69ed13abb73fd564f1f894eea0a98) | 30 August 2014, 17:19:47 UTC |
| bf63eab | Rich Salz | 14 July 2014, 15:27:16 UTC | Add tags/TAGS Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 9d6253cfd3395dfe7147dae134579c6b16544c53) | 30 August 2014, 14:09:44 UTC |
| 62ca466 | Rich Salz | 18 August 2014, 17:00:51 UTC | RT2379: Bug in BIO_set_accept_port.pod The doc says that port can be "*" to mean any port. That's wrong. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 07e3b31fae98b985d3d2aad7066144b11833f688) | 29 August 2014, 20:46:44 UTC |
| 17d3b1e | Matt Caswell | 29 August 2014, 20:25:42 UTC | Fixed double inclusion of string.h PR2693 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 5d33b70ef5a4768fdfb77a73f9817c4570613039) | 29 August 2014, 20:38:03 UTC |
| 73729e4 | Emilia Kasper | 28 August 2014, 13:33:34 UTC | Constant-time utilities Pull constant-time methods out to a separate header, add tests. Reviewed-by: Bodo Moeller <bodo@openssl.org> (cherry picked from commit e7169a5835390d20057de8a19785982bd6a9b8c8) Conflicts: ssl/Makefile test/Makefile | 28 August 2014, 15:18:01 UTC |
| 05f61fb | Emilia Kasper | 25 August 2014, 10:38:16 UTC | Explicitly check for empty ASN.1 strings in d2i_ECPrivateKey The old code implicitly relies on the ASN.1 code returning a \0-prefixed buffer when the buffer length is 0. Change this to verify explicitly that the ASN.1 string has positive length. Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit 82dc08de54ce443c2a9ac478faffe79e76157795) | 27 August 2014, 17:42:31 UTC |
| 10be715 | Matt Caswell | 22 August 2014, 16:04:19 UTC | RT3065: automatically generate a missing EC public key When d2i_ECPrivateKey reads a private key with a missing (optional) public key, generate one automatically from the group and private key. Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit ed383f847156940e93f256fed78599873a4a9b28) Conflicts: doc/crypto/EC_KEY_new.pod | 27 August 2014, 17:42:24 UTC |
| e87a4a7 | Adam Langley | 23 April 2013, 19:12:36 UTC | RT3065: ec_private_key_dont_crash This change saves several EC routines from crashing when an EC_KEY is missing a public key. The public key is optional in the EC private key format and, without this patch, running the following through `openssl ec` causes a crash: -----BEGIN EC PRIVATE KEY----- MBkCAQEECAECAwQFBgcIoAoGCCqGSM49AwEH -----END EC PRIVATE KEY----- Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit b391570bdeb386d4fd325917c248d593d3c43930) | 27 August 2014, 17:42:09 UTC |
| f2a57c1 | Mihai Militaru | 26 August 2014, 16:35:54 UTC | RT2210: Add missing EVP_cleanup to example I also removed some trailing whitespace and cleaned up the "see also" list. Reviewed-by: Emilia Kasper <emilia@openssl.org> (cherry picked from commit 7b3e11c54466f1da8b707c932e308d345fd61101) | 27 August 2014, 17:27:24 UTC |
| b88ffa2 | David Gatwood | 26 August 2014, 17:02:03 UTC | RT1744: SSL_CTX_set_dump_dh() doc feedback The description of when the server creates a DH key is confusing. This cleans it up. (rsalz: also removed trailing whitespace.) Reviewed-by: Viktor Dukhovni <viktor@openssl.org> | 26 August 2014, 17:40:16 UTC |
| 27b0494 | Jan Schaumann | 15 August 2014, 03:00:44 UTC | RT1804: fix EXAMPLE in EVP_EncryptInit.pod The EXAMPLE that used FILE and RC2 doesn't compile due to a few minor errors. Tweak to use IDEA and AES-128. Remove examples about RC2 and RC5. Reviewed-by: Emilia Kasper <emilia@openssl.org> | 25 August 2014, 14:27:20 UTC |
| d38dcaf | Matt Caswell | 24 July 2014, 05:00:11 UTC | Typo fixes to evp documentation. This patch was submitted by user "Kox" via the wiki Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 2dd8cb3b9593f528d9537aa6a003d5c93df1e3c5) | 24 August 2014, 20:27:11 UTC |
| b0873db | Adam Langley | 19 August 2014, 15:57:53 UTC | RT3060: Limit the number of empty records. Limit the number of empty records that will be processed consecutively in order to prevent ssl3_get_record from never returning. Reported by "oftc_must_be_destroyed" and George Kadianakis. Reviewed-by: Bodo Moeller <bodo@openssl.org> (cherry picked from commit 3aac17a82fbaf2bc23ee62f24611e5883d3e7b97) | 22 August 2014, 13:53:26 UTC |
| 48ae65b | Adam Langley | 21 February 2013, 22:11:55 UTC | RT3061: Don't SEGFAULT when trying to export a public DSA key as a private key. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit e19c93811f0db499c98d2888f1c0c0ab65e6238a) | 22 August 2014, 13:25:30 UTC |
| dd5d744 | Emilia Kasper | 22 August 2014, 11:16:55 UTC | Improve EVP_PKEY_sign documentation Clarify the intended use of EVP_PKEY_sign. Make the code example compile. Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit d64c533a207f7b6d86c3bc8ffb053e5f4d0c1ca0) | 22 August 2014, 13:06:26 UTC |
| 4ff9cbe | Emilia Kasper | 19 August 2014, 11:18:07 UTC | define inline for Visual Studio In Visual Studio, inline is available in C++ only, however __inline is available for C, see http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit f511b25a7370c775dc9fd6198dbacd1706cf242b) | 21 August 2014, 14:08:05 UTC |
| e164b34 | Adam Langley | 03 June 2013, 19:45:11 UTC | Add volatile qualifications to two blocks of inline asm to stop GCC from eliminating them as dead code. Both volatile and "memory" are used because of some concern that the compiler may still cache values across the asm block without it, and because this was such a painful debugging session that I wanted to ensure that it's never repeated. (cherry picked from commit 7753a3a68431aa81b82beea4c3f5374b41454679) Conflicts: crypto/bn/asm/x86_64-gcc.c Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit a90b1e32d2f697d1aa39b49038469e2ea40d5e7b) | 19 August 2014, 15:11:14 UTC |
| 679d0c8 | Matt Caswell | 26 July 2014, 22:47:40 UTC | Fixed out-of-bounds read errors in ssl3_get_key_exchange. PR#3450 Conflicts: ssl/s3_clnt.c Reviewed-by: Emilia Käsper <emilia@openssl.org> | 15 August 2014, 22:30:11 UTC |
| 1d5e58b | Bodo Moeller | 13 August 2014, 15:37:19 UTC | Further improve/fix ec_GFp_simple_points_make_affine (ecp_smpl.c) and group_order_tests (ectest.c). Also fix the EC_POINTs_mul documentation (ec.h). Reviewed-by: emilia@openssl.org Conflicts: crypto/ec/ectest.c | 13 August 2014, 15:56:18 UTC |
| 1181498 | Matt Caswell | 06 August 2014, 21:25:27 UTC | Prepare for 1.0.0o-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 06 August 2014, 21:25:27 UTC |
| bb50531 | Matt Caswell | 06 August 2014, 21:24:50 UTC | Prepare for 1.0.0n release Reviewed-by: Stephen Henson <steve@openssl.org> | 06 August 2014, 21:24:50 UTC |
| f5fc85d | Matt Caswell | 06 August 2014, 21:24:50 UTC | make update Reviewed-by: Stephen Henson <steve@openssl.org> | 06 August 2014, 21:24:50 UTC |
| 6e4929f | Matt Caswell | 06 August 2014, 20:22:27 UTC | Updates to CHANGES and NEWS Reviewed-by: Kurt Roeckx <kurt@openssl.org> | 06 August 2014, 20:34:00 UTC |
| 03a12c1 | Gabor Tyukasz | 23 July 2014, 21:42:06 UTC | Fix race condition in ssl_parse_serverhello_tlsext CVE-2014-3509 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 57b0c46 | Emilia Kasper | 02 July 2014, 17:02:33 UTC | Fix OID handling: - Upon parsing, reject OIDs with invalid base-128 encoding. - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function. CVE-2014-3508 Reviewed-by: Dr. Stephen Henson <steve@openssl.org> Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 9fd3555 | Emilia Käsper | 24 July 2014, 20:15:29 UTC | Fix DTLS anonymous EC(DH) denial of service CVE-2014-3510 Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 67e53f7 | David Benjamin | 23 July 2014, 20:32:21 UTC | Fix protocol downgrade bug in case of fragmented packets CVE-2014-3511 Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Bodo Möller <bodo@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 2281d10 | Adam Langley | 06 June 2014, 21:47:07 UTC | Remove some duplicate DTLS code. In a couple of functions, a sequence number would be calculated twice. Additionally, in |dtls1_process_out_of_seq_message|, we know that |frag_len| <= |msg_hdr->msg_len| so the later tests for |frag_len < msg_hdr->msg_len| can be more clearly written as |frag_len != msg_hdr->msg_len|, since that's the only remaining case. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 06 August 2014, 20:30:39 UTC |
| e5861c8 | Matt Caswell | 24 July 2014, 22:54:28 UTC | Applying same fix as in dtls1_process_out_of_seq_message. A truncated DTLS fragment would cause *ok to be clear, but the return value would still be the number of bytes read. Problem identified by Emilia Käsper, based on previous issue/patch by Adam Langley. Reviewed-by: Emilia Käsper <emilia@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 60be115 | Adam Langley | 06 June 2014, 21:44:20 UTC | Fix return code for truncated DTLS fragment. Previously, a truncated DTLS fragment in |dtls1_process_out_of_seq_message| would cause *ok to be cleared, but the return value would still be the number of bytes read. This would cause |dtls1_get_message| not to consider it an error and it would continue processing as normal until the calling function noticed that *ok was zero. I can't see an exploit here because |dtls1_get_message| uses |s->init_num| as the length, which will always be zero from what I can see. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 5ee775a | Adam Langley | 06 June 2014, 21:30:33 UTC | Fix memory leak from zero-length DTLS fragments. The |pqueue_insert| function can fail if one attempts to insert a duplicate sequence number. When handling a fragment of an out of sequence message, |dtls1_process_out_of_seq_message| would not call |dtls1_reassemble_fragment| if the fragment's length was zero. It would then allocate a fresh fragment and attempt to insert it, but ignore the return value, leaking the fragment. This allows an attacker to exhaust the memory of a DTLS peer. Fixes CVE-2014-3507 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 06 August 2014, 20:30:39 UTC |
| 934ca07 | Matt Caswell | 06 June 2014, 21:25:52 UTC | Fix DTLS handshake message size checks. In |dtls1_reassemble_fragment|, the value of |msg_hdr->frag_off+frag_len| was being checked against the maximum handshake message size, but then |msg_len| bytes were allocated for the fragment buffer. This means that so long as the fragment was within the allowed size, the pending handshake message could consume 16MB + 2MB (for the reassembly bitmap). Approx 10 outstanding handshake messages are allowed, meaning that an attacker could consume ~180MB per DTLS connection. In the non-fragmented path (in |dtls1_process_out_of_seq_message|), no check was applied. Fixes CVE-2014-3506 Wholly based on patch by Adam Langley with one minor amendment. Reviewed-by: Emilia Käsper <emilia@openssl.org> | 06 August 2014, 20:30:39 UTC |
