Update from HEAD.

[oweals/openssl.git] / ssl / ssl_txt.c

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index 8b37a37e404ac8c63a7e9bd5ab1d694b4f4fd804..4eb0867155e1633af6815b1aea0dba5225b54afb 100644 (file)
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -61,7 +61,7 @@
 #include "ssl_locl.h"
 
 #ifndef OPENSSL_NO_FP_API
-int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
+int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
        {
        BIO *b;
        int ret;
@@ -78,10 +78,10 @@ int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
        }
 #endif
 
-int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
+int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
        {
        unsigned int i;
-       char *s;
+       const char *s;
 
        if (x == NULL) goto err;
        if (BIO_puts(bp,"SSL-Session:\n") <= 0) goto err;
@@ -139,9 +139,22 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
                        {
                        if (BIO_printf(bp,"%02X",x->key_arg[i]) <= 0) goto err;
                        }
+#ifndef OPENSSL_NO_KRB5
+       if (BIO_puts(bp,"\n    Krb5 Principal: ") <= 0) goto err;
+            if (x->krb5_client_princ_len == 0)
+            {
+               if (BIO_puts(bp,"None") <= 0) goto err;
+               }
+       else
+               for (i=0; i<x->krb5_client_princ_len; i++)
+                       {
+                       if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err;
+                       }
+#endif /* OPENSSL_NO_KRB5 */
+#ifndef OPENSSL_NO_COMP
        if (x->compress_meth != 0)
                {
-               SSL_COMP *comp;
+               SSL_COMP *comp = NULL;
 
                ssl_cipher_get_evp(x,NULL,NULL,&comp);
                if (comp == NULL)
@@ -153,6 +166,7 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
                        if (BIO_printf(bp,"\n   Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err;
                        }
                }       
+#endif
        if (x->time != 0L)
                {
                if (BIO_printf(bp, "\n    Start Time: %ld",x->time) <= 0) goto err;