| 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 |
| f404943 | 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> | 07 July 2015, 20:48:55 UTC |
| 21376d8 | 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, 20:48:55 UTC |
| c0b674b | Dr. Stephen Henson | 09 June 2015, 22:17:06 UTC | Relax CCM tag check. In CCM mode don't require a tag before initialising decrypt: this allows the tag length to be set without requiring the tag. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 9cca7be11d62298b2af0722f94345012c86eaed4) | 06 July 2015, 17:35:35 UTC |
| a229c2b | Dr. Stephen Henson | 06 July 2015, 13:17:49 UTC | document -2 return value Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 5727582cf51e98e5e0faa435e7da2c8929533c0d) | 06 July 2015, 17:35:35 UTC |
| 3c66a66 | Dr. Stephen Henson | 01 July 2015, 22:40:03 UTC | Fix PSK handling. The PSK identity hint should be stored in the SSL_SESSION structure and not in the parent context (which will overwrite values used by other SSL structures with the same SSL_CTX). Use BUF_strndup when copying identity as it may not be null terminated. Reviewed-by: Tim Hudson <tjh@openssl.org> | 02 July 2015, 11:01:27 UTC |
| f8f75a7 | Dr. Stephen Henson | 25 June 2015, 14:07:25 UTC | Check for errors with SRP Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 5fced2395ddfb603a50fd1bd87411e603a59dc6f) | 29 June 2015, 18:21:15 UTC |
| 7c1dae5 | Dr. Stephen Henson | 24 June 2015, 11:28:50 UTC | Don't output bogus errors in PKCS12_parse PR#3923 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit ffbf304d4832bd51bb0618f8ca5b7c26647ee664) | 25 June 2015, 03:55:43 UTC |
| edbc905 | Dr. Stephen Henson | 17 June 2015, 14:51:41 UTC | Add docs for ssl verification parameter functions. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 77672802a665b26a44524a7a8091e56ee84bdf39) | 24 June 2015, 21:22:23 UTC |
| c00206c | Vitezslav Cizek | 16 June 2015, 19:57:59 UTC | GH297: Fix NAME section of SSL_CTX_use_serverinfo.pod Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Matt Caswell <matt@openssl.org> | 23 June 2015, 12:17:57 UTC |
| 4ce5ed5 | Rich Salz | 23 June 2015, 12:14:24 UTC | RT3682: Avoid double-free on OCSP parse error Found by Kurt Cancemi (Manual cherry-pick of f8e427154bbc0c33f29fa7aad001b1b655e5995b) Reviewed-by: Matt Caswell <matt@openssl.org> | 23 June 2015, 12:14:24 UTC |
| 295c629 | Russell Webb | 13 June 2015, 14:35:55 UTC | RT3856: Fix memory leaks in test code Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 2d540402aac7a05af9c99b58864d53c0201a0b42) | 23 June 2015, 12:04:19 UTC |
| c61bb1a | Richard Levitte | 23 June 2015, 01:03:10 UTC | make update Reviewed-by: Rich Salz <rsalz@openssl.org> | 23 June 2015, 01:03:10 UTC |
| f59186e | Richard Levitte | 22 June 2015, 23:55:46 UTC | Rearrange rsaz A small rearrangement so the inclusion of rsaz_exp.h would be unconditional, but what that header defines becomes conditional. This solves the weirdness where rsaz_exp.h gets in and out of the dependency list for bn_exp.c, depending on the present architecture. Reviewed-by: Rich Salz <rsalz@openssl.org> | 23 June 2015, 01:02:05 UTC |
| 0abf610 | Rich Salz | 22 June 2015, 23:26:50 UTC | RT3907-fix Typo in local variable name; introduced by previous fix. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit cc3f3fc2b1c94d65824ab8d69595b6d89b17cf8d) | 23 June 2015, 00:50:20 UTC |
| 57bd71b | Rich Salz | 13 June 2015, 21:18:47 UTC | RT3907: avoid "local" in testssl script Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 75ba5c58c6b3b3326a6c3198100830afa120e7c3) | 22 June 2015, 19:50:02 UTC |
| 4475451 | Rich Salz | 21 June 2015, 19:37:53 UTC | RT3917: add cleanup on an error path Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 7fba8407cc72e09dbd8d768100617286b0740b03) | 21 June 2015, 21:55:06 UTC |
| 220b951 | Richard Levitte | 21 June 2015, 19:35:59 UTC | Cleanup mttest.c : because we no longer use stdio here, don't include it Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 8ca96efd24b73f917837fdd45b1c22d7b8ff8cbd) | 21 June 2015, 20:12:07 UTC |
| 710e28e | Richard Levitte | 21 June 2015, 17:19:59 UTC | Add -ldl to the build of mttest.c Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d62c98c81c7b47b7b1878fd7e91e5fd33818faf0) | 21 June 2015, 20:12:07 UTC |
| 05d2083 | Richard Levitte | 21 June 2015, 17:16:50 UTC | Cleanup mttest.c : do not try to output reference counts when threads are done Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 964626957f79e07ed97756527cdc7e84007c60c9) | 21 June 2015, 20:12:07 UTC |
| 90ee3c1 | Richard Levitte | 21 June 2015, 17:13:57 UTC | Cleanup mttest.c : better error reporting when certs are missing Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 7a1789d254c561bd3024c971b5cfeeedd12d63f3) | 21 June 2015, 20:12:07 UTC |
| 7ef4650 | Richard Levitte | 21 June 2015, 17:12:33 UTC | Cleanup mttest.c : make ssl_method a pointer to const Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f4c73bfe0ab7a0e8f82fe2947c0f77fe3d98acab) Conflicts: crypto/threads/mttest.c | 21 June 2015, 20:12:07 UTC |
| 8ca2117 | Richard Levitte | 21 June 2015, 17:19:17 UTC | Cleanup mttest.c : more output changes More fprintf()s and printf()s to turn into BIO calls. Reviewed-by: Rich Salz <rsalz@openssl.org> | 21 June 2015, 20:12:07 UTC |
| 9007dfa | Richard Levitte | 21 June 2015, 17:11:43 UTC | Cleanup mttest.c : modernise output Construct bio_err and bio_stdout from file handles instead of FILE pointers, since the latter might not be implemented (when OPENSSL_NO_STDIO is defined). Convert all output to use BIO_printf. Change lh_foo to lh_SSL_SESSION_foo. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit bb8abd6735e198de36c1eb9098a7f1516d156220) Conflicts: crypto/threads/mttest.c | 21 June 2015, 20:12:07 UTC |
| 603bebc | Richard Levitte | 21 June 2015, 17:03:44 UTC | Cleanup mttest.c : modernise the threads setup Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 5c78e1835285ce4acdc7cc4f4c06aa7d6661c9b4) Conflicts: crypto/threads/mttest.c | 21 June 2015, 20:12:07 UTC |
| 56f0733 | Richard Levitte | 21 June 2015, 16:51:18 UTC | Cleanup mttest.c : remove MS_CALLBACK Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit a3f9286556d6d78c1800caae97a9328afb2557e6) | 21 June 2015, 20:12:07 UTC |
| 8e6bb99 | Rich Salz | 21 June 2015, 19:12:20 UTC | RT1688: Add dependencies for parallel make Backport to 1.0.1 and 1.0.2 to fix RT 3905 Reviewed-by: Richard Levitte <levitte@openssl.org> | 21 June 2015, 19:26:54 UTC |
| 8615d8b | Dr. Stephen Henson | 20 June 2015, 15:10:54 UTC | typo: should be OPENSSL_free Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit bc9567cdc9a56b5c904e075e3b929076c1e7583c) | 20 June 2015, 18:28:58 UTC |
| 4f0812c | Richard Levitte | 15 June 2015, 07:59:25 UTC | Make preprocessor error into real preprocessor error Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit b4f0d1a4a89b964dba80036a6348ca0a1913c526) | 16 June 2015, 11:13:49 UTC |
| 3bf9ada | Richard Levitte | 13 June 2015, 11:13:55 UTC | Remove one extraneous parenthesis Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 30cf91784bfde82622f79d87d17d20ce73329532) | 16 June 2015, 11:13:48 UTC |
| 54ae378 | Matt Caswell | 12 June 2015, 15:14:35 UTC | Prepare for 1.0.2d-dev Reviewed-by: Richard Levitte <levitte@openssl.org> | 12 June 2015, 15:14:35 UTC |
| 0ee5fcd | Matt Caswell | 12 June 2015, 15:10:40 UTC | Prepare for 1.0.2c release Reviewed-by: Richard Levitte <levitte@openssl.org> | 12 June 2015, 15:10:40 UTC |
| d4c1763 | Matt Caswell | 12 June 2015, 14:56:51 UTC | Updated CHANGES and NEWS entries for new release Reviewed-by: Richard Levitte <levitte@openssl.org> | 12 June 2015, 14:56:51 UTC |
| fe64245 | Adam Langley | 12 June 2015, 07:05:49 UTC | Allow a zero length extension block It is valid for an extension block to be present in a ClientHello, but to be of zero length. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> | 12 June 2015, 14:43:02 UTC |
| 1030f89 | Matt Caswell | 12 June 2015, 12:08:04 UTC | Fix ABI break with HMAC Recent HMAC changes broke ABI compatibility due to a new field in HMAC_CTX. This backs that change out, and does it a different way. Thanks to Timo Teras for the concept. Conflicts: crypto/hmac/hmac.c Reviewed-by: Richard Levitte <levitte@openssl.org> | 12 June 2015, 13:08:54 UTC |
| b6ed991 | Matt Caswell | 11 June 2015, 13:59:37 UTC | Prepare for 1.0.2c-dev Reviewed-by: Stephen Henson <steve@openssl.org> | 11 June 2015, 13:59:37 UTC |
| 7b560c1 | Matt Caswell | 11 June 2015, 13:55:38 UTC | Prepare for 1.0.2b release Reviewed-by: Stephen Henson <steve@openssl.org> | 11 June 2015, 13:55:38 UTC |
| c26bfad | Matt Caswell | 11 June 2015, 13:55:38 UTC | make update Reviewed-by: Stephen Henson <steve@openssl.org> | 11 June 2015, 13:55:38 UTC |
| 40b8eb7 | Andy Polyakov | 10 June 2015, 22:18:01 UTC | bn/bn_gf2m.c: avoid infinite loop wich malformed ECParamters. CVE-2015-1788 Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 4924b37ee01f71ae19c94a8934b80eeb2f677932) | 11 June 2015, 13:52:39 UTC |
| ab17f6b | Matt Caswell | 10 June 2015, 10:49:31 UTC | Update CHANGES and NEWS Updates to CHANGES and NEWS to take account of the latest security fixes. Reviewed-by: Rich Salz <rsalz@openssl.org> | 11 June 2015, 13:52:39 UTC |
| 7bc2aee | Emilia Kasper | 12 May 2015, 17:00:30 UTC | PKCS#7: Fix NULL dereference with missing EncryptedContent. CVE-2015-1790 Reviewed-by: Rich Salz <rsalz@openssl.org> | 11 June 2015, 13:52:39 UTC |
| 9bc3665 | Emilia Kasper | 08 April 2015, 14:56:43 UTC | Fix length checks in X509_cmp_time to avoid out-of-bounds reads. Also tighten X509_cmp_time to reject more than three fractional seconds in the time; and to reject trailing garbage after the offset. CVE-2015-1789 Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> | 11 June 2015, 13:52:39 UTC |
| aa5ab40 | Dr. Stephen Henson | 05 June 2015, 11:11:25 UTC | Fix infinite loop in CMS Fix loop in do_free_upto if cmsbio is NULL: this will happen when attempting to verify and a digest is not recognised. Reported by Johannes Bauer. CVE-2015-1792 Reviewed-by: Matt Caswell <matt@openssl.org> | 11 June 2015, 13:52:39 UTC |
| 8aa556e | Richard Levitte | 11 June 2015, 13:42:42 UTC | make update Reviewed-by: Matt Caswell <matt@openssl.org> | 11 June 2015, 13:51:16 UTC |
| 5ef5b9f | Richard Levitte | 11 June 2015, 13:41:25 UTC | Correction of make depend merge error $(PROGS) was mistakenly removed, adding it back. Reviewed-by: Matt Caswell <matt@openssl.org> | 11 June 2015, 13:51:16 UTC |
| d44f89c | Matt Caswell | 11 June 2015, 00:30:06 UTC | More ssl_session_dup fixes Fix error handling in ssl_session_dup, as well as incorrect setting up of the session ticket. Follow on from CVE-2015-1791. Thanks to LibreSSL project for reporting these issues. Conflicts: ssl/ssl_sess.c Reviewed-by: Tim Hudson <tjh@openssl.org> | 11 June 2015, 09:04:00 UTC |
| c35e138 | Andy Polyakov | 11 June 2015, 06:51:53 UTC | e_aes_cbc_hmac_sha*.c: address linker warning about OPENSSL_ia32cap_P size mismatch. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit f0fa5c8306236ce742168d664d53b1551649a47b) | 11 June 2015, 08:14:01 UTC |
| 57e477b | Kurt Roeckx | 18 April 2015, 17:15:48 UTC | Only allow a temporary rsa key exchange when they key is larger than 512. Reviewed-by: Rich Salz <rsalz@openssl.org> MR #838 | 10 June 2015, 22:06:06 UTC |
| 39a298a | Kurt Roeckx | 06 June 2015, 11:42:34 UTC | Properly check certificate in case of export ciphers. Reviewed-by: Rich Salz <rsalz@openssl.org> MR #838 | 10 June 2015, 22:06:06 UTC |
| 1fdf36f | Andy Polyakov | 01 June 2015, 20:51:33 UTC | gcm.c: address linker warning about OPENSSL_ia32cap_P size mismatch. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 75c4827dfe6f52ccd687a283e6108a88ba3b8ec4) | 10 June 2015, 21:58:07 UTC |
| 9dcab12 | Matt Caswell | 01 June 2015, 16:25:29 UTC | DTLS handshake message fragments musn't span packets It should not be possible for DTLS message fragments to span multiple packets. However previously if the message header fitted exactly into one packet, and the fragment body was in the next packet then this would work. Obviously this would fail if packets get re-ordered mid-flight. Reviewed-by: Tim Hudson <tjh@openssl.org> | 10 June 2015, 11:10:18 UTC |
| 3e8f9dc | Matt Caswell | 08 June 2015, 08:29:56 UTC | Fix leak in HMAC error path In the event of an error in the HMAC function, leaks can occur because the HMAC_CTX does not get cleaned up. Thanks to the BoringSSL project for reporting this issue. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit e43a13c807e42688c72c4f3d001112bf0a110464) | 10 June 2015, 10:06:05 UTC |
| 7cb79c7 | Matt Caswell | 04 June 2015, 13:22:00 UTC | EC_POINT_is_on_curve does not return a boolean The function EC_POINT_is_on_curve does not return a boolean value. It returns 1 if the point is on the curve, 0 if it is not, and -1 on error. Many usages within OpenSSL were incorrectly using this function and therefore not correctly handling error conditions. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 68886be7e2cd395a759fcd41d2cede461b68843d) | 10 June 2015, 09:49:06 UTC |
| d272599 | Matt Caswell | 30 April 2015, 14:20:25 UTC | Tighten extension handling This adds additional checks to the processing of extensions in a ClientHello to ensure that either no extensions are present, or if they are then they take up the exact amount of space expected. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Stephen Henson <steve@openssl.org> Conflicts: ssl/t1_lib.c | 10 June 2015, 09:24:49 UTC |
| b3c0247 | Matt Caswell | 30 April 2015, 13:51:10 UTC | Fix memory leaks in BIO_dup_chain() This fixes a memory leak that can occur whilst duplicating a BIO chain if the call to CRYPTO_dup_ex_data() fails. It also fixes a second memory leak where if a failure occurs after successfully creating the first BIO in the chain, then the beginning of the new chain was not freed. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Stephen Henson <steve@openssl.org> Conflicts: crypto/bio/bio_lib.c | 10 June 2015, 09:24:49 UTC |
| 23cd01e | Matt Caswell | 30 April 2015, 13:04:30 UTC | Replace memset with OPENSSL_cleanse() BUF_MEM_free() attempts to cleanse memory using memset immediately prior to a free. This is at risk of being optimised away by the compiler, so replace with a call to OPENSSL_cleanse() instead. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Stephen Henson <steve@openssl.org> | 10 June 2015, 09:24:30 UTC |
| dcad51b | Matt Caswell | 10 June 2015, 08:32:34 UTC | Fix Kerberos issue in ssl_session_dup The fix for CVE-2015-1791 introduced an error in ssl_session_dup for Kerberos. Reviewed-by: Tim Hudson <tjh@openssl.org> | 10 June 2015, 08:37:01 UTC |
| 80d586d | Richard Levitte | 09 June 2015, 21:06:23 UTC | When making libcrypto from apps or test, make sure to include engines For librypto to be complete, the stuff in both crypto/ and engines/ have to be built. Doing 'make test' or 'make apps' from a clean source tree failed to do so. Corrected by using the new 'build_libcrypto' in the top Makefile. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit acaff3b797f50a0a0e17a0be45b7fafad962004e) | 10 June 2015, 00:09:49 UTC |
| cbfec68 | Richard Levitte | 09 June 2015, 23:34:26 UTC | Add and rearrange building of libraries There's a need for a target that will build all of libcrypto, so let's add 'build_libcrypto' that does this. For ortogonality, let's also add 'build_libssl'. Have both also depend on 'libcrypto.pc' and 'libssl.pc' so those get built together with the libraries. This makes 'all' depend on fewer things directly. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 177b5f9c82e1152d6ce20a83556db629697fff65) Conflicts: Makefile.org | 10 June 2015, 00:09:39 UTC |
| 31909e7 | Jeffrey Walton | 07 June 2015, 01:52:56 UTC | Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 82c4d793181058de9fde5c9088fd400fdb7e01e3) | 09 June 2015, 00:21:23 UTC |
| 34cdff9 | Dr. Stephen Henson | 08 June 2015, 12:23:00 UTC | return correct NID for undefined object Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 0fb9990480919163cc375a2b6c0df1d8d901a77b) | 08 June 2015, 20:46:42 UTC |
| 05627d5 | Emilia Kasper | 08 June 2015, 13:04:28 UTC | Use CRYPTO_memcmp in s3_cbc.c Reviewed-by: Rich Salz <rsalz@openssl.org> | 08 June 2015, 13:04:28 UTC |
| ac32a77 | Emilia Kasper | 27 May 2015, 15:12:13 UTC | Use CRYPTO_memcmp when comparing authenticators Pointed out by Victor Vasiliev (vasilvv@mit.edu) via Adam Langley (Google). Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 1e4a355dcabe2f75df5bb8b41b394d37037169d2) | 08 June 2015, 13:01:14 UTC |
| f877da9 | Ben Laurie | 01 May 2015, 14:53:46 UTC | Use cc instead of gcc so either clang or gcc is used as appropriate. Add clang flags needed to keep it happy. Reviewed-by: Richard Levitte <levitte@openssl.org> | 05 June 2015, 10:15:11 UTC |
| ba9d44b | Kurt Roeckx | 30 May 2015, 17:20:12 UTC | Allow all curves when the client doesn't send an supported elliptic curves extension At least in the case of SSLv3 we can't send an extention. Reviewed-by: Matt Caswell <matt@openssl.org> MR #811 (cherry picked from commit 3c06513f3833d4692f620e2c03d7a840871c08a7) | 04 June 2015, 19:12:33 UTC |
| da5fab7 | Matt Caswell | 04 June 2015, 10:18:55 UTC | Remove misleading comment Remove a comment that suggested further clean up was required. DH_free() performs the necessary cleanup. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f3d889523ee84f1e87e4da0d59e2702a4bee7907) | 04 June 2015, 11:53:45 UTC |
| efd89aa | Matt Caswell | 04 June 2015, 10:16:16 UTC | Clean premaster_secret for GOST Ensure OPENSSL_cleanse() is called on the premaster secret value calculated for GOST. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit b7ee4815f2452c854cc859e8dda88f2673cdddea) Conflicts: ssl/s3_srvr.c | 04 June 2015, 11:53:43 UTC |
| 4e3dbe3 | Matt Caswell | 04 June 2015, 10:41:30 UTC | Clean Kerberos pre-master secret Ensure the Kerberos pre-master secret has OPENSSL_cleanse called on it. With thanks to the Open Crypto Audit Project for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org> | 04 June 2015, 10:44:39 UTC |
| 3610719 | Matt Caswell | 19 May 2015, 12:59:47 UTC | Fix off-by-one error in BN_bn2hex A BIGNUM can have the value of -0. The function BN_bn2hex fails to account for this and can allocate a buffer one byte too short in the event of -0 being used, leading to a one byte buffer overrun. All usage within the OpenSSL library is considered safe. Any security risk is considered negligible. With thanks to Mateusz Kocielski (LogicalTrust), Marek Kroemeke and Filip Palian for discovering and reporting this issue. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit c56353071d9849220714d8a556806703771b9269) Conflicts: crypto/bn/bn_print.c | 04 June 2015, 08:26:43 UTC |
| af3aa2b | Matt Caswell | 06 May 2015, 10:40:06 UTC | Fix DTLS session resumption The session object on the client side is initially created during construction of the ClientHello. If the client is DTLS1.2 capable then it will store 1.2 as the version for the session. However if the server is only DTLS1.0 capable then when the ServerHello comes back the client switches to using DTLS1.0 from then on. However the session version does not get updated. Therefore when the client attempts to resume that session the server throws an alert because of an incorrect protocol version. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 7322abf5cefdeb47c7d61f3b916c428bf2cd69b6) Conflicts: ssl/s3_clnt.c | 04 June 2015, 08:16:55 UTC |
| adba3b3 | Dr. Stephen Henson | 01 June 2015, 11:50:47 UTC | make update Reviewed-by: Matt Caswell <matt@openssl.org> | 03 June 2015, 14:18:20 UTC |
| ad0fb7f | Sergey Agievich | 01 June 2015, 11:48:27 UTC | Add funtions to set item_sign and item_verify PR#3872 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Stephen Henson <steve@openssl.org> | 03 June 2015, 14:18:14 UTC |
| b1d5b8a | Matt Caswell | 02 June 2015, 19:18:05 UTC | Fix compilation failure for some tool chains Some tool chains (e.g. android) do not define IP_PMTUDISC_PROBE, and so this build breaks. Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 133dce447b259e0bb93076bf5fd0ce475d16910a) | 02 June 2015, 22:38:03 UTC |
| fb22f74 | Annie Yousar | 03 May 2015, 13:05:47 UTC | RT3230: Better test for C identifier objects.pl only looked for a space to see if the name could be used as a C identifier. Improve the test to match the real C rules. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 591b7aef05b22cba09b179e5787a9bf40dfc9508) | 02 June 2015, 21:17:43 UTC |
| 858de87 | Richard Levitte | 31 May 2015, 15:47:31 UTC | Add the macro OPENSSL_SYS_WIN64 This is for consistency. Additionally, have its presence define OPENSSL_SYS_WINDOWS as well. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 3f131556d6678bc3754f1e6d98a9a5bfc24e368c) Conflicts: e_os2.h | 02 June 2015, 16:03:36 UTC |
| bd5b5b4 | Olaf Johansson | 02 June 2015, 11:41:35 UTC | GH249: Fix bad regexp in arg parsing. Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 8846adbd36c1de2b0d38a73ca32e28fde50083b8) | 02 June 2015, 15:25:24 UTC |
| 188f3f9 | Per Allansson | 02 June 2015, 08:38:28 UTC | Fix IP_MTU_DISCOVER typo The code in bss_dgram.c checks if IP_MTUDISCOVER is defined, where it should test for IP_MTU_DISCOVER RT#3888 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 0baaff1a76d4c91b9c1121059be63175454d7b03) | 02 June 2015, 11:59:11 UTC |
| 27c76b9 | Matt Caswell | 18 May 2015, 15:27:48 UTC | Fix race condition in NewSessionTicket If a NewSessionTicket is received by a multi-threaded client when attempting to reuse a previous ticket then a race condition can occur potentially leading to a double free of the ticket data. CVE-2015-1791 This also fixes RT#3808 where a session ID is changed for a session already in the client session cache. Since the session ID is the key to the cache this breaks the cache access. Parts of this patch were inspired by this Akamai change: https://github.com/akamai/openssl/commit/c0bf69a791239ceec64509f9f19fcafb2461b0d3 Reviewed-by: Rich Salz <rsalz@openssl.org> | 02 June 2015, 08:30:31 UTC |
| 8744ba5 | Matt Caswell | 29 May 2015, 16:05:01 UTC | Check the message type requested is the type received in DTLS dtls1_get_message has an |mt| variable which is the type of the message that is being requested. If it is negative then any message type is allowed. However the value of |mt| is not checked in one of the main code paths, so a peer can send a message of a completely different type and it will be processed as if it was the message type that we were expecting. This has very little practical consequences because the current behaviour will still fail when the format of the message isn't as expected. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 8c2b1d872b25f3ec78e04f5cd2de8f21e853c4a6) | 31 May 2015, 23:30:56 UTC |
| 4d9dc0c | Dr. Stephen Henson | 28 May 2015, 14:44:20 UTC | check for error when creating PKCS#8 structure Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc) | 28 May 2015, 17:01:52 UTC |
| 7e36529 | Dr. Stephen Henson | 28 May 2015, 14:45:57 UTC | PEM doc fixes Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f097f81c891bb1f479426d8ac9c9541390334983) | 28 May 2015, 17:01:52 UTC |
| b6f33dc | Emilia Kasper | 22 May 2015, 16:35:50 UTC | Fix ssltest to use 1024-bit DHE parameters Also add more ciphersuite test coverage, and a negative test for 512-bit DHE. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 1ee85aab75d7c9f20058f781bfe9222323df08eb) | 26 May 2015, 10:42:40 UTC |
| cdc47dc | Matt Caswell | 25 May 2015, 23:05:28 UTC | Don't check for a negative SRP extension size The size of the SRP extension can never be negative (the variable |size| is unsigned). Therefore don't check if it is less than zero. RT#3862 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 9c89d290834f3ed9146eeb8b64fe5de817679a0b) | 26 May 2015, 09:38:56 UTC |
| 9cab86e | Matt Caswell | 25 May 2015, 23:02:57 UTC | Fix error check in GOST engine The return value of i2d functions can be negative if an error occurs. Therefore don't assign the return value to an unsigned type and *then* check if it is negative. RT#3862 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 90e7cdff3aa66779486914f88333f6601f0c1cf4) | 26 May 2015, 09:38:56 UTC |
| e40d7c1 | Matt Caswell | 25 May 2015, 22:57:41 UTC | Handle unsigned struct timeval members The members of struct timeval on OpenVMS are unsigned. The logic for calculating timeouts needs adjusting to deal with this. RT#3862 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit fc52ac9028b9492fb086ba35a3352ea46e03ecfc) | 26 May 2015, 09:38:56 UTC |
| 3ae6186 | Andy Polyakov | 26 May 2015, 07:47:35 UTC | Housekeeping 'make TABLE' update. Reviewed-by: Matt Caswell <matt@openssl.org> | 26 May 2015, 08:23:21 UTC |
| aa1e422 | Andy Polyakov | 26 May 2015, 07:47:16 UTC | Configure: replace -mv8 with -mcpu=v8 in SPARC config lines. RT#3860 Reviewed-by: Matt Caswell <matt@openssl.org> | 26 May 2015, 08:22:01 UTC |
| bec1093 | Billy Brumley | 22 May 2015, 14:44:49 UTC | fix copy paste error in ec_GF2m function prototypes RT#3858 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 71f6130b7a96bacbffae4611796ed98c2f724d96) | 26 May 2015, 08:14:19 UTC |
| 78ac7fa | Andy Polyakov | 25 May 2015, 08:17:14 UTC | bn/bn_lcl.h: fix MIPS-specific gcc version check. RT#3859 Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 60c268b21ac81cc6b1af5c5470282a613b96f6fd) | 26 May 2015, 08:07:59 UTC |
| 11414f1 | Matt Caswell | 23 May 2015, 20:51:21 UTC | Don't send an alert if we've just received one If the record received is for a version that we don't support, previously we were sending an alert back. However if the incoming record already looks like an alert then probably we shouldn't do that. So suppress an outgoing alert if it looks like we've got one incoming. Reviewed-by: Kurt Roeckx <kurt@openssl.org> | 25 May 2015, 16:52:27 UTC |
| 0a59e2d | Andy Polyakov | 20 May 2015, 07:36:48 UTC | bn/asm/x86_64-mont5.pl: fix valgrind error. bn_get_bits5 was overstepping array boundary by 1 byte. It was exclusively read overstep and data could not have been used. The only potential problem would be if array happens to end on the very edge of last accesible page. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 69567687b0b7ed67831c17a010f4d46dfd059aef) | 24 May 2015, 19:31:49 UTC |
| 0945bfc | Andy Polyakov | 20 May 2015, 07:24:36 UTC | bn/bn_gf2m.c: appease STACK, unstable code detector. RT#3852 Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 86e5d1e32b2d702a5fc777e612cd746e790098ef) | 24 May 2015, 19:27:32 UTC |
| f5d840a | Andy Polyakov | 13 May 2015, 20:19:59 UTC | bn/asm/vis3-mont.pl: fix intermittent EC failures on SPARC T3. BLKINIT optimization worked on T4, but for some reason appears "too aggressive" for T3 triggering intermiitent EC failures. It's not clear why only EC is affected... Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 579734ced696125c0768a2f4e56e97939b0e6e49) | 24 May 2015, 11:26:37 UTC |
| 886ef2b | Richard Levitte | 23 May 2015, 04:33:41 UTC | Fix update and depend in engines/ The update: target in engines/ didn't recurse into engines/ccgost. The update: and depend: targets in engines/ccgost needed a fixup. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 8b822d2566853ee5e313c37529f71336209b28ab) | 23 May 2015, 09:08:12 UTC |
| 8b89cb3 | Richard Levitte | 22 May 2015, 17:23:43 UTC | Missed a couple of spots in the update change Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 6f45032f6730622e8d484d92e07c7fce7d1f88ac) Conflicts: apps/Makefile | 23 May 2015, 04:25:12 UTC |
| bf42354 | Richard Levitte | 22 May 2015, 15:54:06 UTC | Fix the update target and remove duplicate file updates We had updates of certain header files in both Makefile.org and the Makefile in the directory the header file lived in. This is error prone and also sometimes generates slightly different results (usually just a comment that differs) depending on which way the update was done. This removes the file update targets from the top level Makefile, adds an update: target in all Makefiles and has it depend on the depend: or local_depend: targets, whichever is appropriate, so we don't get a double run through the whole file tree. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 0f539dc1a2f45580435c39dada44dd276e79cb88) Conflicts: Makefile.org apps/Makefile test/Makefile | 23 May 2015, 04:25:12 UTC |
| e4731f7 | Matt Caswell | 22 May 2015, 12:48:49 UTC | Fix typo setting up certificate masks The certificate masks are used to select which ciphersuite we are going to use. The variables |emask_k| and |emask_a| relate to export grade key exchange and authentication respecitively. The variables |mask_k| and |mask_a| are the equivalent versions for non-export grade. This fixes an instance where the two usages of export/non-export were mixed up. In practice it makes little difference since it still works! Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit fdfe8b06ae97da3bc3a77aa3db00f8e0445f3c70) | 22 May 2015, 23:01:48 UTC |
| 595487e | Matt Caswell | 22 May 2015, 12:33:19 UTC | Remove export static DH ciphersuites Remove support for the two export grade static DH ciphersuites. These two ciphersuites were newly added (along with a number of other static DH ciphersuites) to 1.0.2. However the two export ones have *never* worked since they were introduced. It seems strange in any case to be adding new export ciphersuites, and given "logjam" it also does not seem correct to fix them. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 13f8eb4730b9fc039e743870f81e5ff54b3d05b8) Conflicts: CHANGES | 22 May 2015, 23:01:45 UTC |
