diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-01-18 17:18:03 +0100 |
---|---|---|
committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-01-20 15:55:58 +0100 |
commit | 63162e3d55e38aff51e243212bc73aa27bed8c4c (patch) | |
tree | 6f9d39af1c56abe22f354e749c1fcfa73768614e /crypto | |
parent | b09aa550d3d9af269f9551a5a95a3d8408d9098d (diff) |
X509: Enable printing cert even with invalid validity times, saying 'Bad time value'
Add internal asn1_time_print_ex() that can return success on invalid time.
This is a workaround for inconsistent error behavior of ASN1_TIME_print(),
used in X509_print_ex().
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13714)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/a_time.c | 17 | ||||
-rw-r--r-- | crypto/x509/t_x509.c | 4 |
2 files changed, 13 insertions, 8 deletions
diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 7bd97c6598..aebbf53fd0 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -16,6 +16,7 @@ #include <stdio.h> #include <time.h> +#include "crypto/asn1.h" #include "crypto/ctype.h" #include "internal/cryptlib.h" #include <openssl/asn1t.h> @@ -467,19 +468,23 @@ static const char _asn1_mon[12][4] = { "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; +/* returns 1 on success, 0 on BIO write error or parse failure */ int ASN1_TIME_print(BIO *bp, const ASN1_TIME *tm) { + return asn1_time_print_ex(bp, tm) > 0; +} + +/* returns 0 on BIO write error, else -1 in case of parse failure, else 1 */ +int asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm) +{ char *v; int gmt = 0, l; struct tm stm; const char upper_z = 0x5A, period = 0x2E; - if (!asn1_time_to_tm(&stm, tm)) { - /* asn1_time_to_tm will check the time type */ - (void)BIO_write(bp, "Bad time value", 14); - return 0; - /* It would have been more consistent to return BIO_write(...) */ - } + /* asn1_time_to_tm will check the time type */ + if (!asn1_time_to_tm(&stm, tm)) + return BIO_write(bp, "Bad time value", 14) ? -1 : 0; l = tm->length; v = (char *)tm->data; diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c index 9636756b66..d4bfe455fc 100644 --- a/crypto/x509/t_x509.c +++ b/crypto/x509/t_x509.c @@ -140,11 +140,11 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, goto err; if (BIO_write(bp, " Not Before: ", 24) <= 0) goto err; - if (!ASN1_TIME_print(bp, X509_get0_notBefore(x))) + if (asn1_time_print_ex(bp, X509_get0_notBefore(x)) == 0) goto err; if (BIO_write(bp, "\n Not After : ", 25) <= 0) goto err; - if (!ASN1_TIME_print(bp, X509_get0_notAfter(x))) + if (asn1_time_print_ex(bp, X509_get0_notAfter(x)) == 0) goto err; if (BIO_write(bp, "\n", 1) <= 0) goto err; |