openssl/doc, branch OpenSSL_1_0_2d

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

document -2 return value

2015-07-06T17:35:35Z

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

Add docs for ssl verification parameter functions.

2015-06-24T21:22:23Z

Reviewed-by: Matt Caswell (cherry picked from commit 77672802a665b26a44524a7a8091e56ee84bdf39)

GH297: Fix NAME section of SSL_CTX_use_serverinfo.pod

2015-06-23T12:17:57Z

Signed-off-by: Rich Salz Reviewed-by: Matt Caswell

Explicitly mention PKCS5_PBKDF2_HMAC in EVP doc.

2015-06-09T00:21:23Z

Signed-off-by: Rich Salz Reviewed-by: Matt Caswell (cherry picked from commit 82c4d793181058de9fde5c9088fd400fdb7e01e3)

PEM doc fixes

2015-05-28T17:01:52Z

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

Remove export static DH ciphersuites

2015-05-22T23:01:45Z

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 (cherry picked from commit 13f8eb4730b9fc039e743870f81e5ff54b3d05b8) Conflicts: CHANGES

Fix off-by-one in BN_rand

2015-05-22T22:43:07Z

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

Reject negative shifts for BN_rshift and BN_lshift

2015-05-22T22:19:34Z

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 (cherry picked from commit 7cc18d8158b5fc2676393d99b51c30c135502107) Conflicts: crypto/bn/bn.h crypto/bn/bn_err.c