| 61587d6 | Alessandro Ghedini | 08 October 2015, 12:39:58 UTC | Set salt length after the malloc has succeeded Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit c2319cf9fce87a2e82efb6e58ced11a85190dc3d) | 23 October 2015, 18:39:25 UTC |
| 71d5679 | Alessandro Ghedini | 08 October 2015, 12:38:57 UTC | Fix memory leaks and other mistakes on errors Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 3f6c7691870d1cd2ad0e0c83638cef3f35a0b548) | 23 October 2015, 18:38:52 UTC |
| 418c051 | Alessandro Ghedini | 08 October 2015, 12:37:21 UTC | Replace malloc+strlcpy with strdup Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 8acaabec429b39f9436f6a88006384d72d292539) | 23 October 2015, 18:38:47 UTC |
| 6a3dd58 | Alessandro Ghedini | 02 October 2015, 13:16:08 UTC | Do not treat 0 return value from BIO_get_fd() as error 0 is a valid file descriptor. RT#4068 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 4428c7dba8f6f407d915c1226f4e0f673e8be241) | 23 October 2015, 18:38:06 UTC |
| 2d404dc | Adam Eijdenberg | 19 October 2015, 18:16:25 UTC | Clarify return values for EVP_DigestVerifyFinal. Previous language was unclear. New language isn't pretty but I believe it is more accurate. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Ben Laurie <ben@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 8cbb048c3ea416f2bd8a3706d027f3aa26ef08d9) | 23 October 2015, 01:11:19 UTC |
| b259383 | Dr. Stephen Henson | 10 October 2015, 23:06:56 UTC | Typo. PR#4079 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit c69ce9351336f5b4a8b33890756b3fd185528210) Conflicts: crypto/evp/e_des3.c | 10 October 2015, 23:45:18 UTC |
| bfc1929 | Rich Salz | 09 October 2015, 18:14:34 UTC | Avoid SHA1 weakness In X509_cmp, if cert digest is equal, look at DER of the signed part. This is what master and 1.0.2 already do. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> | 09 October 2015, 21:06:21 UTC |
| 978b5d7 | Rich Salz | 09 October 2015, 03:31:29 UTC | Fix travis build for 1.0.1 Add explicit linux-clang targets Add --strict-warnings support for clang Disable mingw debug builds Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> | 09 October 2015, 03:31:29 UTC |
| ec1f125 | Matt Caswell | 08 October 2015, 12:36:10 UTC | Don't treat a bare OCTETSTRING as DigestInfo in int_rsa_verify The function int_rsa_verify is an internal function used for verifying an RSA signature. It takes an argument |dtype| which indicates the digest type that was used. Dependant on that digest type the processing of the signature data will vary. In particular if |dtype == NID_mdc2| and the signature data is a bare OCTETSTRING then it is treated differently to the default case where the signature data is treated as a DigestInfo (X509_SIG). Due to a missing "else" keyword the logic actually correctly processes the OCTETSTRING format signature first, and then attempts to continue and process it as DigestInfo. This will invariably fail because we already know that it is a bare OCTETSTRING. This failure doesn't actualy make a real difference because it ends up at the |err| label regardless and still returns a "success" result. This patch just cleans things up to make it look a bit more sane. RT#4076 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit dffe51091f412dcbc18f6641132f0b4f0def6bce) | 08 October 2015, 13:17:08 UTC |
| 363c8fd | Richard Levitte | 08 October 2015, 09:53:07 UTC | When ENGINE_add finds that id or name is missing, actually return Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 5850cc75ea0c1581a9034390f1ca77cadc596238) | 08 October 2015, 10:41:06 UTC |
| 91dc449 | Pascal Cuoq | 05 May 2015, 09:20:39 UTC | Move BN_CTX_start() call so the error case can always call BN_CTX_end(). Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Rich Salz <rsalz@openssl.org> MR #1231 (cherry picked from commit 99c203337574d967c86ffbfa13f40ace51048485) | 07 October 2015, 18:41:34 UTC |
| 11ca27c | Pascal Cuoq | 06 May 2015, 09:31:27 UTC | Set flags to 0 before calling BN_with_flags() BN_with_flags() will read the dest->flags to keep the BN_FLG_MALLOCED but overwrites everything else. Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Rich Salz <rsalz@openssl.org> MR #1231 (cherry picked from commit f92768e6f5259069bd21dbed2b98b3423c1dfca4) | 07 October 2015, 18:41:15 UTC |
| a0ba92c | Dr. Stephen Henson | 06 October 2015, 13:15:14 UTC | Don't try and parse boolean type. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit e58c4d3cdde7a0a01df2884bfeec31a2b07be22d) | 06 October 2015, 14:16:50 UTC |
| f141376 | Matt Caswell | 05 October 2015, 13:12:05 UTC | Change functions to pass in a limit rather than calculate it Some extension handling functions were passing in a pointer to the start of the data, plus the length in order to calculate the end, rather than just passing in the end to start with. This change makes things a little more readable. Reviewed-by: Emilia Käsper <emilia@openssl.org> Conflicts: ssl/s3_srvr.c ssl/ssl_locl.h ssl/t1_lib.c | 05 October 2015, 18:52:38 UTC |
| e4840c8 | Alessandro Ghedini | 02 October 2015, 12:38:30 UTC | Validate ClientHello extension field length RT#4069 Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 05 October 2015, 18:48:28 UTC |
| 67d4253 | Kurt Roeckx | 29 September 2015, 17:59:48 UTC | Fix more d2i cases to properly update the input pointer Thanks to David Benjamin <davidben@google.com> for pointing them out. Reviewed-by: Steve Henson <steve@openssl.org> MR #1198 (cherry picked from commit 605236f6a8fe0743af2f63d93239a74c69dae137) | 03 October 2015, 11:36:31 UTC |
| 978c8aa | Dr. Stephen Henson | 28 September 2015, 13:14:10 UTC | Link in applink with fips_premain_dso PR#4042 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit d62c64b947ae96463a331de005165c57966d2149) | 29 September 2015, 17:44:02 UTC |
| 72ac982 | Ismo Puustinen | 18 September 2015, 20:07:23 UTC | GH367: use random data if seed too short. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit 6f997dc36504d67d1339ceb6bce4ecba673d8568) | 29 September 2015, 16:49:16 UTC |
| b0c8e38 | Hubert Kario | 17 September 2015, 12:42:27 UTC | RT4051: fix ciphers man page typo the alias supported by OpenSSL 1.0.1 is "EECDH" not "EECDHE" (GH PR 405) Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Andy Polyakov <appro@openssl.org> | 29 September 2015, 15:15:12 UTC |
| 64ec479 | Emilia Kasper | 23 September 2015, 17:29:18 UTC | RT2772: accept empty SessionTicket RFC 5077 section 3.3 says: If the server determines that it does not want to include a ticket after it has included the SessionTicket extension in the ServerHello, then it sends a zero-length ticket in the NewSessionTicket handshake message. Previously the client would fail upon attempting to allocate a zero-length buffer. Now, we have the client ignore the empty ticket and keep the existing session. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 21b538d616b388fa0ce64ef54da3504253895cf8) | 28 September 2015, 14:13:45 UTC |
| 7794c35 | Dr. Stephen Henson | 28 September 2015, 13:31:53 UTC | SRP memory leak fix Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 92ea6fe597238779e23fd9e1fee82d30641d61a8) | 28 September 2015, 13:34:47 UTC |
| dfa08ea | Rich Salz | 25 September 2015, 15:43:51 UTC | Fix typo in previous merge Reviewed-by: Tim Hudson <tjh@openssl.org> | 25 September 2015, 15:43:51 UTC |
| 2bd9186 | Rich Salz | 25 September 2015, 15:38:43 UTC | Change --debug to -d for compat with old releases. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 1d4ddb4e1a088f1333c4bb155c52c7f94e572bca) | 25 September 2015, 15:39:37 UTC |
| 456b982 | Emilia Kasper | 17 September 2015, 11:50:34 UTC | BUF_strdup and friends: update docs Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 58e3457a82e8940ff36b36949f9c7a60e7614b2c) (cherry picked from commit be250ee2d353a9c8ed858bf8ca274d3107ae2f64) | 22 September 2015, 18:09:42 UTC |
| e56c77b | 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) (cherry picked from commit f5afe9ce3f7ab8d2fef460054d1170427db0d02c) | 22 September 2015, 18:09:42 UTC |
| 6905187 | 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) (cherry picked from commit f61216ba9d17430fb5eb3e2b202a209960b9d51b) | 22 September 2015, 18:09:38 UTC |
| 9d1fcbe | 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:51 UTC |
| 21d8f24 | 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:33:06 UTC |
| f9394bd | 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:39 UTC |
| b2a6718 | 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:26:32 UTC |
| 34a0ead | 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) Conflicts: apps/s_server.c | 20 September 2015, 13:28:22 UTC |
| 2bc914e | 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:22:52 UTC |
| 2ab1e7f | 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:10:38 UTC |
| 628c150 | 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> (cherry picked from commit 6be18a22199de4d114b53686c31ba02723fc2c18) | 18 September 2015, 19:56:45 UTC |
| a50a8a7 | 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:33:31 UTC |
| 7ac2c47 | 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) (cherry picked from commit cb71f17dc786c72ec74c0ebb983b3ccfde484271) | 17 September 2015, 19:45:28 UTC |
| 76067c7 | 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) (cherry picked from commit 37faf117965de181f4de0b4032eecac2566de5f6) | 17 September 2015, 18:15:41 UTC |
| f95d1af | 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> (cherry picked from commit 929f6d6f55275b17cfdd5c405ef403bce87c9aef) | 16 September 2015, 17:12:04 UTC |
| 83fcd32 | Rich Salz | 15 September 2015, 16:01:30 UTC | RT4044: Remove .cvsignore files. Reviewed-by: Matt Caswell <matt@openssl.org> | 15 September 2015, 16:01:30 UTC |
| 1265015 | Rich Salz | 15 September 2015, 15:49:42 UTC | RT4044: Remove .cvsignore files. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 3be39dc1e3378d79531e385a72051c4dc5c6b34d) | 15 September 2015, 16:00:18 UTC |
| 8f42c34 | 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:15:03 UTC |
| 421baf1 | 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> (cherry picked from commit 2aa5a2c76656f3873fecd0f0bcc628c1861c27a9) | 12 September 2015, 01:43:36 UTC |
| 8b5ac90 | 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:58 UTC |
| 4cb23e1 | 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:33 UTC |
| dd642de | 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> (cherry picked from commit dc0c888811cebfa2d21c844be0d81335fb2361da) | 01 September 2015, 23:31:33 UTC |
| 927f7a8 | 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> (cherry picked from commit 9a931208d7fc8a3596dda005cdbd6439938f01b0) | 01 September 2015, 23:07:24 UTC |
| 525e136 | 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:55:47 UTC |
| 5999b89 | Emilia Kasper | 01 September 2015, 15:19:52 UTC | OpenSSL 1.0.1n: add missing CHANGES entry Reviewed-by: Rich Salz <rsalz@openssl.org> | 01 September 2015, 18:13:21 UTC |
| bae16c9 | 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:06:08 UTC |
| 9d4798a | 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:05:56 UTC |
| 246a010 | 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:52 UTC |
| 1915a22 | 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:06:29 UTC |
| a6ce498 | 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:47:12 UTC |
| d46e946 | 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:42 UTC |
| c88f65f | 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:21:04 UTC |
| fc90ab4 | 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:21:04 UTC |
| 8d677c1 | 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:21:04 UTC |
| cb53200 | 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) (cherry picked from commit 9c989aaa749d88b63bef5d5beeb3046eae62d836) | 31 August 2015, 14:53:37 UTC |
| 9a97446 | 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:25:44 UTC |
| 80c25ba | 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:36:44 UTC |
| eb55a6f | 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:09 UTC |
| be8b860 | 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:27:35 UTC |
| 86de216 | 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> | 25 August 2015, 16:15:03 UTC |
| bedcd93 | 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:13:11 UTC |
| 2507c8c | 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:25:27 UTC |
| 98e75c0 | 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:04:03 UTC |
| 2cf5145 | 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:38 UTC |
| 50e56c1 | 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> Conflicts: crypto/evp/evp_lib.c | 12 August 2015, 13:29:02 UTC |
| 2d17250 | 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:24:08 UTC |
| aa70162 | 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:23:48 UTC |
| 396e300 | 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:27:05 UTC |
| 402634f | 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:27:05 UTC |
| b11980d | 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:23:00 UTC |
| f15c99f | 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:23:00 UTC |
| 507ea77 | 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:52:09 UTC |
| 556803f | 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:21 UTC |
| 1a9a506 | 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> (cherry picked from commit 1a586b3942de1c0bd64203d09385d5e74f499d8d) | 31 July 2015, 17:38:48 UTC |
| 5030cc6 | 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> (cherry picked from commit d0c9a90640c8902fef3eb74e8ef05227f8e7dcb7) | 30 July 2015, 13:35:42 UTC |
| 721cbae | 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:47 UTC |
| 372e749 | 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:39:14 UTC |
| 728432a | 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:47:00 UTC |
| 8e75dcf | 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:14:02 UTC |
| 396a2dc | mancha | 15 July 2015, 08:54:28 UTC | Fix author credit for e5c0bc6 Reviewed-by: Richard Levitte <levitte@openssl.org> | 15 July 2015, 10:50:12 UTC |
| 001c957 | 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:50:12 UTC |
| 2507d84 | 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:33:26 UTC |
| 4327850 | 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:29 UTC |
| a027bba | Richard Levitte | 13 July 2015, 23:16:17 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:18:57 UTC |
| 13e742a | 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:52 UTC |
| 2794dec | 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:15:38 UTC |
| 2035e2d | 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:57 UTC |
| be85620 | 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:31:32 UTC |
| b5e972f | 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:34 UTC |
| a15ba3c | Dr. Stephen Henson | 09 July 2015, 15:56:45 UTC | Sort @sstacklst correctly. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2a7059c56f885a3fa0842e886f5178def8e5481d) | 09 July 2015, 15:58:07 UTC |
| 7c17c20 | Matt Caswell | 09 July 2015, 12:29:59 UTC | Prepare for 1.0.1q-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 09 July 2015, 12:29:59 UTC |
| 5ab53da | Matt Caswell | 09 July 2015, 12:22:23 UTC | Prepare for 1.0.1p release Reviewed-by: Stephen Henson <steve@openssl.org> | 09 July 2015, 12:22:23 UTC |
| 245daa2 | 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:32:04 UTC |
| cb22d2a | Matt Caswell | 23 June 2015, 23:12:38 UTC | Fix alt chains bug This is a follow up to the alternate chains certificate forgery issue (CVE-2015-1793). That issue is exacerbated in 1.0.1 by a related bug which means that we *always* check for an alternative chain, even if we have already found a chain. The code is supposed to stop as soon as it has found one (and does do in master and 1.0.2). Reviewed-by: Stephen Henson <steve@openssl.org> | 07 July 2015, 21:57:36 UTC |
| b3b1eb5 | 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, 21:52:36 UTC |
| d42d100 | Matt Caswell | 01 July 2015, 23:15:56 UTC | Add test for CVE-2015-1793 This adds a test for CVE-2015-1793. This adds a new test file verify_extra_test.c, which could form the basis for additional verification tests. Reviewed-by: Stephen Henson <steve@openssl.org> Conflicts: test/Makefile | 07 July 2015, 21:52:31 UTC |
| 9a0db45 | Matt Caswell | 24 June 2015, 14:55:36 UTC | Fix alternate chains certificate forgery issue During certificate verfification, OpenSSL will attempt to find an alternative certificate chain if the first attempt to build such a chain fails. An error in the implementation of this logic can mean that an attacker could cause certain checks on untrusted certificates to be bypassed, such as the CA flag, enabling them to use a valid leaf certificate to act as a CA and "issue" an invalid certificate. This occurs where at least one cert is added to the first chain from the trust store, but that chain still ends up being untrusted. In that case ctx->last_untrusted is decremented in error. Patch provided by the BoringSSL project. CVE-2015-1793 Reviewed-by: Stephen Henson <steve@openssl.org> | 07 July 2015, 21:50:04 UTC |
