[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d597208c034722d09612c805e4894b0019bdd710 (commit)
      from  311276ffe32ab0b161c364727cf8676591dbf47c (commit)


- Log -----------------------------------------------------------------
commit d597208c034722d09612c805e4894b0019bdd710
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 17 12:30:47 2018 +0100

    ts_RESP_sign: Don't try to use v2 signing when ESS digest isn't set
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5653)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ts/ts_rsp_sign.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c
index 6569956..ba9d53d 100644
--- a/crypto/ts/ts_rsp_sign.c
+++ b/crypto/ts/ts_rsp_sign.c
@@ -678,7 +678,8 @@ static int ts_RESP_sign(TS_RESP_CTX *ctx)
     }
 
     certs = ctx->flags & TS_ESS_CERT_ID_CHAIN ? ctx->certs : NULL;
-    if (ctx->ess_cert_id_digest == EVP_sha1()) {
+    if (ctx->ess_cert_id_digest == NULL
+        || ctx->ess_cert_id_digest == EVP_sha1()) {
         if ((sc = ess_SIGNING_CERT_new_init(ctx->signer_cert, certs)) == NULL)
             goto err;