projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove silly test for b->references at the end of BIO_write:
[oweals/openssl.git]
/
crypto
/
bio
/
bf_nbio.c
diff --git
a/crypto/bio/bf_nbio.c
b/crypto/bio/bf_nbio.c
index 502973808cc9fa36f6da76972ef16230b24f8ec6..413ef5c4c5e943bb4a342e00872317639c2a7c16 100644
(file)
--- a/
crypto/bio/bf_nbio.c
+++ b/
crypto/bio/bf_nbio.c
@@
-59,31
+59,21
@@
#include <stdio.h>
#include <errno.h>
#include "cryptlib.h"
#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 */
/* 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_read(BIO *h,char *buf,int size);
-static int nbiof_puts(BIO *h,char *str);
+static int nbiof_puts(BIO *h,c
onst c
har *str);
static int nbiof_gets(BIO *h,char *str,int size);
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);
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 */
typedef struct nbio_test_st
{
/* only set if we sent a 'should retry' error */
@@
-102,6
+92,7
@@
static BIO_METHOD methods_nbiof=
nbiof_ctrl,
nbiof_new,
nbiof_free,
nbiof_ctrl,
nbiof_new,
nbiof_free,
+ nbiof_callback_ctrl,
};
BIO_METHOD *BIO_f_nbio_test(void)
};
BIO_METHOD *BIO_f_nbio_test(void)
@@
-113,7
+104,7
@@
static int nbiof_new(BIO *bi)
{
NBIO_TEST *nt;
{
NBIO_TEST *nt;
- nt=(NBIO_TEST *)
M
alloc(sizeof(NBIO_TEST));
+ nt=(NBIO_TEST *)
OPENSSL_m
alloc(sizeof(NBIO_TEST));
nt->lrn= -1;
nt->lwn= -1;
bi->ptr=(char *)nt;
nt->lrn= -1;
nt->lwn= -1;
bi->ptr=(char *)nt;
@@
-126,7
+117,7
@@
static int nbiof_free(BIO *a)
{
if (a == NULL) return(0);
if (a->ptr != NULL)
{
if (a == NULL) return(0);
if (a->ptr != NULL)
-
F
ree(a->ptr);
+
OPENSSL_f
ree(a->ptr);
a->ptr=NULL;
a->init=0;
a->flags=0;
a->ptr=NULL;
a->init=0;
a->flags=0;
@@
-148,7
+139,7
@@
static int nbiof_read(BIO *b, char *out, int outl)
BIO_clear_retry_flags(b);
#if 0
BIO_clear_retry_flags(b);
#if 0
- RAND_bytes(&n,1);
+ RAND_
pseudo_
bytes(&n,1);
num=(n&0x07);
if (outl > num) outl=num;
num=(n&0x07);
if (outl > num) outl=num;
@@
-168,7
+159,7
@@
static int nbiof_read(BIO *b, char *out, int outl)
return(ret);
}
return(ret);
}
-static int nbiof_write(BIO *b, char *in, int inl)
+static int nbiof_write(BIO *b, c
onst c
har *in, int inl)
{
NBIO_TEST *nt;
int ret=0;
{
NBIO_TEST *nt;
int ret=0;
@@
-189,7
+180,7
@@
static int nbiof_write(BIO *b, char *in, int inl)
}
else
{
}
else
{
- RAND_bytes(&n,1);
+ RAND_
pseudo_
bytes(&n,1);
num=(n&7);
}
num=(n&7);
}
@@
-213,7
+204,7
@@
static int nbiof_write(BIO *b, char *in, int inl)
return(ret);
}
return(ret);
}
-static long nbiof_ctrl(BIO *b, int cmd, long num,
char
*ptr)
+static long nbiof_ctrl(BIO *b, int cmd, long num,
void
*ptr)
{
long ret;
{
long ret;
@@
-235,6
+226,20
@@
static long nbiof_ctrl(BIO *b, int cmd, long num, char *ptr)
return(ret);
}
return(ret);
}
+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);
static int nbiof_gets(BIO *bp, char *buf, int size)
{
if (bp->next_bio == NULL) return(0);
@@
-242,7
+247,7
@@
static int nbiof_gets(BIO *bp, char *buf, int size)
}
}
-static int nbiof_puts(BIO *bp, char *str)
+static int nbiof_puts(BIO *bp, c
onst c
har *str)
{
if (bp->next_bio == NULL) return(0);
return(BIO_puts(bp->next_bio,str));
{
if (bp->next_bio == NULL) return(0);
return(BIO_puts(bp->next_bio,str));