Fixes for Win32 build.

[openssl.git] / crypto / bio / bf_nbio.c

diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c
index b493100ba42c2a0919ddfa26359e7842eb87c0eb..413ef5c4c5e943bb4a342e00872317639c2a7c16 100644 (file)
--- a/crypto/bio/bf_nbio.c
+++ b/crypto/bio/bf_nbio.c
@@ -1,5 +1,5 @@
 /* crypto/bio/bf_nbio.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -59,31 +59,21 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "rand.h"
-#include "bio.h"
-#include "evp.h"
+#include <openssl/rand.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
 
 /* BIO_put and BIO_get both add to the digest,
  * BIO_gets returns the digest */
 
-#ifndef NOPROTO
-static int nbiof_write(BIO *h,char *buf,int num);
+static int nbiof_write(BIO *h,const char *buf,int num);
 static int nbiof_read(BIO *h,char *buf,int size);
-static int nbiof_puts(BIO *h,char *str);
+static int nbiof_puts(BIO *h,const char *str);
 static int nbiof_gets(BIO *h,char *str,int size);
-static long nbiof_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static long nbiof_ctrl(BIO *h,int cmd,long arg1,void *arg2);
 static int nbiof_new(BIO *h);
 static int nbiof_free(BIO *data);
-#else
-static int nbiof_write();
-static int nbiof_read();
-static int nbiof_puts();
-static int nbiof_gets();
-static long nbiof_ctrl();
-static int nbiof_new();
-static int nbiof_free();
-#endif
-
+static long nbiof_callback_ctrl(BIO *h,int cmd,bio_info_cb *fp);
 typedef struct nbio_test_st
        {
        /* only set if we sent a 'should retry' error */
@@ -93,7 +83,8 @@ typedef struct nbio_test_st
 
 static BIO_METHOD methods_nbiof=
        {
-       BIO_TYPE_NBIO_TEST,"non-blocking IO test filter",
+       BIO_TYPE_NBIO_TEST,
+       "non-blocking IO test filter",
        nbiof_write,
        nbiof_read,
        nbiof_puts,
@@ -101,19 +92,19 @@ static BIO_METHOD methods_nbiof=
        nbiof_ctrl,
        nbiof_new,
        nbiof_free,
+       nbiof_callback_ctrl,
        };
 
-BIO_METHOD *BIO_f_nbio_test()
+BIO_METHOD *BIO_f_nbio_test(void)
        {
        return(&methods_nbiof);
        }
 
-static int nbiof_new(bi)
-BIO *bi;
+static int nbiof_new(BIO *bi)
        {
        NBIO_TEST *nt;
 
-       nt=(NBIO_TEST *)Malloc(sizeof(NBIO_TEST));
+       nt=(NBIO_TEST *)OPENSSL_malloc(sizeof(NBIO_TEST));
        nt->lrn= -1;
        nt->lwn= -1;
        bi->ptr=(char *)nt;
@@ -122,22 +113,18 @@ BIO *bi;
        return(1);
        }
 
-static int nbiof_free(a)
-BIO *a;
+static int nbiof_free(BIO *a)
        {
        if (a == NULL) return(0);
        if (a->ptr != NULL)
-               Free(a->ptr);
+               OPENSSL_free(a->ptr);
        a->ptr=NULL;
        a->init=0;
        a->flags=0;
        return(1);
        }
        
-static int nbiof_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int nbiof_read(BIO *b, char *out, int outl)
        {
        NBIO_TEST *nt;
        int ret=0;
@@ -152,7 +139,7 @@ int outl;
 
        BIO_clear_retry_flags(b);
 #if 0
-       RAND_bytes(&n,1);
+       RAND_pseudo_bytes(&n,1);
        num=(n&0x07);
 
        if (outl > num) outl=num;
@@ -172,10 +159,7 @@ int outl;
        return(ret);
        }
 
-static int nbiof_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int nbiof_write(BIO *b, const char *in, int inl)
        {
        NBIO_TEST *nt;
        int ret=0;
@@ -196,7 +180,7 @@ int inl;
                }
        else
                {
-               RAND_bytes(&n,1);
+               RAND_pseudo_bytes(&n,1);
                num=(n&7);
                }
 
@@ -220,11 +204,7 @@ int inl;
        return(ret);
        }
 
-static long nbiof_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr)
        {
        long ret;
 
@@ -237,6 +217,7 @@ char *ptr;
                BIO_copy_next_retry(b);
                break;
        case BIO_CTRL_DUP:
+               ret=0L;
                break;
        default:
                ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
@@ -245,19 +226,28 @@ char *ptr;
        return(ret);
        }
 
-static int nbiof_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
+static long nbiof_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+       {
+       long ret=1;
+
+       if (b->next_bio == NULL) return(0);
+       switch (cmd)
+               {
+       default:
+               ret=BIO_callback_ctrl(b->next_bio,cmd,fp);
+               break;
+               }
+       return(ret);
+       }
+
+static int nbiof_gets(BIO *bp, char *buf, int size)
        {
        if (bp->next_bio == NULL) return(0);
        return(BIO_gets(bp->next_bio,buf,size));
        }
 
 
-static int nbiof_puts(bp,str)
-BIO *bp;
-char *str;
+static int nbiof_puts(BIO *bp, const char *str)
        {
        if (bp->next_bio == NULL) return(0);
        return(BIO_puts(bp->next_bio,str));