Added cs_get_SSL. yaz-client-ssl prints peer info

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index 429a1fe..cacc274 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.237 2004-04-07 13:47:59 adam Exp $
+ * $Id: client.c,v 1.239 2004-04-28 12:10:51 adam Exp $
  */
 
 #include <stdio.h>
@@ -16,6 +16,14 @@
 #include <langinfo.h>
 #endif
 
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
 #include <time.h>
 #include <ctype.h>
 
@@ -529,6 +537,9 @@ int session_connect(const char *arg)
     void *add;
     char type_and_host[101];
     const char *basep = 0;
+#if HAVE_OPENSSL_SSL_H
+    SSL *ssl;
+#endif
     if (conn)
     {
         cs_close (conn);
@@ -586,6 +597,31 @@ int session_connect(const char *arg)
         return 0;
     }
     printf("OK.\n");
+#if HAVE_OPENSSL_SSL_H
+    if ((ssl = (SSL *) cs_get_ssl(conn)))
+    {
+       X509 *server_cert = SSL_get_peer_certificate (ssl);
+       char *str;
+       if (server_cert)
+       {
+           printf ("Server certificate:\n");
+           
+           str = X509_NAME_oneline (X509_get_subject_name (server_cert),0,0);
+           if (str)
+           {
+               printf ("\t subject: %s\n", str);
+               free (str);
+           }
+           str = X509_NAME_oneline (X509_get_issuer_name  (server_cert),0,0);
+           if (str)
+           {
+               printf ("\t issuer: %s\n", str);
+               free (str);
+           }
+           X509_free (server_cert);
+       }
+    }
+#endif
     if (basep && *basep)
         set_base (basep);
     if (protocol == PROTO_Z3950)
@@ -747,8 +783,10 @@ static void display_record(Z_External *r)
     else if (r->which == Z_External_octet)
     {
         const char *octet_buf = (char*)r->u.octet_aligned->buf;
-        if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
-            ent->value == VAL_HTML)
+        if (ent->oclass == CLASS_RECSYN && 
+               (ent->value == VAL_TEXT_XML || 
+                ent->value == VAL_APPLICATION_XML ||
+                ent->value == VAL_HTML))
         {
             print_record((const unsigned char *) octet_buf,
                          r->u.octet_aligned->len);