@@ -2072,11 +2072,7 @@ parse_cert(const char *name, const char *path)
2072
2072
BIO_printf (bio_out , "\n" );
2073
2073
2074
2074
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
2078
2075
ASN1_TIME_print (bio_out , X509_get0_notAfter (cert ));
2079
- #endif
2080
2076
BIO_printf (bio_out , "\n" );
2081
2077
2082
2078
has_san = 0 ;
@@ -2097,18 +2093,10 @@ parse_cert(const char *name, const char *path)
2097
2093
first_san = 0 ;
2098
2094
}
2099
2095
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
2103
2096
BIO_printf (bio_out , "RFC822:%s" , (char * ) ASN1_STRING_get0_data (san_name -> d .rfc822Name ));
2104
- #endif
2105
2097
}
2106
2098
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
2110
2099
BIO_printf (bio_out , "DNS:%s" , (char * ) ASN1_STRING_get0_data (san_name -> d .dNSName ));
2111
- #endif
2112
2100
}
2113
2101
if (san_name -> type == GEN_IPADD ) {
2114
2102
BIO_printf (bio_out , "IP:" );
0 commit comments