@@ -1,9 +1,15 @@
 /*
  * Copyright (C) 1997-2000 Sensus Consulting Ltd.
  * Matt Newman <matt@sensus.org>
  */
+#include <tcl.h>
+#include <stdio.h>
+#include <openssl/bio.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+#include <openssl/asn1.h>
 #include "tlsInt.h"
 
 /*
  *  Ensure these are not macros - known to be defined on Win32 
  */
@@ -33,35 +39,35 @@
 {
     static char bp[128];
     char *v;
     int gmt=0;
     static char *mon[12]={
-	"Jan","Feb","Mar","Apr","May","Jun",
-	"Jul","Aug","Sep","Oct","Nov","Dec"};
+        "Jan","Feb","Mar","Apr","May","Jun",
+        "Jul","Aug","Sep","Oct","Nov","Dec"};
     int i;
     int y=0,M=0,d=0,h=0,m=0,s=0;
     
     i=tm->length;
     v=(char *)tm->data;
     
     if (i < 10) goto err;
     if (v[i-1] == 'Z') gmt=1;
     for (i=0; i<10; i++)
-	if ((v[i] > '9') || (v[i] < '0')) goto err;
+        if ((v[i] > '9') || (v[i] < '0')) goto err;
     y= (v[0]-'0')*10+(v[1]-'0');
     if (y < 70) y+=100;
     M= (v[2]-'0')*10+(v[3]-'0');
     if ((M > 12) || (M < 1)) goto err;
     d= (v[4]-'0')*10+(v[5]-'0');
     h= (v[6]-'0')*10+(v[7]-'0');
     m=  (v[8]-'0')*10+(v[9]-'0');
     if (	(v[10] >= '0') && (v[10] <= '9') &&
 		(v[11] >= '0') && (v[11] <= '9'))
-	s=  (v[10]-'0')*10+(v[11]-'0');
+        s=  (v[10]-'0')*10+(v[11]-'0');
     
     sprintf(bp,"%s %2d %02d:%02d:%02d %d%s",
-		   mon[M-1],d,h,m,s,y+1900,(gmt)?" GMT":"");
+                   mon[M-1],d,h,m,s,y+1900,(gmt)?" GMT":"");
     return bp;
  err:
     return "Bad time value";
 }
 
@@ -100,11 +106,11 @@
     char certStr[CERT_STR_SIZE], *certStr_p;
     int certStr_len, toRead;
 #ifndef NO_SSL_SHA
     char sha1_hash_ascii[SHA_DIGEST_LENGTH * 2 + 1];
     unsigned char sha1_hash_binary[SHA_DIGEST_LENGTH];
-    char sha256_hash_ascii[SHA256_DIGEST_LENGTH*2+1];
+    char sha256_hash_ascii[SHA256_DIGEST_LENGTH * 2 + 1];
     unsigned char sha256_hash_binary[SHA256_DIGEST_LENGTH];
     const char *shachars="0123456789ABCDEF";
 
     sha1_hash_ascii[SHA_DIGEST_LENGTH * 2] = '\0';
     sha256_hash_ascii[SHA256_DIGEST_LENGTH * 2] = '\0';
@@ -135,43 +141,48 @@
 	n = BIO_read(bio, serial, min(BIO_pending(bio), BUFSIZ - 1));
 	n = max(n, 0);
 	serial[n] = 0;
 	(void)BIO_flush(bio);
 
-	if (PEM_write_bio_X509(bio, cert)) {
-	    certStr_p = certStr;
-	    certStr_len = 0;
-	    while (1) {
-		toRead = min(BIO_pending(bio), CERT_STR_SIZE - certStr_len - 1);
-		toRead = min(toRead, BUFSIZ);
-		if (toRead == 0) {
-		    break;
-		}
-		dprintf("Reading %i bytes from the certificate...", toRead);
-		n = BIO_read(bio, certStr_p, toRead);
-		if (n <= 0) {
-		    break;
-		}
-		certStr_len += n;
-		certStr_p   += n;
-	    }
-	    *certStr_p = '\0';
-	    (void)BIO_flush(bio);
-	}
+        if (PEM_write_bio_X509(bio, cert)) {
+            certStr_p = certStr;
+            certStr_len = 0;
+            while (1) {
+                toRead = min(BIO_pending(bio), CERT_STR_SIZE - certStr_len - 1);
+                toRead = min(toRead, BUFSIZ);
+                if (toRead == 0) {
+                    break;
+                }
+                dprintf("Reading %i bytes from the certificate...", toRead);
+                n = BIO_read(bio, certStr_p, toRead);
+                if (n <= 0) {
+                    break;
+                }
+                certStr_len += n;
+                certStr_p   += n;
+            }
+            *certStr_p = '\0';
+            (void)BIO_flush(bio);
+        }
 
 	BIO_free(bio);
     }
 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     strcpy( notBefore, ASN1_UTCTIME_tostr( X509_get_notBefore(cert) ));
     strcpy( notAfter, ASN1_UTCTIME_tostr( X509_get_notAfter(cert) ));
+#else
+    strcpy( notBefore, ASN1_UTCTIME_tostr( X509_getm_notBefore(cert) ));
+    strcpy( notAfter, ASN1_UTCTIME_tostr( X509_getm_notAfter(cert) ));
+#endif
 
 #ifndef NO_SSL_SHA
     /* SHA1 */
     X509_digest(cert, EVP_sha1(), sha1_hash_binary, NULL);
     for (int n = 0; n < SHA_DIGEST_LENGTH; n++) {
-	sha1_hash_ascii[n * 2]     = shachars[(sha1_hash_binary[n] & 0xF0) >> 4];
-	sha1_hash_ascii[n * 2 + 1] = shachars[(sha1_hash_binary[n] & 0x0F)];
+        sha1_hash_ascii[n*2]   = shachars[(sha1_hash_binary[n] & 0xF0) >> 4];
+        sha1_hash_ascii[n*2+1] = shachars[(sha1_hash_binary[n] & 0x0F)];
     }
     Tcl_ListObjAppendElement( interp, certPtr, Tcl_NewStringObj("sha1_hash", -1) );
     Tcl_ListObjAppendElement( interp, certPtr, Tcl_NewStringObj(sha1_hash_ascii, SHA_DIGEST_LENGTH * 2) );
 
     /* SHA256 */