sync with OpenBSD -current

This commit is contained in:
purplerain 2023-11-13 23:00:18 +00:00
parent 62d64fa864
commit 4574748555
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
13806 changed files with 1142078 additions and 937084 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: x509.c,v 1.33 2023/04/14 06:47:07 tb Exp $ */
/* $OpenBSD: x509.c,v 1.34 2023/11/13 11:50:36 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@ -1156,8 +1156,7 @@ x509_main(int argc, char **argv)
ASN1_TIME *nB = X509_get_notBefore(x);
BIO_puts(STDout, "notBefore=");
if (ASN1_time_parse(nB->data, nB->length, NULL,
0) == -1)
if (!ASN1_TIME_to_tm(nB, NULL))
BIO_puts(STDout,
"INVALID RFC5280 TIME");
else
@ -1167,8 +1166,7 @@ x509_main(int argc, char **argv)
ASN1_TIME *nA = X509_get_notAfter(x);
BIO_puts(STDout, "notAfter=");
if (ASN1_time_parse(nA->data, nA->length, NULL,
0) == -1)
if (!ASN1_TIME_to_tm(nA, NULL))
BIO_puts(STDout,
"INVALID RFC5280 TIME");
else