projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apps/speed.c: add -aead flag.
[openssl.git]
/
ssl
/
bio_ssl.c
diff --git
a/ssl/bio_ssl.c
b/ssl/bio_ssl.c
index 29ae258b35708dc0d0628ecc59235e31755315ea..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 */
@@
-34,13
+34,14
@@
typedef struct bio_ssl_st {
} BIO_SSL;
static const BIO_METHOD methods_sslp = {
} BIO_SSL;
static const BIO_METHOD methods_sslp = {
- BIO_TYPE_SSL, "ssl",
+ BIO_TYPE_SSL,
+ "ssl",
ssl_write,
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,
@@
-49,7
+50,7
@@
static const BIO_METHOD methods_sslp = {
const BIO_METHOD *BIO_f_ssl(void)
{
const BIO_METHOD *BIO_f_ssl(void)
{
- return
(&methods_sslp)
;
+ return
&methods_sslp
;
}
static int ssl_new(BIO *bi)
}
static int ssl_new(BIO *bi)
@@
-58,7
+59,7
@@
static int ssl_new(BIO *bi)
if (bs == NULL) {
BIOerr(BIO_F_SSL_NEW, ERR_R_MALLOC_FAILURE);
if (bs == NULL) {
BIOerr(BIO_F_SSL_NEW, ERR_R_MALLOC_FAILURE);
- return
(0)
;
+ return
0
;
}
BIO_set_init(bi, 0);
BIO_set_data(bi, bs);
}
BIO_set_init(bi, 0);
BIO_set_data(bi, bs);
@@
-73,7
+74,7
@@
static int ssl_free(BIO *a)
BIO_SSL *bs;
if (a == NULL)
BIO_SSL *bs;
if (a == NULL)
- return
(0)
;
+ return
0
;
bs = BIO_get_data(a);
if (bs->ssl != NULL)
SSL_shutdown(bs->ssl);
bs = BIO_get_data(a);
if (bs->ssl != NULL)
SSL_shutdown(bs->ssl);
@@
-232,7
+233,7
@@
static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
next = BIO_next(b);
ssl = bs->ssl;
if ((ssl == NULL) && (cmd != BIO_C_SET_SSL))
next = BIO_next(b);
ssl = bs->ssl;
if ((ssl == NULL) && (cmd != BIO_C_SET_SSL))
- return
(0)
;
+ return
0
;
switch (cmd) {
case BIO_CTRL_RESET:
SSL_shutdown(ssl);
switch (cmd) {
case BIO_CTRL_RESET:
SSL_shutdown(ssl);
@@
-382,22
+383,14
@@
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;
}
- 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;
@@
-407,19
+400,13
@@
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;
}
break;
}
- return
(ret)
;
+ return
ret
;
}
static int ssl_puts(BIO *bp, const char *str)
}
static int ssl_puts(BIO *bp, const char *str)
@@
-428,7
+415,7
@@
static int ssl_puts(BIO *bp, const char *str)
n = strlen(str);
ret = BIO_write(bp, str, n);
n = strlen(str);
ret = BIO_write(bp, str, n);
- return
(ret)
;
+ return
ret
;
}
BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
}
BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
@@
-437,17
+424,17
@@
BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
BIO *ret = NULL, *buf = NULL, *ssl = NULL;
if ((buf = BIO_new(BIO_f_buffer())) == NULL)
BIO *ret = NULL, *buf = NULL, *ssl = NULL;
if ((buf = BIO_new(BIO_f_buffer())) == NULL)
- return
(NULL)
;
+ return
NULL
;
if ((ssl = BIO_new_ssl_connect(ctx)) == NULL)
goto err;
if ((ret = BIO_push(buf, ssl)) == NULL)
goto err;
if ((ssl = BIO_new_ssl_connect(ctx)) == NULL)
goto err;
if ((ret = BIO_push(buf, ssl)) == NULL)
goto err;
- return
(ret)
;
+ return
ret
;
err:
BIO_free(buf);
BIO_free(ssl);
#endif
err:
BIO_free(buf);
BIO_free(ssl);
#endif
- return
(NULL)
;
+ return
NULL
;
}
BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
}
BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
@@
-456,16
+443,16
@@
BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
BIO *ret = NULL, *con = NULL, *ssl = NULL;
if ((con = BIO_new(BIO_s_connect())) == NULL)
BIO *ret = NULL, *con = NULL, *ssl = NULL;
if ((con = BIO_new(BIO_s_connect())) == NULL)
- return
(NULL)
;
+ return
NULL
;
if ((ssl = BIO_new_ssl(ctx, 1)) == NULL)
goto err;
if ((ret = BIO_push(ssl, con)) == NULL)
goto err;
if ((ssl = BIO_new_ssl(ctx, 1)) == NULL)
goto err;
if ((ret = BIO_push(ssl, con)) == NULL)
goto err;
- return
(ret)
;
+ return
ret
;
err:
BIO_free(con);
#endif
err:
BIO_free(con);
#endif
- return
(NULL)
;
+ return
NULL
;
}
BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
}
BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
@@
-474,10
+461,10
@@
BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
SSL *ssl;
if ((ret = BIO_new(BIO_f_ssl())) == NULL)
SSL *ssl;
if ((ret = BIO_new(BIO_f_ssl())) == NULL)
- return
(NULL)
;
+ return
NULL
;
if ((ssl = SSL_new(ctx)) == NULL) {
BIO_free(ret);
if ((ssl = SSL_new(ctx)) == NULL) {
BIO_free(ret);
- return
(NULL)
;
+ return
NULL
;
}
if (client)
SSL_set_connect_state(ssl);
}
if (client)
SSL_set_connect_state(ssl);
@@
-485,7
+472,7
@@
BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
SSL_set_accept_state(ssl);
BIO_set_ssl(ret, ssl, BIO_CLOSE);
SSL_set_accept_state(ssl);
BIO_set_ssl(ret, ssl, BIO_CLOSE);
- return
(ret)
;
+ return
ret
;
}
int BIO_ssl_copy_session_id(BIO *t, BIO *f)
}
int BIO_ssl_copy_session_id(BIO *t, BIO *f)
@@
-498,10
+485,10
@@
int BIO_ssl_copy_session_id(BIO *t, BIO *f)
tdata = BIO_get_data(t);
fdata = BIO_get_data(f);
if ((tdata->ssl == NULL) || (fdata->ssl == NULL))
tdata = BIO_get_data(t);
fdata = BIO_get_data(f);
if ((tdata->ssl == NULL) || (fdata->ssl == NULL))
- return
(0)
;
+ return
0
;
if (!SSL_copy_session_id(tdata->ssl, (fdata->ssl)))
return 0;
if (!SSL_copy_session_id(tdata->ssl, (fdata->ssl)))
return 0;
- return
(1)
;
+ return
1
;
}
void BIO_ssl_shutdown(BIO *b)
}
void BIO_ssl_shutdown(BIO *b)