projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSO_load() should also work when it is passed a NULL - a new DSO is created
[oweals/openssl.git]
/
crypto
/
bio
/
bf_nbio.c
diff --git
a/crypto/bio/bf_nbio.c
b/crypto/bio/bf_nbio.c
index 9b4bcb19d43792e04a1be8bb8b2bf7931c14c791..413ef5c4c5e943bb4a342e00872317639c2a7c16 100644
(file)
--- a/
crypto/bio/bf_nbio.c
+++ b/
crypto/bio/bf_nbio.c
@@
-73,7
+73,7
@@
static int nbiof_gets(BIO *h,char *str,int size);
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 long nbiof_ctrl(BIO *h,int cmd,long arg1,void *arg2);
static int nbiof_new(BIO *h);
static int nbiof_free(BIO *data);
-static long nbiof_callback_ctrl(BIO *h,int cmd,
void (*fp)()
);
+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 */
@@
-104,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;
@@
-117,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;
@@
-226,7
+226,7
@@
static long nbiof_ctrl(BIO *b, int cmd, long num, void *ptr)
return(ret);
}
return(ret);
}
-static long nbiof_callback_ctrl(BIO *b, int cmd,
void (*fp)()
)
+static long nbiof_callback_ctrl(BIO *b, int cmd,
bio_info_cb *fp
)
{
long ret=1;
{
long ret=1;