Skip to content

Commit b456226

Browse files
Roytakmichalvasko
authored andcommitted
cli UPDATE remove openssl 1.1.0 code
Minimal OpenSSL version is set to 3.0.0, so this code is redundant
1 parent 8023165 commit b456226

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

cli/commands.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,11 +2072,7 @@ parse_cert(const char *name, const char *path)
20722072
BIO_printf(bio_out, "\n");
20732073

20742074
BIO_printf(bio_out, "Valid until: ");
2075-
#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
2076-
ASN1_TIME_print(bio_out, X509_get_notAfter(cert));
2077-
#else
20782075
ASN1_TIME_print(bio_out, X509_get0_notAfter(cert));
2079-
#endif
20802076
BIO_printf(bio_out, "\n");
20812077

20822078
has_san = 0;
@@ -2097,18 +2093,10 @@ parse_cert(const char *name, const char *path)
20972093
first_san = 0;
20982094
}
20992095
if (san_name->type == GEN_EMAIL) {
2100-
#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
2101-
BIO_printf(bio_out, "RFC822:%s", (char *) ASN1_STRING_data(san_name->d.rfc822Name));
2102-
#else
21032096
BIO_printf(bio_out, "RFC822:%s", (char *) ASN1_STRING_get0_data(san_name->d.rfc822Name));
2104-
#endif
21052097
}
21062098
if (san_name->type == GEN_DNS) {
2107-
#if OPENSSL_VERSION_NUMBER < 0x10100000L // < 1.1.0
2108-
BIO_printf(bio_out, "DNS:%s", (char *) ASN1_STRING_data(san_name->d.dNSName));
2109-
#else
21102099
BIO_printf(bio_out, "DNS:%s", (char *) ASN1_STRING_get0_data(san_name->d.dNSName));
2111-
#endif
21122100
}
21132101
if (san_name->type == GEN_IPADD) {
21142102
BIO_printf(bio_out, "IP:");

0 commit comments

Comments
 (0)