projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/asm/e_padlock*: add support for Zhaoxin's x86 platform
[openssl.git]
/
ssl
/
bio_ssl.c
diff --git
a/ssl/bio_ssl.c
b/ssl/bio_ssl.c
index 5516260409fecc79666680a33856127f79df38b7..d1876d8b8c1f4a37586641625e99b791adedd17a 100644
(file)
--- a/
ssl/bio_ssl.c
+++ b/
ssl/bio_ssl.c
@@
-22,7
+22,7
@@
static int ssl_puts(BIO *h, const char *str);
static long ssl_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int ssl_new(BIO *h);
static int ssl_free(BIO *data);
static long ssl_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int ssl_new(BIO *h);
static int ssl_free(BIO *data);
-static long ssl_callback_ctrl(BIO *h, int cmd,
bio
_info_cb *fp);
+static long ssl_callback_ctrl(BIO *h, int cmd,
BIO
_info_cb *fp);
typedef struct bio_ssl_st {
SSL *ssl; /* The ssl handle :-) */
/* re-negotiate every time the total number of bytes is this size */
typedef struct bio_ssl_st {
SSL *ssl; /* The ssl handle :-) */
/* re-negotiate every time the total number of bytes is this size */
@@
-37,11
+37,11
@@
static const BIO_METHOD methods_sslp = {
BIO_TYPE_SSL,
"ssl",
ssl_write,
BIO_TYPE_SSL,
"ssl",
ssl_write,
- NULL,
+ NULL,
/* ssl_write_old, */
ssl_read,
ssl_read,
- NULL,
+ NULL,
/* ssl_read_old, */
ssl_puts,
ssl_puts,
- NULL, /* ssl_gets, */
+ NULL, /* ssl_gets,
*/
ssl_ctrl,
ssl_new,
ssl_free,
ssl_ctrl,
ssl_new,
ssl_free,
@@
-383,14
+383,6
@@
static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
case BIO_CTRL_SET_CALLBACK:
ret = 0; /* use callback ctrl */
break;
case BIO_CTRL_SET_CALLBACK:
ret = 0; /* use callback ctrl */
break;
- case BIO_CTRL_GET_CALLBACK:
- {
- void (**fptr) (const SSL *xssl, int type, int val);
-
- fptr = (void (**)(const SSL *xssl, int type, int val))ptr;
- *fptr = SSL_get_info_callback(ssl);
- }
- break;
default:
ret = BIO_ctrl(ssl->rbio, cmd, num, ptr);
break;
default:
ret = BIO_ctrl(ssl->rbio, cmd, num, ptr);
break;
@@
-398,7
+390,7
@@
static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
return ret;
}
return ret;
}
-static long ssl_callback_ctrl(BIO *b, int cmd,
bio
_info_cb *fp)
+static long ssl_callback_ctrl(BIO *b, int cmd,
BIO
_info_cb *fp)
{
SSL *ssl;
BIO_SSL *bs;
{
SSL *ssl;
BIO_SSL *bs;
@@
-408,16
+400,10
@@
static long ssl_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
ssl = bs->ssl;
switch (cmd) {
case BIO_CTRL_SET_CALLBACK:
ssl = bs->ssl;
switch (cmd) {
case BIO_CTRL_SET_CALLBACK:
- {
- /*
- * FIXME: setting this via a completely different prototype seems
- * like a crap idea
- */
- SSL_set_info_callback(ssl, (void (*)(const SSL *, int, int))fp);
- }
+ ret = BIO_callback_ctrl(ssl->rbio, cmd, fp);
break;
default:
break;
default:
- ret =
BIO_callback_ctrl(ssl->rbio, cmd, fp)
;
+ ret =
0
;
break;
}
return ret;
break;
}
return ret;