openssl-engine-0.9.6 merge

1 files changed, 26 insertions, 26 deletions

diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index ff0c9070ae..f50e8f98a3 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -62,14 +62,14 @@
 #include <openssl/bio.h>
 #include <openssl/evp.h>
 
-static int buffer_write(BIO *h,char *buf,int num);
-static int buffer_read(BIO *h,char *buf,int size);
-static int buffer_puts(BIO *h,char *str);
-static int buffer_gets(BIO *h,char *str,int size);
-static long buffer_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static int buffer_write(BIO *h, const char *buf,int num);
+static int buffer_read(BIO *h, char *buf, int size);
+static int buffer_puts(BIO *h, const char *str);
+static int buffer_gets(BIO *h, char *str, int size);
+static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int buffer_new(BIO *h);
 static int buffer_free(BIO *data);
-static long buffer_callback_ctrl(BIO *h,int cmd, void (*fp)());
+static long buffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 #define DEFAULT_BUFFER_SIZE     1024
 
 static BIO_METHOD methods_buffer=
@@ -95,12 +95,12 @@ static int buffer_new(BIO *bi)
         {
         BIO_F_BUFFER_CTX *ctx;
 
-        ctx=(BIO_F_BUFFER_CTX *)Malloc(sizeof(BIO_F_BUFFER_CTX));
+        ctx=(BIO_F_BUFFER_CTX *)OPENSSL_malloc(sizeof(BIO_F_BUFFER_CTX));
         if (ctx == NULL) return(0);
-        ctx->ibuf=(char *)Malloc(DEFAULT_BUFFER_SIZE);
-        if (ctx->ibuf == NULL) { Free(ctx); return(0); }
-        ctx->obuf=(char *)Malloc(DEFAULT_BUFFER_SIZE);
-        if (ctx->obuf == NULL) { Free(ctx->ibuf); Free(ctx); return(0); }
+        ctx->ibuf=(char *)OPENSSL_malloc(DEFAULT_BUFFER_SIZE);
+        if (ctx->ibuf == NULL) { OPENSSL_free(ctx); return(0); }
+        ctx->obuf=(char *)OPENSSL_malloc(DEFAULT_BUFFER_SIZE);
+        if (ctx->obuf == NULL) { OPENSSL_free(ctx->ibuf); OPENSSL_free(ctx); return(0); }
         ctx->ibuf_size=DEFAULT_BUFFER_SIZE;
         ctx->obuf_size=DEFAULT_BUFFER_SIZE;
         ctx->ibuf_len=0;
@@ -120,9 +120,9 @@ static int buffer_free(BIO *a)
 
         if (a == NULL) return(0);
         b=(BIO_F_BUFFER_CTX *)a->ptr;
-        if (b->ibuf != NULL) Free(b->ibuf);
-        if (b->obuf != NULL) Free(b->obuf);
-        Free(a->ptr);
+        if (b->ibuf != NULL) OPENSSL_free(b->ibuf);
+        if (b->obuf != NULL) OPENSSL_free(b->obuf);
+        OPENSSL_free(a->ptr);
         a->ptr=NULL;
         a->init=0;
         a->flags=0;
@@ -195,7 +195,7 @@ start:
         goto start;
         }
 
-static int buffer_write(BIO *b, char *in, int inl)
+static int buffer_write(BIO *b, const char *in, int inl)
         {
         int i,num=0;
         BIO_F_BUFFER_CTX *ctx;
@@ -268,7 +268,7 @@ start:
         goto start;
         }
 
-static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)
+static long buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
         BIO *dbio;
         BIO_F_BUFFER_CTX *ctx;
@@ -319,9 +319,9 @@ static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)
         case BIO_C_SET_BUFF_READ_DATA:
                 if (num > ctx->ibuf_size)
                         {
-                        p1=Malloc((int)num);
+                        p1=OPENSSL_malloc((int)num);
                         if (p1 == NULL) goto malloc_error;
-                        if (ctx->ibuf != NULL) Free(ctx->ibuf);
+                        if (ctx->ibuf != NULL) OPENSSL_free(ctx->ibuf);
                         ctx->ibuf=p1;
                         }
                 ctx->ibuf_off=0;
@@ -353,21 +353,21 @@ static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)
                 p2=ctx->obuf;
                 if ((ibs > DEFAULT_BUFFER_SIZE) && (ibs != ctx->ibuf_size))
                         {
-                        p1=(char *)Malloc((int)num);
+                        p1=(char *)OPENSSL_malloc((int)num);
                         if (p1 == NULL) goto malloc_error;
                         }
                 if ((obs > DEFAULT_BUFFER_SIZE) && (obs != ctx->obuf_size))
                         {
-                        p2=(char *)Malloc((int)num);
+                        p2=(char *)OPENSSL_malloc((int)num);
                         if (p2 == NULL)
                                 {
-                                if (p1 != ctx->ibuf) Free(p1);
+                                if (p1 != ctx->ibuf) OPENSSL_free(p1);
                                 goto malloc_error;
                                 }
                         }
                 if (ctx->ibuf != p1)
                         {
-                        Free(ctx->ibuf);
+                        OPENSSL_free(ctx->ibuf);
                         ctx->ibuf=p1;
                         ctx->ibuf_off=0;
                         ctx->ibuf_len=0;
@@ -375,7 +375,7 @@ static long buffer_ctrl(BIO *b, int cmd, long num, char *ptr)
                         }
                 if (ctx->obuf != p2)
                         {
-                        Free(ctx->obuf);
+                        OPENSSL_free(ctx->obuf);
                         ctx->obuf=p2;
                         ctx->obuf_off=0;
                         ctx->obuf_len=0;
@@ -439,7 +439,7 @@ malloc_error:
         return(0);
         }
 
-static long buffer_callback_ctrl(BIO *b, int cmd, void (*fp)())
+static long buffer_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
         {
         long ret=1;
 
@@ -504,8 +504,8 @@ static int buffer_gets(BIO *b, char *buf, int size)
                 }
         }
 
-static int buffer_puts(BIO *b, char *str)
+static int buffer_puts(BIO *b, const char *str)
         {
-        return(BIO_write(b,str,strlen(str)));
+        return(buffer_write(b,str,strlen(str)));
         }