| f5afe9c | Emilia Kasper | 17 September 2015, 11:27:05 UTC | BUF_strndup: tidy Fix comment, add another overflow check, tidy style Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit de8883e11befde31d9b6cfbbd1fc017c365e0bbf) | 22 September 2015, 18:04:01 UTC |
| f61216b | Alessandro Ghedini | 16 September 2015, 15:54:05 UTC | Make BUF_strndup() read-safe on arbitrary inputs BUF_strndup was calling strlen through BUF_strlcpy, and ended up reading past the input if the input was not a C string. Make it explicitly part of BUF_strndup's contract to never read more than |siz| input bytes. This augments the standard strndup contract to be safer. The commit also adds a check for siz overflow and some brief documentation for BUF_strndup(). Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 110f7b37de9feecfb64950601cc7cec77cf6130b) | 22 September 2015, 18:03:57 UTC |
| c038e6b | Rich Salz | 21 September 2015, 23:54:36 UTC | GH398: Add mingw cross-compile, etc. For all release branches. It adds travis build support. If you don't have a config file it uses the default (because we enabled travis for the project), which uses ruby/rake/rakefiles, and you get confusing "build still failing" messages. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit db9defdfe306e1adf0af7188b187d535eb0268da) | 22 September 2015, 17:46:06 UTC |
| 0ea050e | David Woodhouse | 09 September 2015, 19:49:01 UTC | RT3479: Add UTF8 support to BIO_read_filename() If we use BIO_new_file(), on Windows it'll jump through hoops to work around their unusual charset/Unicode handling. it'll convert a UTF-8 filename to UCS-16LE and attempt to use _wfopen(). If you use BIO_read_filename(), it doesn't do this. Shouldn't it be consistent? It would certainly be nice if SSL_use_certificate_chain_file() worked. Also made BIO_C_SET_FILENAME work (rsalz) Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit ff03599a2f518dbdf13bca0bb0208e431b892fe9) | 21 September 2015, 21:31:58 UTC |
| d601b9b | Gunnar Kudrjavets | 27 April 2015, 18:14:45 UTC | RT3823: Improve the robustness of event logging There are a couple of minor fixes here: 1) Handle the case when RegisterEventSource() fails (which it may for various reasons) and do the work of logging the event only if it succeeds. 2) Handle the case when ReportEvent() fails and do our best in debug builds to at least attempt somehow indicate that something has gone wrong. The typical situation would be someone running tools like DbMon, DBWin32, DebugView or just having the debugger attached. The intent is to make sure that at least some data will be captured so that we can save hours and days of debugging time. 3) Minor fix to change the MessageBox() flag to MB_ICONERROR. Though the value of MB_ICONERROR is the same value as MB_ICONSTOP, the intent is better conveyed by using MB_ICONERROR. Testing performed: 1) Clean compilation for debug-VC-WIN32 and VC-WIN32. 2) Good test results (nmake -f ms\ntdll.mak test) for debug-VC-WIN32 and VC-WIN32. 3) Stepped through relevant changes using WinDBG and exercised the impacted code paths. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 4cd94416a452c3a3e0df24c297f7d2f0e6d5bb5f) | 21 September 2015, 18:36:26 UTC |
| b21b330 | Matt Caswell | 16 September 2015, 09:24:37 UTC | Fix SRP memory leaks There were some memory leaks in the creation of an SRP verifier (both on successful completion and also on some error paths). Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit bf95cde28712cfcad90cb3975cdcb8e5c0f20fde) | 21 September 2015, 09:23:25 UTC |
| 325bb1a | Dr. Stephen Henson | 13 September 2015, 18:04:58 UTC | Handle SSL_ERROR_WANT_X509_LOOKUP Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f1c412c9e63f7c9cac2c723bff09cce563dda1b0) | 20 September 2015, 13:21:18 UTC |
| 2e3a21e | Dr. Stephen Henson | 12 September 2015, 01:37:48 UTC | Make SRP work with -www PR#3817 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4e7e623012e1604d985e2ef362c2957d464f3f01) | 20 September 2015, 13:21:17 UTC |
| 8748519 | Viktor Dukhovni | 19 September 2015, 01:15:42 UTC | Fix indentation Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 4fe1cbdff89768c5d1983988ce1022674a438bbb) | 19 September 2015, 13:09:14 UTC |
| 6be18a2 | Rich Salz | 18 September 2015, 01:53:43 UTC | This undoes GH367 for non-master Was only approved for master, to avoid compatibility issues on previous releases. Reviewed-by: Emilia Käsper <emilia@openssl.org> | 18 September 2015, 19:56:23 UTC |
| 197db21 | Matt Caswell | 16 September 2015, 09:47:15 UTC | Make sure OPENSSL_cleanse checks for NULL In master we have the function OPENSSL_clear_free(x,y), which immediately returns if x == NULL. In <=1.0.2 this function does not exist so we have to do: OPENSSL_cleanse(x, y); OPENSSL_free(x); However, previously, OPENSSL_cleanse did not check that if x == NULL, so the real equivalent check would have to be: if (x != NULL) OPENSSL_cleanse(x, y); OPENSSL_free(x); It would be easy to get this wrong during cherry-picking to other branches and therefore, for safety, it is best to just ensure OPENSSL_cleanse also checks for NULL. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 020d8fc83fe1a94232db1ee1166309e2458a8a18) | 17 September 2015, 21:31:24 UTC |
| cb71f17 | Emilia Kasper | 17 September 2015, 18:08:48 UTC | base64 decode: check for high bit Previously, the conversion would silently coerce to ASCII. Now, we error out. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit b785504a10310cb2872270eb409b70971be5e76e) | 17 September 2015, 19:45:06 UTC |
| 37faf11 | Emilia Kasper | 02 September 2015, 13:31:28 UTC | RT3757: base64 encoding bugs Rewrite EVP_DecodeUpdate. In particular: reject extra trailing padding, and padding in the middle of the content. Don't limit line length. Add tests. Previously, the behaviour was ill-defined, and depended on the position of the padding within the input. In addition, this appears to fix a possible two-byte oob read. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Dr Stephen Henson <steve@openssl.org> (cherry picked from commit 3cdd1e94b1d71f2ce3002738f9506da91fe2af45) | 17 September 2015, 18:12:34 UTC |
| 0711826 | Kurt Roeckx | 15 September 2015, 19:26:32 UTC | Fix return values when adding serverinfo fails. Reviewed-by: Rich Salz <rsalz@openssl.org> MR #1128 (cherry picked from commit fae11ec714ac8e71d95e824d7102ab5b2ec2e256) | 16 September 2015, 19:03:45 UTC |
| 929f6d6 | Ivo Raisr | 11 September 2015, 16:24:33 UTC | Make no-psk compile without warnings. PR#4035 Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Stephen Henson <steve@openssl.org> | 16 September 2015, 17:09:00 UTC |
| beb841c | Rich Salz | 15 September 2015, 16:01:30 UTC | RT4044: Remove .cvsignore files. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 83fcd322f7b398534fba7816ca3c0896f529c7c0) | 15 September 2015, 16:02:17 UTC |
| 3be39dc | Rich Salz | 15 September 2015, 15:49:42 UTC | RT4044: Remove .cvsignore files. Reviewed-by: Matt Caswell <matt@openssl.org> | 15 September 2015, 15:58:27 UTC |
| 728bcd5 | Kurt Roeckx | 14 September 2015, 22:07:02 UTC | d2i: don't update input pointer on failure Reviewed-by: Dr. Stephen Henson <steve@openssl.org> MR #1005 (cherry picked from commit a46c9789ce2aecedceef119e9883513c7a49f1ca) | 14 September 2015, 22:07:54 UTC |
| 5116aee | Dr. Stephen Henson | 12 September 2015, 00:53:52 UTC | Constify ECDSA_METHOD_new. PR#3920. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit aabd49232025807babe995006a46c4c7815ce868) | 12 September 2015, 01:47:40 UTC |
| 2aa5a2c | Dr. Stephen Henson | 11 September 2015, 23:44:07 UTC | Check for FIPS mode after loading config. PR#3958 Reviewed-by: Rich Salz <rsalz@openssl.org> | 12 September 2015, 00:02:23 UTC |
| eac2b83 | John Foley | 11 September 2015, 23:11:23 UTC | Use memmove instead of memcpy. PR#4036 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Stephen Henson <steve@openssl.org> | 11 September 2015, 23:11:23 UTC |
| ce5ae63 | Dr. Stephen Henson | 11 September 2015, 15:13:52 UTC | Use default field separator. If the field separator isn't specified through -nameopt then use XN_FLAG_SEP_CPLUS_SPC instead of printing nothing and returing an error. PR#2397 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 03706afa30aeb4407287171a9d6f9a765395d0a2) | 11 September 2015, 19:52:17 UTC |
| 4dcdde1 | Emilia Kasper | 01 September 2015, 14:31:55 UTC | RT3754: check for NULL pointer Fix both the caller to error out on malloc failure, as well as the eventual callee to handle a NULL gracefully. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> | 10 September 2015, 15:23:02 UTC |
| 7b8a999 | Rich Salz | 08 September 2015, 15:37:05 UTC | Remove bogus CHANGES entries Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 08 September 2015, 15:37:05 UTC |
| 2df619b | Dr. Stephen Henson | 03 September 2015, 23:20:34 UTC | Match SUITEB strings at start of cipher list. PR#4009. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 13e228d6845aff7e454eea7c9ddd392ebfbd2868) Conflicts: ssl/ssl_ciph.c | 04 September 2015, 20:32:25 UTC |
| cef9dcb | Alessandro Ghedini | 19 August 2015, 22:12:29 UTC | Add initial Travis CI configuration Closes #63 Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Ben Laurie <ben@openssl.org> (cherry picked from commit 66c103bdaba21749555c8073a3f20b7741fa5869) | 03 September 2015, 16:40:25 UTC |
| 40d5689 | Viktor Dukhovni | 02 September 2015, 01:59:08 UTC | Cleaner handling of "cnid" in do_x509_check Avoid using cnid = 0, use NID_undef instead, and return early instead of trying to find an instance of that in the subject DN. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit fffc2faeb2b5cad4516cc624352d445284aa7522) | 02 September 2015, 14:02:10 UTC |
| 39c76ce | Viktor Dukhovni | 02 September 2015, 01:47:12 UTC | Better handling of verify param id peername field Initialize pointers in param id by the book (explicit NULL assignment, rather than just memset 0). In x509_verify_param_zero() set peername to NULL after freeing it. In x509_vfy.c's internal check_hosts(), avoid potential leak of possibly already non-NULL peername. This is only set when a check succeeds, so don't need to do this repeatedly in the loop. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit a0724ef1c9b9e2090bdd96b784f492b6a3952957) | 02 September 2015, 14:01:23 UTC |
| 0a1682d | Rich Salz | 27 August 2015, 04:10:55 UTC | RT3767: openssl_button.gif should be PNG No, we should just delete it. And updated the README Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 8db78781069697cfa30a2261413f33f5055a2838) | 02 September 2015, 01:38:27 UTC |
| 31472ac | Hiroyuki YAMAMORI | 26 August 2015, 14:06:22 UTC | Fix DTLS1.2 compression Backport of equivalent fix from master. The only compression method is stateful and hence incompatible with DTLS. The DTLS test was not working for DTLS1.2 Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 01 September 2015, 23:37:58 UTC |
| 28643a1 | Hiroyuki YAMAMORI | 26 August 2015, 14:04:09 UTC | Fix DTLS1.2 buffers Fix the setup of DTLS1.2 buffers to take account of the Header Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 01 September 2015, 23:37:58 UTC |
| dc0c888 | Matt Caswell | 05 August 2015, 12:33:52 UTC | Fix session resumption Commit f0348c842e7 introduced a problem with session resumption. The version for the session is fixed when the session is created. By moving the creation of the session earlier in the process the version is fixed *before* version negotiation has completed when processing the ServerHello on the client side. This fix updates the session version after version neg has completed. Reviewed-by: Emilia Käsper <emilia@openssl.org> | 01 September 2015, 23:29:00 UTC |
| 9a93120 | Matt Caswell | 16 June 2015, 18:17:24 UTC | Fix building with OPENSSL_NO_TLSEXT. Builds using no-tlsext in 1.0.0 and 0.9.8 are broken. This commit fixes the issue. The same commit is applied to 1.0.1 and 1.0.2 branches for code consistency. However this commit will not fix no-tlsext in those branches which have always been broken for other reasons. The commit is not applied to master at all, because no-tlsext has been completely removed from that branch. Based on a patch by Marc Branchaud <marcnarc@xiplink.com> Reviewed-by: Emilia Käsper <emilia@openssl.org> | 01 September 2015, 23:01:29 UTC |
| 41fe7d2 | Tim Zhang | 11 May 2015, 09:58:51 UTC | Fix the comment for POINT_CONVERSION_UNCOMPRESSED The |z| value should be 0x04 not 0x02 RT#3838 Signed-off-by: Matt Caswell <matt@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 91d2728b38b1df930f337e163816a0fc9580b6a6) | 01 September 2015, 22:53:48 UTC |
| cc42e4a | Emilia Kasper | 01 September 2015, 15:13:02 UTC | Add missing CHANGES entry for 1.0.2 Reviewed-by: Rich Salz <rsalz@openssl.org> | 01 September 2015, 18:12:28 UTC |
| 59793f5 | Emilia Kasper | 01 September 2015, 12:56:58 UTC | RT4002: check for NULL cipher in p12_crpt.c The NULL cipher case can't actually happen because we have no EVP_PBE_CTL combinations where cipher_nid is -1 and keygen is PKCS12_PBE_keyivgen. But make the code more obviously correct. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 394f7b6fcc38132b8ccff0a3253b9dd15640cfc0) | 01 September 2015, 18:03:04 UTC |
| 5f623eb | Emilia Kasper | 01 September 2015, 11:19:15 UTC | RT 3493: fix RSA test - Pass in the right ciphertext length to ensure we're indeed testing ciphertext corruption (and not truncation). - Only test one mutation per byte to not make the test too slow. - Add a separate test for truncated ciphertexts. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 25d6b3401ca40c9a2cbe5080449c1c2a37037777) | 01 September 2015, 18:02:54 UTC |
| 5425917 | Richard Levitte | 31 August 2015, 19:45:56 UTC | Ignore .dir-locals.el Because we recently encourage people to have a .dir-locals.el, it's a good idea to ignore it on a git level. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d7c02691a5e6f2716759eacb6f48c39f15ee57c8) | 31 August 2015, 23:19:46 UTC |
| cae70cf | mrpre | 28 August 2015, 08:12:51 UTC | check bn_new return value Slightly modified from the original PR. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit a7e974c7be90e2c9673e2ce6215a70f734eb8ad4) | 31 August 2015, 20:04:39 UTC |
| df1565e | Ben Kaduk | 28 August 2015, 16:41:50 UTC | GH367 follow-up, for more clarity Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 36ac7bc8a9c856bcdff6eecdaca128ccc5430a1e) | 31 August 2015, 17:46:30 UTC |
| cf633fa | Emilia Kasper | 31 August 2015, 13:51:27 UTC | BN_mod_exp_mont_consttime: check for zero modulus. Don't dereference |d| when |top| is zero. Also test that various BIGNUM methods behave correctly on zero/even inputs. Follow-up to b11980d79a52ec08844f08bea0e66c04b691840b Reviewed-by: Rich Salz <rsalz@openssl.org> | 31 August 2015, 17:33:03 UTC |
| 732a6b5 | Richard Levitte | 31 August 2015, 15:58:53 UTC | Remove auto-fill-mode Apparently, emacs sees changes to auto-fill-mode as insecure Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 6dc08048d93ff35de882878f190ae49aa698b5d2) | 31 August 2015, 16:20:24 UTC |
| 43613c0 | Richard Levitte | 31 August 2015, 15:25:17 UTC | Add an example .dir-locals.el This file, when copied to .dir-locals.el in the OpenSSL source top, will make sure that the CC mode style "OpenSSL-II" will be used for all C files. Additionally, I makes sure that tabs are never used as indentation character, regardless of the emacs mode, and that the fill column is 78. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 0927f0d822b1e0f55cb7d8bacf9004ad3495514b) | 31 August 2015, 16:20:24 UTC |
| 254b259 | Richard Levitte | 31 August 2015, 15:12:37 UTC | Add emacs CC mode style for OpenSSL This hopefully conforms closely enough to the current code style. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d9b3554b2d9724bc2d1621a026ddaf0223e2d191) | 31 August 2015, 16:20:24 UTC |
| 9c989aa | Emilia Kasper | 31 August 2015, 11:57:44 UTC | bntest: don't dereference the |d| array for a zero BIGNUM. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 4d04226c2ec7e7f69f6234def63631648e35e828) | 31 August 2015, 14:53:04 UTC |
| f21fb85 | Rich Salz | 28 August 2015, 21:49:30 UTC | Remove the "times" directory. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 9db0c91c39fb548c36d6c3c944f50d4c068eefb7) | 30 August 2015, 20:40:56 UTC |
| c8491de | Alessandro Ghedini | 28 August 2015, 03:07:07 UTC | GH354: Memory leak fixes Fix more potential leaks in X509_verify_cert() Fix memory leak in ClientHello test Fix memory leak in gost2814789 test Fix potential memory leak in PKCS7_verify() Fix potential memory leaks in X509_add1_reject_object() Refactor to use "goto err" in cleanup. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 55500ea7c46c27a150a46832e1260891aaad8e52) | 28 August 2015, 15:59:23 UTC |
| 1d7df23 | Ismo Puustinen | 08 August 2015, 02:14:47 UTC | GH367: Fix dsa keygen for too-short seed If the seed value for dsa key generation is too short (< qsize), return an error. Also update the documentation. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit f00a10b89734e84fe80f98ad9e2e77b557c701ae) | 28 August 2015, 15:22:34 UTC |
| a7cb67f | Hubert Kario | 31 July 2015, 17:02:07 UTC | GH351: -help text for some s_client/s_server flags add -help descriptions of -curves, -sigalgs, -client_sigalgs to s_client and s_server Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Tim Hudson <tjh@openssl.org> | 26 August 2015, 21:49:15 UTC |
| 6cc31d4 | David Brodski | 13 May 2014, 16:06:27 UTC | Fixed problem with multiple load-unload of comp zlib Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 8cbb153357896c4b224e0678550944f7851bc3b2) | 26 August 2015, 21:37:16 UTC |
| 06f6c55 | Viktor Dukhovni | 24 April 2014, 01:58:30 UTC | GH correct organizationalUnitName Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 208b2d541dcb3b8f62639d2a8cc5771af4ba8755) | 26 August 2015, 21:32:00 UTC |
| 2d07f60 | Alessandro Ghedini | 19 August 2015, 15:12:31 UTC | GH371: Print debug info for ALPN extension Also known as RT 4106 Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit b48357d9953decc43333979ca11ebc1500040f4e) | 26 August 2015, 11:09:27 UTC |
| 2f2295a | Matt Caswell | 13 August 2015, 09:06:30 UTC | Fix DTLS session ticket renewal A DTLS client will abort a handshake if the server attempts to renew the session ticket. This is caused by a state machine discrepancy between DTLS and TLS discovered during the state machine rewrite work. The bug can be demonstrated as follows: Start a DTLS s_server instance: openssl s_server -dtls Start a client and obtain a session but no ticket: openssl s_client -dtls -sess_out session.pem -no_ticket Now start a client reusing the session, but allow a ticket: openssl s_client -dtls -sess_in session.pem The client will abort the handshake. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit ee4ffd6fccd169775ba74afb1dbfecff48ee413d) Conflicts: ssl/d1_clnt.c | 26 August 2015, 09:23:53 UTC |
| 8e0b56b | Markus Rinne | 24 August 2015, 20:20:13 UTC | RT4019: Duplicate -hmac flag in dgst.pod Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 86de216da3ebea7f876a096e258cf4c9d219bc0a) | 25 August 2015, 16:15:29 UTC |
| d72c446 | Rich Salz | 24 August 2015, 19:25:14 UTC | GH372: Remove duplicate flags Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 32c5e0ba0f9097e9c788ed8402fcbf6646cd2c2d) | 25 August 2015, 16:12:59 UTC |
| b012b49 | Richard Levitte | 17 August 2015, 16:10:16 UTC | Add new types to indent.pro Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 3da9505dc02b0594633c73a11343f54bb5dbf536) | 17 August 2015, 16:24:33 UTC |
| 6786c70 | Rich Salz | 17 August 2015, 01:09:45 UTC | GH345: Remove stderr output Manually-cherry-picked since master varied a lot. Reviewed-by: Tim Hudson <tjh@openssl.org> | 17 August 2015, 01:09:45 UTC |
| 40356e4 | Rich Salz | 16 August 2015, 22:38:24 UTC | Move FAQ to the web. Best hope of keeping current. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 4f46473a86c9e3741203b22d4d401a3763583494) | 16 August 2015, 23:03:25 UTC |
| 3d23b2c | Dr. Stephen Henson | 17 June 2015, 00:13:40 UTC | Update docs. Clarify and update documention for extra chain certificates. PR#3878. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2fd7fb99dba9f56fbcb7ee1686bef30c7aef4754) | 14 August 2015, 05:35:20 UTC |
| 8d2e7c0 | Dr. Stephen Henson | 23 July 2015, 15:38:58 UTC | Documentation for SSL_check_chain() Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 6d5f8265ce6c4a8ed528462f519d9e8f2b7cfafd) | 14 August 2015, 05:25:43 UTC |
| 5635396 | Rich Salz | 14 August 2015, 12:21:19 UTC | Fix 1.0.2 build break Reviewed-by: Matt Caswell <matt@openssl.org> | 14 August 2015, 12:21:19 UTC |
| 25efcb4 | Ismo Puustinen | 08 August 2015, 02:11:28 UTC | GH364: Free memory on an error path Part of RT 3997 Per Ben, just jump to common exit code. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit cc2829e6641092abed8360433dbe67e883fd1cc6) | 13 August 2015, 16:15:22 UTC |
| 5859bc6 | Dr. Stephen Henson | 01 August 2015, 14:38:11 UTC | Return error for unsupported modes. PR#3974 PR#3975 Reviewed-by: Matt Caswell <matt@openssl.org> | 12 August 2015, 13:14:01 UTC |
| 056df45 | Dr. Stephen Henson | 01 August 2015, 14:37:44 UTC | Fix memory leak if setup fails. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 891eac4604b5f05413e59602fae1f11136f4719a) Conflicts: crypto/cms/cms_enc.c | 12 August 2015, 13:12:02 UTC |
| e9da866 | Dr. Stephen Henson | 01 August 2015, 14:37:01 UTC | Err isn't always malloc failure. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit a187e08d856690b5c1da3184d0ff560d572f893b) Conflicts: crypto/cms/cms_smime.c | 12 August 2015, 13:07:06 UTC |
| 0b12fa7 | Matt Caswell | 11 August 2015, 18:38:39 UTC | Fix "make test" seg fault with SCTP enabled When config'd with "sctp" running "make test" causes a seg fault. This is actually due to the way ssltest works - it dives under the covers and frees up BIOs manually and so some BIOs are NULL when the SCTP code does not expect it. The simplest fix is just to add some sanity checks to make sure the BIOs aren't NULL before we use them. This problem occurs in master and 1.0.2. The fix has also been applied to 1.0.1 to keep the code in sync. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit f75d5171be0b3b5419c8974133e1573cf976a8bb) | 11 August 2015, 21:22:38 UTC |
| b3a62dc | Matt Caswell | 11 August 2015, 18:36:43 UTC | Fix missing return value checks in SCTP There are some missing return value checks in the SCTP code. In master this was causing a compilation failure when config'd with "--strict-warnings sctp". Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit d8e8590ed90eba6ef651d09d77befb14f980de2c) | 11 August 2015, 21:22:38 UTC |
| 512368c | Matt Caswell | 10 August 2015, 11:00:29 UTC | Check for 0 modulus in BN_MONT_CTX_set The function BN_MONT_CTX_set was assuming that the modulus was non-zero and therefore that |mod->top| > 0. In an error situation that may not be the case and could cause a seg fault. This is a follow on from CVE-2015-1794. Reviewed-by: Richard Levitte <levitte@openssl.org> | 11 August 2015, 19:20:24 UTC |
| ada5774 | Guy Leaver (guleaver) | 07 August 2015, 14:45:21 UTC | Fix seg fault with 0 p val in SKE If a client receives a ServerKeyExchange for an anon DH ciphersuite with the value of p set to 0 then a seg fault can occur. This commits adds a test to reject p, g and pub key parameters that have a 0 value (in accordance with RFC 5246) The security vulnerability only affects master and 1.0.2, but the fix is additionally applied to 1.0.1 for additional confidence. CVE-2015-1794 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 11 August 2015, 19:20:17 UTC |
| 5d786e9 | David Woodhouse | 08 August 2015, 02:18:26 UTC | RT3998: fix X509_check_host.pod release to 1.0.2 Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Ben Laurie <ben@openssl.org> (cherry picked from commit 2bfbeb264573342bea475f6dbb5b4c7fec8fdb0a) | 08 August 2015, 22:14:31 UTC |
| 9ea70e5 | Anton Blanchard | 06 August 2015, 01:48:35 UTC | RT3990: Fix #include path. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 1125245997dac232a0c0867b6c858cda4e549c6d) | 06 August 2015, 02:06:22 UTC |
| 5438e17 | Matt Caswell | 09 July 2015, 15:37:54 UTC | Fix warning when compiling with no-ec2m EC_KEY_set_public_key_affine_coordinates was using some variables that only apply if OPENSSL_NO_EC2M is not defined. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 8d11b7c7ee84ad0aa243476088285d15b22c5470) | 04 August 2015, 09:47:54 UTC |
| 49cc3f4 | Dirk Wetter | 31 July 2015, 17:02:51 UTC | GH336: Return an exit code if report fails Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit e36ce2d986a5edbd33d6d176fb95c8046fae9725) | 01 August 2015, 18:33:09 UTC |
| a5e2634 | Loganaden Velvindron | 31 July 2015, 17:20:16 UTC | Clear BN-mont values when free'ing it. From a CloudFlare patch. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 31 July 2015, 17:33:37 UTC |
| b68fa4d | Rich Salz | 31 July 2015, 16:34:24 UTC | Various doc fixes from GH pull requests Thanks, folks! 348 Benjamin Kaduk 317 Christian Brueffer 254 Erik Tews 253 Erik Tews 219 Carl Mehner 155 (ghost) 95 mancha 51 DominikNeubauer (Manually picked from 59c554b36e39256ac2cfc34dca052453e10c6d9c) Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 31 July 2015, 16:34:24 UTC |
| 602af7d | Nicholas Cooper | 31 July 2015, 15:08:18 UTC | RT3959: Fix misleading comment Manual cherry-pick from main branch, since the header file moved in master. Reviewed-by: Matt Caswell <matt@openssl.org> | 31 July 2015, 15:08:41 UTC |
| d0c9a90 | Dr. Stephen Henson | 29 July 2015, 15:16:02 UTC | use X9.31 keygen by default in FIPS mode Reviewed-by: Matt Caswell <matt@openssl.org> | 30 July 2015, 13:34:45 UTC |
| 9e43fe9 | Matt Caswell | 29 July 2015, 22:20:56 UTC | Fix write failure handling in DTLS1.2 The DTLS code is supposed to drop packets if we try to write them out but the underlying BIO write buffers are full. ssl3_write_pending() contains an incorrect test for DTLS that controls this. The test only checks for DTLS1 so DTLS1.2 does not correctly clear the internal OpenSSL buffer which can later cause an assert to be hit. This commit changes the test to cover all DTLS versions. RT#3967 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 5e8b24dbfb98ed7c5b355cb6a959906a418e264b) | 30 July 2015, 09:18:43 UTC |
| 374fd38 | Martin Vejnar | 29 July 2015, 21:28:19 UTC | RT3774: double-free in DSA Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit fa4629b6a2518d202fd051f228c3d8770682b3be) | 30 July 2015, 01:21:35 UTC |
| 6b7d872 | Rich Salz | 28 July 2015, 16:41:36 UTC | Tweak README about rt and bug reporting. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 932af1617e277904bcca6e47729a420bba39785b) | 29 July 2015, 14:38:23 UTC |
| f0348c8 | Matt Caswell | 27 July 2015, 12:30:43 UTC | Fix SSL_set_session_ticket_ext when used with SSLv23_method The function SSL_set_session_ticket_ext can be used to set custom session ticket data passed in the initial ClientHello. This can be particularly useful for EAP-FAST. However, when using SSLv23_method, the session does not get created until the ServerHello has been received. The extension code will only add the SessionTicket data to the ClientHello if a session already exists. Therefore SSL_set_session_ticket_ext has no impact when used in conjunction with SSLv23_method. The solution is to simply create the session during creation of the ClientHello instead of waiting for the ServerHello. This commit fixes the test failure introduced by the previous commit. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> | 27 July 2015, 15:51:43 UTC |
| 09368c0 | Matt Caswell | 27 July 2015, 11:04:47 UTC | Add test for SSL_set_session_ticket_ext The function SSL_set_session_ticket_ext sets the ticket data to be sent in the ClientHello. This is useful for EAP-FAST. This commit adds a test to ensure that when this function is called the expected ticket data actually appears in the ClientHello. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> | 27 July 2015, 15:50:38 UTC |
| 4102d1a | Emilia Kasper | 23 July 2015, 11:20:21 UTC | rsaz_exp.h: align license with the rest of the contribution Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f4ee22be03bb8318b1e0f00e116be231ba12fdef) | 23 July 2015, 12:22:44 UTC |
| fd9631b | mancha | 15 July 2015, 08:54:28 UTC | Fix author credit for e5c0bc6 Reviewed-by: Richard Levitte <levitte@openssl.org> | 15 July 2015, 10:49:57 UTC |
| 405f43b | Rich Salz | 15 July 2015, 08:52:51 UTC | Revert "Missing perldoc markup around < literal" This reverts commit e5c0bc6cc49a23b50a272801c4bd53639c25fca4. Reviewed-by: Richard Levitte <levitte@openssl.org> | 15 July 2015, 10:49:57 UTC |
| 033b558 | Ernie Hershey | 15 July 2015, 03:08:44 UTC | GH322: Fix typo in generated comment. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit ad282e638b6824325fb83ecf7cde2e7996f52b79) | 15 July 2015, 07:32:50 UTC |
| 9e56a32 | GitHub User | 09 July 2015, 19:02:29 UTC | Missing perldoc markup around < literal Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit e5c0bc6cc49a23b50a272801c4bd53639c25fca4) | 14 July 2015, 05:33:14 UTC |
| 9f0b86c | Richard Levitte | 13 July 2015, 23:15:49 UTC | Conversion to UTF-8 where needed This leaves behind files with names ending with '.iso-8859-1'. These should be safe to remove. If something went wrong when re-encoding, there will be some files with names ending with '.utf8' left behind. Reviewed-by: Rich Salz <rsalz@openssl.org> | 13 July 2015, 23:17:45 UTC |
| 5a3ce86 | Richard Levitte | 13 July 2015, 14:50:16 UTC | Small script to re-encode files that need it to UTF-8 This requires 'iconv' and that 'file' can take the options '-b' and '-i'. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f608b4064d58ca4dfdfdfc921308b51cb96205e2) | 13 July 2015, 23:13:44 UTC |
| 8a1dbda | Richard Levitte | 13 July 2015, 13:48:57 UTC | Remove extra '; \' in apps/Makefile Fixes GH#330 Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit eeb97bce751296b2e04a92d00c0d0a792ba61834) Conflicts: apps/Makefile | 13 July 2015, 15:14:38 UTC |
| 0ed08a7 | Richard Levitte | 10 July 2015, 16:29:17 UTC | Set numeric IDs for tar as well Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit da24e6f8a05ea657684094e04c1a54efa04c2962) | 10 July 2015, 18:31:29 UTC |
| efb1a50 | Richard Levitte | 10 July 2015, 13:40:53 UTC | Stop using tardy Instead of piping through tardy, and possibly suffering from bugs in certain versions, use --transform, --owner and --group directly with GNU tar (we already expect that tar variant). Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 27f98436b9a84b94fbdd8e32960504634ae44cc0) Conflicts: Makefile.org | 10 July 2015, 15:30:35 UTC |
| ded7eee | Dr. Stephen Henson | 09 July 2015, 18:32:36 UTC | correct example Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2fc52c912a79eefe8610984bac5eed3a2589ee85) | 09 July 2015, 20:23:25 UTC |
| fdd6d00 | Peter Waltenberg | 09 July 2015, 18:57:30 UTC | Exit on error in ecparam Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 99dcd88035330d59ab40b5bc0f551aca7020cd30) | 09 July 2015, 19:43:23 UTC |
| 2a7059c | Dr. Stephen Henson | 09 July 2015, 15:56:45 UTC | Sort @sstacklst correctly. Reviewed-by: Rich Salz <rsalz@openssl.org> | 09 July 2015, 15:56:45 UTC |
| a7ef1e9 | Matt Caswell | 09 July 2015, 12:18:51 UTC | Prepare for 1.0.2e-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 09 July 2015, 12:18:51 UTC |
| 33dd083 | Matt Caswell | 09 July 2015, 12:03:09 UTC | Prepare for 1.0.2d release Reviewed-by: Stephen Henson <steve@openssl.org> | 09 July 2015, 12:03:09 UTC |
| 5627e0f | Matt Caswell | 02 July 2015, 14:38:32 UTC | Update CHANGES and NEWS for the new release Reviewed-by: Stephen Henson <steve@openssl.org> | 09 July 2015, 08:31:25 UTC |
| 9dee524 | Matt Caswell | 25 June 2015, 11:34:38 UTC | Add documentation for some missing verify options Fills in a couple of verify options that were lacking documentation. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 79a55b1f2796bf6471360e8b6ab131cdedca256e) Conflicts: doc/apps/verify.pod | 07 July 2015, 21:07:14 UTC |
| 692f07c | Matt Caswell | 25 June 2015, 08:47:15 UTC | Reject calls to X509_verify_cert that have not been reinitialised The function X509_verify_cert checks the value of |ctx->chain| at the beginning, and if it is NULL then it initialises it, along with the value of ctx->untrusted. The normal way to use X509_verify_cert() is to first call X509_STORE_CTX_init(); then set up various parameters etc; then call X509_verify_cert(); then check the results; and finally call X509_STORE_CTX_cleanup(). The initial call to X509_STORE_CTX_init() sets |ctx->chain| to NULL. The only place in the OpenSSL codebase where |ctx->chain| is set to anything other than a non NULL value is in X509_verify_cert itself. Therefore the only ways that |ctx->chain| could be non NULL on entry to X509_verify_cert is if one of the following occurs: 1) An application calls X509_verify_cert() twice without re-initialising in between. 2) An application reaches inside the X509_STORE_CTX structure and changes the value of |ctx->chain| directly. With regards to the second of these, we should discount this - it should not be supported to allow this. With regards to the first of these, the documentation is not exactly crystal clear, but the implication is that you must call X509_STORE_CTX_init() before each call to X509_verify_cert(). If you fail to do this then, at best, the results would be undefined. Calling X509_verify_cert() with |ctx->chain| set to a non NULL value is likely to have unexpected results, and could be dangerous. This commit changes the behaviour of X509_verify_cert() so that it causes an error if |ctx->chain| is anything other than NULL (because this indicates that we have not been initialised properly). It also clarifies the associated documentation. This is a follow up commit to CVE-2015-1793. Reviewed-by: Stephen Henson <steve@openssl.org> | 07 July 2015, 20:50:09 UTC |
