| 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 |
| c6eb1cb | Matt Caswell | 19 May 2015, 15:03:02 UTC | Fix off-by-one in BN_rand If BN_rand is called with |bits| set to 1 and |top| set to 1 then a 1 byte buffer overflow can occur. There are no such instances within the OpenSSL at the moment. Thanks to Mateusz Kocielski (LogicalTrust), Marek Kroemeke, Filip Palian for discovering and reporting this issue. Reviewed-by: Kurt Roeckx <kurt@openssl.org> | 22 May 2015, 22:43:07 UTC |
| 1a9499c | Matt Caswell | 19 May 2015, 14:19:30 UTC | Reject negative shifts for BN_rshift and BN_lshift The functions BN_rshift and BN_lshift shift their arguments to the right or left by a specified number of bits. Unpredicatable results (including crashes) can occur if a negative number is supplied for the shift value. Thanks to Mateusz Kocielski (LogicalTrust), Marek Kroemeke and Filip Palian for discovering and reporting this issue. Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 7cc18d8158b5fc2676393d99b51c30c135502107) Conflicts: crypto/bn/bn.h crypto/bn/bn_err.c | 22 May 2015, 22:19:34 UTC |
| 254c01e | Lubom | 07 May 2015, 13:20:31 UTC | Lost alert in DTLS If a client receives a bad hello request in DTLS then the alert is not sent correctly. RT#2801 Signed-off-by: Matt Caswell <matt@openssl.org> Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 4dc1aa0436fdb8af50960db676b739c8ef81f38c) | 22 May 2015, 08:44:44 UTC |
| 2d8e705 | Kurt Roeckx | 18 April 2015, 10:50:25 UTC | Correctly check for export size limit 40 bit ciphers are limited to 512 bit RSA, 56 bit ciphers to 1024 bit. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit ac38115c1a4fb61c66c2a8cd2a9800751828d328) | 20 May 2015, 20:19:34 UTC |
| f4d1fb7 | Emilia Kasper | 20 May 2015, 13:47:51 UTC | Only support >= 256-bit elliptic curves with ecdh_auto (server) or by default (client). Also reorder preferences to prefer prime curves to binary curves, and P-256 to everything else. The result: $ openssl s_server -named_curves "auto" This command will negotiate an ECDHE ciphersuite with P-256: $ openssl s_client This command will negotiate P-384: $ openssl s_client -curves "P-384" This command will not negotiate ECDHE because P-224 is disabled with "auto": $ openssl s_client -curves "P-224" Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> | 20 May 2015, 14:04:37 UTC |
| 10a70da | Emilia Kasper | 19 May 2015, 09:53:31 UTC | client: reject handshakes with DH parameters < 768 bits. Since the client has no way of communicating her supported parameter range to the server, connections to servers that choose weak DH will simply fail. Reviewed-by: Kurt Roeckx <kurt@openssl.org> | 20 May 2015, 12:54:51 UTC |
| dcbc03e | Emilia Kasper | 12 May 2015, 14:10:05 UTC | Update documentation with Diffie-Hellman best practices. - Do not advise generation of DH parameters with dsaparam to save computation time. - Promote use of custom parameters more, and explicitly forbid use of built-in parameters weaker than 2048 bits. - Advise the callback to ignore <keylength> - it is currently called with 1024 bits, but this value can and should be safely ignored by servers. Reviewed-by: Rich Salz <rsalz@openssl.org> | 20 May 2015, 12:54:51 UTC |
| b32aa8e | Emilia Kasper | 13 May 2015, 10:05:41 UTC | dhparam: fix documentation The default bitlength is now 2048. Also clarify that either the number of bits or the generator must be present: $ openssl dhparam -2 and $ openssl dhparam 2048 generate parameters but $ openssl dhparam does not. Reviewed-by: Matt Caswell <matt@openssl.org> | 20 May 2015, 12:54:51 UTC |
| 82697bc | Emilia Kasper | 12 May 2015, 18:15:46 UTC | s_server: Use 2048-bit DH parameters by default. Reviewed-by: Rich Salz <rsalz@openssl.org> | 20 May 2015, 12:54:51 UTC |
| 17b753f | StudioEtrange | 20 May 2015, 08:33:57 UTC | GitHub284: Fix typo in xx-32.pl scripts. Reviewed-by: Richard Levitte <levitte@openssl.org> Signed-off-by: Rich Salz <rsalz@openssl.org> | 20 May 2015, 08:34:42 UTC |
| cdcb94e | Robert Swiecki | 18 May 2015, 23:08:02 UTC | Don't add write errors into bytecounts Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 00d565cfbe90fab3b157e644caca4eb4a2ebec79) | 19 May 2015, 11:20:18 UTC |
| 051b41d | Andy Polyakov | 15 July 2012, 13:40:04 UTC | mk1mf.pl: replace chop for windows. Backport old patch to make it work in mixture of perls for Windows. Reviewed-by: Richard Levitte <levitte@openssl.org> Cherry-picked from 7bb98eee3c9e4694dfc2217001d5075ce8d2906e | 15 May 2015, 18:18:21 UTC |
| c59bd61 | Rich Salz | 08 May 2015, 20:06:50 UTC | RT1207: document SSL_COMP_free_compression_methods. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit c490a5512e988559a830c15b8efb1d0376f2e282) | 13 May 2015, 17:03:32 UTC |
| f34b095 | Rich Salz | 12 May 2015, 15:49:32 UTC | Add NULL checks from master The big "don't check for NULL" cleanup requires backporting some of the lowest-level functions to actually do nothing if NULL is given. This will make it easier to backport fixes to release branches, where master assumes those lower-level functions are "safe" This commit addresses those tickets: 3798 3799 3801. Reviewed-by: Matt Caswell <matt@openssl.org> | 13 May 2015, 16:55:03 UTC |
| d3bb25e | Andy Polyakov | 21 April 2015, 12:52:17 UTC | aes/asm/aesni-sha256-x86_64.pl: fix Windows compilation failure with old assembler. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 82c4a079395223c0063100854a0981976db9848f) | 13 May 2015, 15:00:06 UTC |
| eba8bf4 | Hanno Böck | 11 May 2015, 10:33:37 UTC | Call of memcmp with null pointers in obj_cmp() The function obj_cmp() (file crypto/objects/obj_dat.c) can in some situations call memcmp() with a null pointer and a zero length. This is invalid behaviour. When compiling openssl with undefined behaviour sanitizer (add -fsanitize=undefined to compile flags) this can be seen. One example that triggers this behaviour is the pkcs7 command (but there are others, e.g. I've seen it with the timestamp function): apps/openssl pkcs7 -in test/testp7.pem What happens is that obj_cmp takes objects of the type ASN1_OBJECT and passes their ->data pointer to memcmp. Zero-sized ASN1_OBJECT structures can have a null pointer as data. RT#3816 Signed-off-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2b8dc08b74fc3c6d4c2fc855cc23bac691d985be) | 13 May 2015, 14:28:48 UTC |
| 464774d | Matt Caswell | 06 May 2015, 20:31:16 UTC | Don't allow a CCS when expecting a CertificateVerify Currently we set change_cipher_spec_ok to 1 before calling ssl3_get_cert_verify(). This is because this message is optional and if it is not sent then the next thing we would expect to get is the CCS. However, although it is optional, we do actually know whether we should be receiving one in advance. If we have received a client cert then we should expect a CertificateVerify message. By the time we get to this point we will already have bombed out if we didn't get a Certificate when we should have done, so it is safe just to check whether |peer| is NULL or not. If it is we won't get a CertificateVerify, otherwise we will. Therefore we should change the logic so that we only attempt to get the CertificateVerify if we are expecting one, and not allow a CCS in this scenario. Whilst this is good practice for TLS it is even more important for DTLS. In DTLS messages can be lost. Therefore we may be in a situation where a CertificateVerify message does not arrive even though one was sent. In that case the next message the server will receive will be the CCS. This could also happen if messages get re-ordered in-flight. In DTLS if |change_cipher_spec_ok| is not set and a CCS is received it is ignored. However if |change_cipher_spec_ok| *is* set then a CCS arrival will immediately move the server into the next epoch. Any messages arriving for the previous epoch will be ignored. This means that, in this scenario, the handshake can never complete. The client will attempt to retransmit missing messages, but the server will ignore them because they are the wrong epoch. The server meanwhile will still be waiting for the CertificateVerify which is never going to arrive. RT#2958 Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit a0bd6493369d960abef11c2346b9bbb308b4285a) | 13 May 2015, 10:21:01 UTC |
| 833518c | Kurt Cancemi | 07 May 2015, 20:12:33 UTC | Add missing NULL check in X509V3_parse_list() Matt's note: I added a call to X509V3err to Kurt's original patch. RT#3840 Signed-off-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 344c271eb339fc2982e9a3584a94e51112d84584) | 11 May 2015, 11:19:54 UTC |
| 8a73e3a | Bjoern D. Rasmussen | 10 May 2015, 05:51:29 UTC | Fix for memcpy() and strcmp() being undefined. clang says: "s_cb.c:958:9: error: implicitly declaring library function 'memcpy'" Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 8f744cceff5bce8cb00a6ddd739c1bbb85c142ea) Conflicts: apps/s_cb.c | 11 May 2015, 11:03:12 UTC |
| edc2a76 | Matt Caswell | 09 May 2015, 05:51:25 UTC | Check sk_SSL_CIPHER_new_null return value If sk_SSL_CIPHER_new_null() returns NULL then ssl_bytes_to_cipher_list() should also return NULL. Based on an original patch by mrpre <mrpre@163.com>. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 14def5f5375594830597cc153e11c6017f6adddf) | 11 May 2015, 10:53:50 UTC |
| 8dfe1e4 | Viktor Dukhovni | 07 May 2015, 17:43:36 UTC | Fix typo in valid_star Reviewed-by: Rich Salz <rsalz@akamai.com> | 07 May 2015, 18:00:38 UTC |
| feb96e9 | Matt Caswell | 30 April 2015, 10:50:08 UTC | Add more error state transitions (DTLS) Ensure all fatal errors transition into the new error state for DTLS. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit cefc93910c4c0f7fa9f8c1f8f7aad084a7fa87d2) Conflicts: ssl/d1_srvr.c | 05 May 2015, 19:05:21 UTC |
| 67fb63e | Matt Caswell | 30 April 2015, 10:32:35 UTC | Add more error state transitions (client) Ensure all fatal errors transition into the new error state on the client side. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit cc273a93617a5c1e69cb5db6f655e463f8e31806) Conflicts: ssl/s3_clnt.c | 05 May 2015, 19:05:21 UTC |
| eecc697 | Matt Caswell | 30 April 2015, 10:11:04 UTC | Add more error state transitions Ensure all fatal errors transition into the new error state on the server side. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit cf9b0b6fb253fd40225d7c648a08646686e62d2d) Conflicts: ssl/s3_srvr.c | 05 May 2015, 18:52:26 UTC |
| e4f77bf | Matt Caswell | 23 April 2015, 19:01:33 UTC | Add Error state Reusing an SSL object when it has encountered a fatal error can have bad consequences. This is a bug in application code not libssl but libssl should be more forgiving and not crash. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit a89db885e0d8aac3a9df1bbccb0c1ddfd8b2e10a) Conflicts: ssl/s3_srvr.c ssl/ssl_stat.c | 05 May 2015, 18:50:12 UTC |
| cd5f206 | Matt Caswell | 04 May 2015, 22:15:46 UTC | Remove libcrypto to libssl dependency Remove dependency on ssl_locl.h from v3_scts.c, and incidentally fix a build problem with kerberos (the dependency meant v3_scts.c was trying to include krb5.h, but without having been passed the relevanant -I flags to the compiler) Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit d13bd6130bd856e9f512c43499e5fc70943bf133) Conflicts: crypto/x509v3/v3_scts.c | 05 May 2015, 08:09:56 UTC |
| 3cf4060 | Richard Levitte | 04 May 2015, 15:34:40 UTC | RT2943: Check sizes if -iv and -K arguments RT2943 only complains about the incorrect check of -K argument size, we might as well do the same thing with the -iv argument. Before this, we only checked that the given argument wouldn't give a bitstring larger than EVP_MAX_KEY_LENGTH. we can be more precise and check against the size of the actual cipher used. (cherry picked from commit 8920a7cd04f43b1a090d0b0a8c9e16b94c6898d4) Reviewed-by: Rich Salz <rsalz@openssl.org> | 04 May 2015, 18:21:21 UTC |
| 82e586a | Rich Salz | 04 May 2015, 14:34:51 UTC | Fix cut/paste error Was memset with wrong sizeof. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 23b0fa5ab6b6b9f0a9350e24ac5ddb8275802617) | 04 May 2015, 14:54:18 UTC |
| a659386 | Gilles Khouzam | 02 May 2015, 02:20:42 UTC | RT3820: Don't call GetDesktopWindow() Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit bed2edf1cb73f1fe2c11029acc694086bc14443e) | 02 May 2015, 12:01:52 UTC |
| 5b38d54 | Rich Salz | 02 May 2015, 02:06:07 UTC | RT3776: Wrong size for malloc Use sizeof *foo parameter, to avoid these errors. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 53ba0a9e91ad203de2943edaf1090ab17ec435fa) | 02 May 2015, 11:55:17 UTC |
| 6b3a315 | Hanno Böck | 02 May 2015, 02:27:20 UTC | Fix uninitialized variable. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 539ed89f686866b82a9ec9a4c3b112878d29cd73) | 02 May 2015, 11:45:35 UTC |
| f296e41 | Matt Caswell | 29 April 2015, 12:22:18 UTC | Fix buffer overrun in RSA signing The problem occurs in EVP_PKEY_sign() when using RSA with X931 padding. It is only triggered if the RSA key size is smaller than the digest length. So with SHA512 you can trigger the overflow with anything less than an RSA 512 bit key. I managed to trigger a 62 byte overflow when using a 16 bit RSA key. This wasn't sufficient to cause a crash, although your mileage may vary. In practice RSA keys of this length are never used and X931 padding is very rare. Even if someone did use an excessively short RSA key, the chances of them combining that with a longer digest and X931 padding is very small. For these reasons I do not believe there is a security implication to this. Thanks to Kevin Wojtysiak (Int3 Solutions) and Paramjot Oberoi (Int3 Solutions) for reporting this issue. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 34166d41892643a36ad2d1f53cc0025e2edc2a39) | 30 April 2015, 22:21:53 UTC |
| 5bea797 | Matt Caswell | 29 April 2015, 08:58:10 UTC | Add sanity check to print_bin function Add a sanity check to the print_bin function to ensure that the |off| argument is positive. Thanks to Kevin Wojtysiak (Int3 Solutions) and Paramjot Oberoi (Int3 Solutions) for reporting this issue. Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 3deeeeb61b0c5b9b5f0993a67b7967d2f85186da) | 30 April 2015, 22:21:53 UTC |
