@@ -9,11 +9,11 @@
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
 #include "tlsInt.h"
 
 /*
- *  Ensure these are not macros - known to be defined on Win32 
+ *  Ensure these are not macros - known to be defined on Win32
  */
 #ifdef min
 #undef min
 #endif
 
@@ -39,18 +39,17 @@
 {
     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;
     y= (v[0]-'0')*10+(v[1]-'0');
@@ -58,16 +57,14 @@
     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'))
+    if ((v[10] >= '0') && (v[10] <= '9') && (v[11] >= '0') && (v[11] <= '9'))
         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":"");
+
+    sprintf(bp,"%s %2d %02d:%02d:%02d %d%s", mon[M-1],d,h,m,s,y+1900,(gmt)?" GMT":"");
     return bp;
  err:
     return "Bad time value";
 }
 
@@ -91,12 +88,12 @@
  */
 
 #define CERT_STR_SIZE 16384
 
 Tcl_Obj*
-Tls_NewX509Obj( Tcl_Interp *interp, X509 *cert) {
-    Tcl_Obj *certPtr = Tcl_NewListObj( 0, NULL);
+Tls_NewX509Obj(Tcl_Interp *interp, X509 *cert) {
+    Tcl_Obj *certPtr = Tcl_NewListObj(0, NULL);
     BIO *bio;
     int n;
     unsigned long flags;
     char subject[BUFSIZ];
     char issuer[BUFSIZ];
@@ -123,11 +120,11 @@
 	serial[0]  = 0;
     } else {
 	flags = XN_FLAG_RFC2253 | ASN1_STRFLGS_UTF8_CONVERT;
 	flags &= ~ASN1_STRFLGS_ESC_MSB;
 
-	X509_NAME_print_ex(bio, X509_get_subject_name(cert), 0, flags); 
+	X509_NAME_print_ex(bio, X509_get_subject_name(cert), 0, flags);
 	n = BIO_read(bio, subject, min(BIO_pending(bio), BUFSIZ - 1));
 	n = max(n, 0);
 	subject[n] = 0;
 	(void)BIO_flush(bio);
 
@@ -166,15 +163,15 @@
 
 	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) ));
+    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) ));
+    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);