improved error checking and some fixes

[openssl.git] / ssl / ssl_txt.c

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index 77e881d06120c07f964e7360f43c564000cfab2c..39cf55cbfdff9f11786e9d0b4b3163fabd366edf 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;
@@ -140,7 +140,7 @@ 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 (BIO_puts(bp,"\n    Krb5 Principal: ") <= 0) goto err;
             if (x->krb5_client_princ_len == 0)
             {
                if (BIO_puts(bp,"None") <= 0) goto err;
@@ -148,12 +148,12 @@ int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
        else
                for (i=0; i<x->krb5_client_princ_len; i++)
                        {
-                       if (BIO_printf(bp,"%02X",x->key_arg[i]) <= 0) goto err;
+                       if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err;
                        }
 #endif /* OPENSSL_NO_KRB5 */
        if (x->compress_meth != 0)
                {
-               SSL_COMP *comp;
+               SSL_COMP *comp = NULL;
 
                ssl_cipher_get_evp(x,NULL,NULL,&comp);
                if (comp == NULL)