openssl, branch OpenSSL_1_0_2d

Prepare for 1.0.2d release

2015-07-09T12:03:09Z

Reviewed-by: Stephen Henson

Update CHANGES and NEWS for the new release

2015-07-09T08:31:25Z

Reviewed-by: Stephen Henson

Add documentation for some missing verify options

2015-07-07T21:07:14Z

Fills in a couple of verify options that were lacking documentation. Reviewed-by: Rich Salz (cherry picked from commit 79a55b1f2796bf6471360e8b6ab131cdedca256e) Conflicts: doc/apps/verify.pod

Reject calls to X509_verify_cert that have not been reinitialised

2015-07-07T20:50:09Z

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

Add test for CVE-2015-1793

2015-07-07T20:48:55Z

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

Fix alternate chains certificate forgery issue

2015-07-07T20:48:55Z

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

Relax CCM tag check.

2015-07-06T17:35:35Z

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 (cherry picked from commit 9cca7be11d62298b2af0722f94345012c86eaed4)

document -2 return value

2015-07-06T17:35:35Z

Reviewed-by: Rich Salz (cherry picked from commit 5727582cf51e98e5e0faa435e7da2c8929533c0d)

Fix PSK handling.

2015-07-02T11:01:27Z

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

Check for errors with SRP

2015-06-29T18:21:15Z

Reviewed-by: Matt Caswell (cherry picked from commit 5fced2395ddfb603a50fd1bd87411e603a59dc6f)