Merge commit 'd6d760cac6d0adaa7c96a4414c2534f31469a6a0' as 'tls'

1 files changed, 179 insertions, 0 deletions

diff --git a/tls/tlsX509.c b/tls/tlsX509.c
new file mode 100644
index 0000000..2a529b1
--- /dev/null
+++ b/tls/tlsX509.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 1997-2000 Sensus Consulting Ltd.
+ * Matt Newman <matt@sensus.org>
+ *
+ * $Header: /cvsroot/tls/tls/tlsX509.c,v 1.5 2004/06/29 10:58:08 patthoyts Exp $
+ */
+#include "tlsInt.h"
+
+/*
+ *  Ensure these are not macros - known to be defined on Win32 
+ */
+#ifdef min
+#undef min
+#endif
+
+#ifdef max
+#undef max
+#endif
+
+static int min(int a, int b)
+{
+    return (a < b) ? a : b;
+}
+
+static int max(int a, int b)
+{
+    return (a > b) ? a : b;
+}
+
+/*
+ * ASN1_UTCTIME_tostr --
+ */
+static char *
+ASN1_UTCTIME_tostr(ASN1_UTCTIME *tm)
+{
+    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"};
+    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');
+    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');
+    
+    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";
+}
+
+/*
+ *------------------------------------------------------*
+ *
+ *	Tls_NewX509Obj --
+ *
+ *	------------------------------------------------*
+ *	Converts a X509 certificate into a Tcl_Obj
+ *	------------------------------------------------*
+ *
+ *	Sideeffects:
+ *		None
+ *
+ *	Result:
+ *		A Tcl List Object representing the provided
+ *		X509 certificate.
+ *
+ *------------------------------------------------------*
+ */
+
+Tcl_Obj*
+Tls_NewX509Obj( interp, cert)
+    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];
+    char serial[BUFSIZ];
+    char notBefore[BUFSIZ];
+    char notAfter[BUFSIZ];
+#ifndef NO_SSL_SHA
+    int shai;
+    char sha_hash[SHA_DIGEST_LENGTH*2];
+    const char *shachars="0123456789ABCDEF";
+#endif
+
+    if ((bio = BIO_new(BIO_s_mem())) == NULL) {
+	subject[0] = 0;
+	issuer[0]  = 0;
+	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); 
+	n = BIO_read(bio, subject, min(BIO_pending(bio), BUFSIZ - 1));
+	n = max(n, 0);
+	subject[n] = 0;
+	BIO_flush(bio);
+
+	X509_NAME_print_ex(bio, X509_get_issuer_name(cert), 0, flags);
+	n = BIO_read(bio, issuer, min(BIO_pending(bio), BUFSIZ - 1));
+	n = max(n, 0);
+	issuer[n] = 0;
+	BIO_flush(bio);
+
+	i2a_ASN1_INTEGER(bio, X509_get_serialNumber(cert));
+	n = BIO_read(bio, serial, min(BIO_pending(bio), BUFSIZ - 1));
+	n = max(n, 0);
+	serial[n] = 0;
+	BIO_flush(bio);
+
+	BIO_free(bio);
+    }
+
+    strcpy( notBefore, ASN1_UTCTIME_tostr( X509_get_notBefore(cert) ));
+    strcpy( notAfter, ASN1_UTCTIME_tostr( X509_get_notAfter(cert) ));
+
+#ifndef NO_SSL_SHA
+    for (shai=0;shai<SHA_DIGEST_LENGTH;shai++)
+    {
+        sha_hash[shai * 2]=shachars[(cert->sha1_hash[shai] & 0xF0) >> 4];
+        sha_hash[shai * 2 + 1]=shachars[(cert->sha1_hash[shai] & 0x0F)];
+    }
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "sha1_hash", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( sha_hash, SHA_DIGEST_LENGTH*2) );
+
+#endif
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "subject", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( subject, -1) );
+
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "issuer", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( issuer, -1) );
+
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "notBefore", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( notBefore, -1) );
+
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "notAfter", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( notAfter, -1) );
+
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( "serial", -1) );
+    Tcl_ListObjAppendElement( interp, certPtr,
+	    Tcl_NewStringObj( serial, -1) );
+
+    return certPtr;
+}