@@ -593,7 +593,7 @@ static char *ssl_printname(X509_NAME *name)
593
593
*
594
594
* You need to nfree() the returned pointer.
595
595
*/
596
- static char * ssl_printtime (ASN1_UTCTIME * t )
596
+ static char * ssl_printtime (const ASN1_UTCTIME * t )
597
597
{
598
598
long len ;
599
599
char * data , * buf ;
@@ -691,8 +691,13 @@ static void ssl_showcert(X509 *cert, const int loglev)
691
691
692
692
693
693
/* Validity time */
694
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 */
695
+ from = ssl_printtime (X509_get0_notBefore (cert ));
696
+ to = ssl_printtime (X509_get0_notAfter (cert ));
697
+ #else
694
698
from = ssl_printtime (X509_get_notBefore (cert ));
695
699
to = ssl_printtime (X509_get_notAfter (cert ));
700
+ #endif
696
701
putlog (loglev , "*" , "TLS: certificate valid from %s to %s" , from , to );
697
702
nfree (from );
698
703
nfree (to );
@@ -1113,11 +1118,19 @@ static int tcl_tlsstatus STDVAR
1113
1118
Tcl_DStringAppendElement (& ds , "issuer" );
1114
1119
Tcl_DStringAppendElement (& ds , p );
1115
1120
nfree (p );
1121
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 */
1122
+ p = ssl_printtime (X509_get0_notBefore (cert ));
1123
+ #else
1116
1124
p = ssl_printtime (X509_get_notBefore (cert ));
1125
+ #endif
1117
1126
Tcl_DStringAppendElement (& ds , "notBefore" );
1118
1127
Tcl_DStringAppendElement (& ds , p );
1119
1128
nfree (p );
1129
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 */
1130
+ p = ssl_printtime (X509_get0_notAfter (cert ));
1131
+ #else
1120
1132
p = ssl_printtime (X509_get_notAfter (cert ));
1133
+ #endif
1121
1134
Tcl_DStringAppendElement (& ds , "notAfter" );
1122
1135
Tcl_DStringAppendElement (& ds , p );
1123
1136
nfree (p );
0 commit comments