New function DSA_dup_DH, and fixes for bugs that were found

[openssl.git] / ssl / ssl_txt.c

diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c
index e41b738f5c9181cc9af4dbd910b06d8f3969558c..ca67a98d896a61081d92811232cf3a5db9e12bec 100644 (file)
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -57,34 +57,30 @@
  */
 
 #include <stdio.h>
-#include "buffer.h"
+#include <openssl/buffer.h>
 #include "ssl_locl.h"
 
 #ifndef NO_FP_API
-int SSL_SESSION_print_fp(fp, x)
-FILE *fp;
-SSL_SESSION *x;
-        {
-        BIO *b;
-        int ret;
+int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x)
+       {
+       BIO *b;
+       int ret;
 
-        if ((b=BIO_new(BIO_s_file_internal())) == NULL)
+       if ((b=BIO_new(BIO_s_file_internal())) == NULL)
                {
                SSLerr(SSL_F_SSL_SESSION_PRINT_FP,ERR_R_BUF_LIB);
-                return(0);
+               return(0);
                }
-        BIO_set_fp(b,fp,BIO_NOCLOSE);
-        ret=SSL_SESSION_print(b,x);
-        BIO_free(b);
-        return(ret);
-        }
+       BIO_set_fp(b,fp,BIO_NOCLOSE);
+       ret=SSL_SESSION_print(b,x);
+       BIO_free(b);
+       return(ret);
+       }
 #endif
 
-int SSL_SESSION_print(bp,x)
-BIO *bp;
-SSL_SESSION *x;
+int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)
        {
-       int i;
+       unsigned int i;
        char str[128],*s;
 
        if (x == NULL) goto err;
@@ -111,13 +107,19 @@ SSL_SESSION *x;
                sprintf(str,"    Cipher    : %s\n",(x->cipher == NULL)?"unknown":x->cipher->name);
        if (BIO_puts(bp,str) <= 0) goto err;
        if (BIO_puts(bp,"    Session-ID: ") <= 0) goto err;
-       for (i=0; i<(int)x->session_id_length; i++)
+       for (i=0; i<x->session_id_length; i++)
                {
                sprintf(str,"%02X",x->session_id[i]);
                if (BIO_puts(bp,str) <= 0) goto err;
                }
+       if (BIO_puts(bp,"\nSession-ID-ctx: ") <= 0) goto err;
+       for (i=0; i<x->sid_ctx_length; i++)
+               {
+               sprintf(str,"%02X",x->sid_ctx[i]);
+               if (BIO_puts(bp,str) <= 0) goto err;
+               }
        if (BIO_puts(bp,"\n    Master-Key: ") <= 0) goto err;
-       for (i=0; i<(int)x->master_key_length; i++)
+       for (i=0; i<(unsigned int)x->master_key_length; i++)
                {
                sprintf(str,"%02X",x->master_key[i]);
                if (BIO_puts(bp,str) <= 0) goto err;
@@ -128,7 +130,7 @@ SSL_SESSION *x;
                if (BIO_puts(bp,"None") <= 0) goto err;
                }
        else
-               for (i=0; i<(int)x->key_arg_length; i++)
+               for (i=0; i<x->key_arg_length; i++)
                        {
                        sprintf(str,"%02X",x->key_arg[i]);
                        if (BIO_puts(bp,str) <= 0) goto err;