diff options
| author | David Cooper <david.cooper@nist.gov> | 2017-12-12 22:01:22 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-01-24 19:30:31 +0100 |
| commit | 89623f84299a66761ba4c69f01dbd86fc584d0a3 (patch) | |
| tree | e310c37aace5ab28240e1893e67f62e226fa7021 /crypto/ocsp | |
| parent | Add -rsigopt option to ocsp command (diff) | |
| download | openssl-89623f84299a66761ba4c69f01dbd86fc584d0a3.tar.xz openssl-89623f84299a66761ba4c69f01dbd86fc584d0a3.zip | |
Make editorial changes suggested by Rich Salz and add the -rsigopt option to the man page for the ocsp command.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4190)
Diffstat (limited to 'crypto/ocsp')
| -rw-r--r-- | crypto/ocsp/ocsp_srv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c index d31a3c0c25..b459e695b9 100644 --- a/crypto/ocsp/ocsp_srv.c +++ b/crypto/ocsp/ocsp_srv.c @@ -175,8 +175,9 @@ int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp, int i; OCSP_RESPID *rid; - if (!ctx || !EVP_MD_CTX_pkey_ctx(ctx) || !EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)) || - !X509_check_private_key(signer, EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)))) { + if (ctx == NULL || EVP_MD_CTX_pkey_ctx(ctx) == NULL + || EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)) == NULL + || !X509_check_private_key(signer, EVP_PKEY_CTX_get0_pkey(EVP_MD_CTX_pkey_ctx(ctx)))) { OCSPerr(OCSP_F_OCSP_BASIC_SIGN_CTX, OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE); goto err; |