projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rsaz-x86_64.pl: add MULX/ADCX/ADOX code path.
[openssl.git]
/
crypto
/
bio
/
bss_conn.c
diff --git
a/crypto/bio/bss_conn.c
b/crypto/bio/bss_conn.c
index f1016e51d3a39d8d26587ecbef6afec7288c6875..c14727855b259b30b1ed679948337ba2f2e95a1f 100644
(file)
--- a/
crypto/bio/bss_conn.c
+++ b/
crypto/bio/bss_conn.c
@@
-130,7
+130,7
@@
static int conn_state(BIO *b, BIO_CONNECT *c)
int ret= -1,i;
unsigned long l;
char *p,*q;
int ret= -1,i;
unsigned long l;
char *p,*q;
- int (*cb)()=NULL;
+ int (*cb)(
const BIO *,int,int
)=NULL;
if (c->info_callback != NULL)
cb=c->info_callback;
if (c->info_callback != NULL)
cb=c->info_callback;
@@
-469,7
+469,7
@@
static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_C_DO_STATE_MACHINE:
/* use this one to start the connection */
break;
case BIO_C_DO_STATE_MACHINE:
/* use this one to start the connection */
- if (
!
data->state != BIO_CONN_S_OK)
+ if (data->state != BIO_CONN_S_OK)
ret=(long)conn_state(b,data);
else
ret=1;
ret=(long)conn_state(b,data);
else
ret=1;
@@
-590,9
+590,9
@@
static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
break;
case BIO_CTRL_GET_CALLBACK:
{
break;
case BIO_CTRL_GET_CALLBACK:
{
- int (**fptr)();
+ int (**fptr)(
const BIO *bio,int state,int xret
);
- fptr=(int (**)())ptr;
+ fptr=(int (**)(
const BIO *bio,int state,int xret
))ptr;
*fptr=data->info_callback;
}
break;
*fptr=data->info_callback;
}
break;