openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

apps/x509.c: Fix too eager call to X509_set_issuer_name() introduced recently 

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14340)
This commit is contained in:
Dr. David von Oheimb 2021-02-26 11:42:49 +01:00 committed by Dr. David von Oheimb
parent d5a936c5b1
commit ed0a5ac920
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/x509.c
View File

@ -793,10 +793,6 @@ int x509_main(int argc, char **argv)
X509_EXTENSION_free(X509_delete_ext(x, i));
}
if ((reqfile || newcert || signkey != NULL || CAfile != NULL)
&& !preserve_dates && !set_cert_times(x, NULL, NULL, days))
goto end;
issuer_cert = x;
if (CAfile != NULL) {
issuer_cert = xca;
@ -809,8 +805,12 @@ int x509_main(int argc, char **argv)
if (sno != NULL && !X509_set_serialNumber(x, sno))
goto end;
if (!X509_set_issuer_name(x, X509_get_subject_name(issuer_cert)))
goto end;
if (reqfile || newcert || signkey != NULL || CAfile != NULL) {
if (!preserve_dates && !set_cert_times(x, NULL, NULL, days))
goto end;
if (!X509_set_issuer_name(x, X509_get_subject_name(issuer_cert)))
goto end;
}
X509V3_set_ctx(&ext_ctx, issuer_cert, x, req, NULL, X509V3_CTX_REPLACE);
if (extconf != NULL) {