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 22fbb5f55b254298d164a8f5560189405297e39d..ca67a98d896a61081d92811232cf3a5db9e12bec 100644 (file)
--- a/ssl/ssl_txt.c
+++ b/ssl/ssl_txt.c
@@ -57,32 +57,28 @@
  */
 
 #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)
        {
        unsigned int i;
        char str[128],*s;