summaryrefslogtreecommitdiffstats
path: root/apps/req.c
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-08-17 23:13:28 +0200
committerDr. David von Oheimb <dev@ddvo.net>2021-11-11 20:18:55 +0100
commitadbd77f6d7cc4efb7b4bde483036fab8e48ce870 (patch)
tree2de0061bf11418cb9ebd080eb77f136c707040fa /apps/req.c
parentb0c1214e1e82bc4c98eadd11d368b4ba9ffa202c (diff)
X509: Fix handling of AKID and SKID extensions according to configuration
Fixes #16300 Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/16342)
Diffstat (limited to 'apps/req.c')
-rw-r--r--apps/req.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/req.c b/apps/req.c
index 7997ea7649..274f839902 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -838,11 +838,9 @@ int req_main(int argc, char **argv)
if (CAcert == NULL) {
if (!X509V3_set_issuer_pkey(&ext_ctx, issuer_key))
goto end;
- ERR_set_mark();
- if (!X509_check_private_key(new_x509, issuer_key))
+ if (!cert_matches_key(new_x509, issuer_key))
BIO_printf(bio_err,
"Warning: Signature key and public key of cert do not match\n");
- ERR_pop_to_mark();
}
X509V3_set_nconf(&ext_ctx, req_conf);