Skip to main content
swh:1:snp:dc2a5002442a00b1c0eda7c65d04ea7455e166cd
sort by:
RevisionAuthorDateMessageCommit Date
5ab53da Matt Caswell09 July 2015, 12:22:23 UTCPrepare for 1.0.1p release Reviewed-by: Stephen Henson <steve@openssl.org>09 July 2015, 12:22:23 UTC
245daa2 Matt Caswell02 July 2015, 14:38:32 UTCUpdate CHANGES and NEWS for the new release Reviewed-by: Stephen Henson <steve@openssl.org>09 July 2015, 08:32:04 UTC
cb22d2a Matt Caswell23 June 2015, 23:12:38 UTCFix 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 Caswell25 June 2015, 08:47:15 UTCReject 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 Caswell01 July 2015, 23:15:56 UTCAdd 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/Makefile07 July 2015, 21:52:31 UTC
9a0db45 Matt Caswell24 June 2015, 14:55:36 UTCFix 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
cb6e0ed Dr. Stephen Henson09 June 2015, 22:17:06 UTCRelax 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:36:10 UTC
e5d5019 Dr. Stephen Henson06 July 2015, 13:17:49 UTCdocument -2 return value Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 5727582cf51e98e5e0faa435e7da2c8929533c0d)06 July 2015, 17:36:10 UTC
d6be312 Dr. Stephen Henson01 July 2015, 22:40:03 UTCFix 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> (cherry picked from commit 3c66a669dfc7b3792f7af0758ea26fe8502ce70c)02 July 2015, 12:04:25 UTC
eb0e2a5 Dr. Stephen Henson25 June 2015, 14:07:25 UTCCheck for errors with SRP Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 5fced2395ddfb603a50fd1bd87411e603a59dc6f)29 June 2015, 18:21:34 UTC
0d25eb7 Dr. Stephen Henson24 June 2015, 11:28:50 UTCDon'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:56 UTC
ae2f465 Rich Salz22 June 2015, 23:26:50 UTCRT3907-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:36 UTC
9ad2eb6 Rich Salz13 June 2015, 21:18:47 UTCRT3907: avoid "local" in testssl script Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 75ba5c58c6b3b3326a6c3198100830afa120e7c3)22 June 2015, 19:50:14 UTC
f4961dc Richard Levitte21 June 2015, 19:35:59 UTCCleanup 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:13:28 UTC
40ced6c Richard Levitte21 June 2015, 17:19:59 UTCAdd -ldl to the build of mttest.c Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit d62c98c81c7b47b7b1878fd7e91e5fd33818faf0)21 June 2015, 20:13:28 UTC
f1817dd Richard Levitte21 June 2015, 17:16:50 UTCCleanup 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:13:28 UTC
5891dae Richard Levitte21 June 2015, 17:13:57 UTCCleanup 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:13:28 UTC
1d6d4ef Richard Levitte21 June 2015, 17:12:33 UTCCleanup 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.c21 June 2015, 20:13:28 UTC
0fee334 Richard Levitte21 June 2015, 17:19:17 UTCCleanup 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:13:28 UTC
141f7d2 Richard Levitte21 June 2015, 17:11:43 UTCCleanup 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.c21 June 2015, 20:13:28 UTC
ae3254a Richard Levitte21 June 2015, 17:03:44 UTCCleanup mttest.c : modernise the threads setup Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 5c78e1835285ce4acdc7cc4f4c06aa7d6661c9b4) Conflicts: crypto/threads/mttest.c21 June 2015, 20:13:28 UTC
9720dd4 Richard Levitte21 June 2015, 16:51:18 UTCCleanup mttest.c : remove MS_CALLBACK Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit a3f9286556d6d78c1800caae97a9328afb2557e6)21 June 2015, 20:13:28 UTC
83d6620 Rich Salz21 June 2015, 19:12:20 UTCRT1688: 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> (cherry picked from commit 8e6bb99979b95ee8b878e22e043ceb78d79c32a1)21 June 2015, 19:27:30 UTC
347fc5d Richard Levitte15 June 2015, 07:59:25 UTCMake preprocessor error into real preprocessor error Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit b4f0d1a4a89b964dba80036a6348ca0a1913c526)16 June 2015, 11:14:09 UTC
a5d8c1c Richard Levitte13 June 2015, 11:13:55 UTCRemove one extraneous parenthesis Reviewed-by: Kurt Roeckx <kurt@openssl.org> (cherry picked from commit 30cf91784bfde82622f79d87d17d20ce73329532)16 June 2015, 11:14:09 UTC
902795b Matt Caswell12 June 2015, 15:24:26 UTCPrepare for 1.0.1p-dev Reviewed-by: Richard Levitte <levitte@openssl.org>12 June 2015, 15:24:26 UTC
2a8c279 Matt Caswell12 June 2015, 15:20:59 UTCPrepare for 1.0.1o release Reviewed-by: Richard Levitte <levitte@openssl.org>12 June 2015, 15:20:59 UTC
2ad310f Matt Caswell12 June 2015, 14:56:51 UTCUpdated CHANGES and NEWS entries for new release Reviewed-by: Richard Levitte <levitte@openssl.org>12 June 2015, 15:02:04 UTC
6cbc789 Adam Langley12 June 2015, 07:05:49 UTCAllow 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:45:17 UTC
fffcf87 Matt Caswell12 June 2015, 12:08:04 UTCFix 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:43:23 UTC
3adca97 Matt Caswell11 June 2015, 14:08:34 UTCPrepare for 1.0.1o-dev Reviewed-by: Stephen Henson <steve@openssl.org>11 June 2015, 14:08:34 UTC
517899e Matt Caswell11 June 2015, 14:05:11 UTCPrepare for 1.0.1n release Reviewed-by: Stephen Henson <steve@openssl.org>11 June 2015, 14:05:11 UTC
f61bbf8 Andy Polyakov10 June 2015, 22:18:01 UTCbn/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, 14:02:21 UTC
1f31458 Matt Caswell10 June 2015, 10:49:31 UTCUpdate 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, 14:02:21 UTC
5fbc59c Emilia Kasper12 May 2015, 17:00:30 UTCPKCS#7: Fix NULL dereference with missing EncryptedContent. CVE-2015-1790 Reviewed-by: Rich Salz <rsalz@openssl.org>11 June 2015, 14:02:21 UTC
370ac32 Emilia Kasper08 April 2015, 14:56:43 UTCFix 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, 14:02:21 UTC
dd90a91 Dr. Stephen Henson05 June 2015, 11:11:25 UTCFix 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, 14:02:21 UTC
176b59d Richard Levitte11 June 2015, 13:41:25 UTCCorrection of make depend merge error $(PROGS) was mistakenly removed, adding it back. Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 5ef5b9ffa91ad6061c42291564a1dc786300ebdd)11 June 2015, 13:52:29 UTC
907f04a Matt Caswell11 June 2015, 00:30:06 UTCMore 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:08:18 UTC
f3b355f Kurt Roeckx18 April 2015, 17:15:48 UTCOnly allow a temporary rsa key exchange when they key is larger than 512. Reviewed-by: Rich Salz <rsalz@openssl.org> MR #838 (cherry picked from commit 57e477b9ec66542afc8c9c13ae7c4271209fb88f)10 June 2015, 22:10:24 UTC
c4ce107 Kurt Roeckx06 June 2015, 11:42:34 UTCProperly check certificate in case of export ciphers. Reviewed-by: Rich Salz <rsalz@openssl.org> MR #838 (cherry picked from commit 39a298a1c0e7a76e301b9f2ebe8d33d90ad0a3b4)10 June 2015, 22:10:02 UTC
d46de4c Matt Caswell01 June 2015, 16:25:29 UTCDTLS 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:12:57 UTC
418df5e Matt Caswell08 June 2015, 08:29:56 UTCFix 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:08:51 UTC
d163a2c Matt Caswell04 June 2015, 13:22:00 UTCEC_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:51:17 UTC
72df35a Matt Caswell30 April 2015, 14:20:25 UTCTighten 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.c10 June 2015, 09:32:05 UTC
f92b196 Matt Caswell30 April 2015, 13:51:10 UTCFix 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.c10 June 2015, 09:29:31 UTC
e94118a Matt Caswell30 April 2015, 13:04:30 UTCReplace 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:29:31 UTC
106a9a5 Matt Caswell10 June 2015, 08:32:34 UTCFix 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> (cherry picked from commit dcad51bc13c9b716d9a66248bcc4038c071ff158)10 June 2015, 09:02:16 UTC
cb972a4 Richard Levitte09 June 2015, 21:06:23 UTCWhen 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:12:34 UTC
ee2d14b Richard Levitte09 June 2015, 23:34:26 UTCAdd 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.org10 June 2015, 00:12:25 UTC
3d2c3fa Dr. Stephen Henson08 June 2015, 12:23:00 UTCreturn correct NID for undefined object Reviewed-by: Tim Hudson <tjh@openssl.org> (cherry picked from commit 0fb9990480919163cc375a2b6c0df1d8d901a77b)08 June 2015, 20:47:05 UTC
ba56936 Emilia Kasper08 June 2015, 13:04:28 UTCUse CRYPTO_memcmp in s3_cbc.c Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 05627d57e55517eae21c251fe287760bd1137218)08 June 2015, 13:05:08 UTC
59b5ab4 Emilia Kasper27 May 2015, 15:12:13 UTCUse 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) (cherry picked from commit ac32a77cd69784568090e934a31622ddfee49ca7)08 June 2015, 13:01:47 UTC
c22ed55 Matt Caswell04 June 2015, 10:18:55 UTCRemove 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:56:13 UTC
4b6f33a Matt Caswell04 June 2015, 10:16:16 UTCClean 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.c04 June 2015, 11:56:13 UTC
c36d384 Matt Caswell04 June 2015, 10:41:30 UTCClean 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> (cherry picked from commit 4e3dbe37ca39fa68b6949fbde62f3ec0f0584f7e)04 June 2015, 11:42:51 UTC
05bdebb Matt Caswell19 May 2015, 12:59:47 UTCFix 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.c04 June 2015, 08:29:13 UTC
32b2ad7 Annie Yousar03 May 2015, 13:05:47 UTCRT3230: 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:54 UTC
1977240 Richard Levitte31 May 2015, 15:47:31 UTCAdd 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.h02 June 2015, 16:05:31 UTC
939b496 Matt Caswell18 May 2015, 15:27:48 UTCFix 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> (cherry picked from commit 27c76b9b8010b536687318739c6f631ce4194688) Conflicts: ssl/ssl.h ssl/ssl_err.c02 June 2015, 11:44:40 UTC
cce3e4a Matt Caswell09 March 2015, 16:09:04 UTCClear state in DTLSv1_listen This is a backport of commit e83ee04bb7de800cdb71d522fa562e99328003a3 from the master branch (and this has also been applied to 1.0.2). In 1.0.2 this was CVE-2015-0207. For other branches there is no known security issue, but this is being backported as a precautionary measure. The DTLSv1_listen function is intended to be stateless and processes the initial ClientHello from many peers. It is common for user code to loop over the call to DTLSv1_listen until a valid ClientHello is received with an associated cookie. A defect in the implementation of DTLSv1_listen means that state is preserved in the SSL object from one invokation to the next. Reviewed-by: Richard Levitte <levitte@openssl.org>02 June 2015, 08:12:39 UTC
f3e85f4 Matt Caswell29 May 2015, 16:05:01 UTCCheck 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:33:22 UTC
cc74177 Dr. Stephen Henson28 May 2015, 14:44:20 UTCcheck for error when creating PKCS#8 structure Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2849707fa65d2803e6d1c1603fdd3fd1fdc4c6cc)28 May 2015, 17:02:19 UTC
e2cf18c Dr. Stephen Henson28 May 2015, 14:45:57 UTCPEM doc fixes Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit f097f81c891bb1f479426d8ac9c9541390334983)28 May 2015, 17:02:19 UTC
df00b6e Andy Polyakov26 May 2015, 08:36:56 UTCHousekeeping 'make TABLE' update. Reviewed-by: Matt Caswell <matt@openssl.org>26 May 2015, 19:55:57 UTC
1ee85aa Emilia Kasper22 May 2015, 16:35:50 UTCFix 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>26 May 2015, 10:41:51 UTC
029e8f3 Matt Caswell25 May 2015, 23:05:28 UTCDon'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:42:10 UTC
28ea6ad Matt Caswell25 May 2015, 23:02:57 UTCFix 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:42:10 UTC
4ae1c77 Matt Caswell25 May 2015, 22:57:41 UTCHandle 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:42:10 UTC
dbcf8e3 Andy Polyakov26 May 2015, 07:47:16 UTCConfigure: replace -mv8 with -mcpu=v8 in SPARC config lines. RT#3860 Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit aa1e42215b6729c0143fb056e3791e3fcdf7af6a)26 May 2015, 08:24:20 UTC
5fcfef4 Billy Brumley22 May 2015, 14:44:49 UTCfix 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:56 UTC
8af1319 Andy Polyakov25 May 2015, 08:17:14 UTCbn/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:08:44 UTC
38b7073 Andy Polyakov24 May 2015, 20:51:12 UTCmd32_common.h: backport ICC fix. RT#3843 Reviewed-by: Matt Caswell <matt@openssl.org>26 May 2015, 07:58:12 UTC
75077a2 Matt Caswell23 May 2015, 20:51:21 UTCDon'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, 22:11:02 UTC
c62592e Richard Levitte23 May 2015, 04:33:41 UTCFix 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:22:10 UTC
f460f05 Richard Levitte22 May 2015, 17:23:43 UTCMissed a couple of spots in the update change Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 6f45032f6730622e8d484d92e07c7fce7d1f88ac) Conflicts: apps/Makefile23 May 2015, 09:22:10 UTC
eb797fd Richard Levitte22 May 2015, 15:54:06 UTCFix 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/Makefile23 May 2015, 09:22:10 UTC
b484b04 Matt Caswell19 May 2015, 15:03:02 UTCFix 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:45:33 UTC
726b5e7 Matt Caswell19 May 2015, 14:19:30 UTCReject 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.c22 May 2015, 22:21:55 UTC
0a9f8e0 Lubom07 May 2015, 13:20:31 UTCLost 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, 09:24:49 UTC
1c687ff Matt Caswell27 January 2015, 11:15:15 UTCAdd documentation for the -no_alt_chains option for various apps, as well as the X509_V_FLAG_NO_ALT_CHAINS flag. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Conflicts: doc/apps/cms.pod doc/apps/ocsp.pod doc/apps/s_client.pod doc/apps/s_server.pod doc/apps/smime.pod doc/apps/verify.pod20 May 2015, 21:14:25 UTC
c6a3904 Matt Caswell27 January 2015, 10:50:38 UTCAdd -no_alt_chains option to apps to implement the new X509_V_FLAG_NO_ALT_CHAINS flag. Using this option means that when building certificate chains, the first chain found will be the one used. Without this flag, if the first chain found is not trusted then we will keep looking to see if we can build an alternative chain instead. Reviewed-by: Dr. Stephen Henson <steve@openssl.org> Reviewed-by: Kurt Roeckx <kurt@roeckx.be> Conflicts: apps/cms.c apps/ocsp.c apps/s_client.c apps/s_server.c apps/smime.c apps/verify.c20 May 2015, 21:14:25 UTC
cf1bf3f Matt Caswell27 January 2015, 10:35:27 UTCAdd flag to inhibit checking for alternate certificate chains. Setting this behaviour will force behaviour as per previous versions of OpenSSL Reviewed-by: Dr. Stephen Henson <steve@openssl.org> Reviewed-by: Kurt Roeckx <kurt@roeckx.be>20 May 2015, 21:14:24 UTC
f7bf8e0 Matt Caswell27 January 2015, 10:03:29 UTCIn certain situations the server provided certificate chain may no longer be valid. However the issuer of the leaf, or some intermediate cert is in fact in the trust store. When building a trust chain if the first attempt fails, then try to see if alternate chains could be constructed that are trusted. RT3637 RT3621 Reviewed-by: Kurt Roeckx <kurt@roeckx.be>20 May 2015, 21:14:24 UTC
3b509e8 Kurt Roeckx18 April 2015, 10:50:25 UTCCorrectly 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:23:28 UTC
6383038 Emilia Kasper19 May 2015, 10:05:22 UTCclient: 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, 13:01:36 UTC
ff4de7d Emilia Kasper12 May 2015, 14:10:05 UTCUpdate 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, 13:01:36 UTC
3372aee Emilia Kasper13 May 2015, 10:05:41 UTCdhparam: 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, 13:01:36 UTC
8568170 Emilia Kasper13 May 2015, 09:57:55 UTCdhparam: set the default to 2048 bits Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Kurt Roeckx <kurt@openssl.org>20 May 2015, 13:01:36 UTC
f161274 Emilia Kasper12 May 2015, 18:15:46 UTCs_server: Use 2048-bit DH parameters by default. Reviewed-by: Rich Salz <rsalz@openssl.org>20 May 2015, 13:01:36 UTC
5a1f055 StudioEtrange20 May 2015, 08:35:39 UTCGitHub284: Fix typo in xx-32.pl scripts. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>20 May 2015, 08:35:39 UTC
e96de98 Robert Swiecki18 May 2015, 23:08:02 UTCDon'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:38 UTC
2df0ba9 Andy Polyakov15 July 2012, 13:40:04 UTCmk1mf.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 (cherry picked from commit 051b41df4105355a5a9c7f1c0bd00cc70b2d324c)15 May 2015, 18:19:29 UTC
76b49a8 Rich Salz12 May 2015, 15:49:32 UTCAdd 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> (cherry picked from commit f34b095fab1569d093b639bfcc9a77d6020148ff)13 May 2015, 16:55:23 UTC
5e0ec90 Hanno Böck11 May 2015, 10:33:37 UTCCall 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:32:23 UTC
5c12290 Matt Caswell06 May 2015, 20:31:16 UTCDon'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:25:10 UTC
1c70c78 Kurt Cancemi07 May 2015, 20:12:33 UTCAdd 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:21:43 UTC
9dff24e Bjoern D. Rasmussen10 May 2015, 05:51:29 UTCFix 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.c11 May 2015, 11:05:53 UTC
6865dea Matt Caswell09 May 2015, 05:51:25 UTCCheck 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:54:10 UTC
76d0c6d Matt Caswell30 April 2015, 10:50:08 UTCAdd 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 Conflicts: ssl/d1_srvr.c05 May 2015, 19:09:14 UTC
back to top