diff options
| -rw-r--r-- | include/openssl/bio.h | 15 | ||||
| -rw-r--r-- | ssl/record/ssl3_record.c | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/openssl/bio.h b/include/openssl/bio.h index 85cbe0ae67..66e0b96b44 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -152,13 +152,20 @@ extern "C" { * # define BIO_CTRL_CLEAR_KTLS_CTRL_MSG 75 */ -# define BIO_CTRL_GET_KTLS_SEND 73 -# define BIO_CTRL_GET_KTLS_RECV 76 +# define BIO_CTRL_GET_KTLS_SEND 73 +# define BIO_CTRL_GET_KTLS_RECV 76 +# ifndef OPENSSL_NO_KTLS # define BIO_get_ktls_send(b) \ - BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) + (BIO_method_type(b) == BIO_TYPE_SOCKET \ + && BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL)) # define BIO_get_ktls_recv(b) \ - BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) + (BIO_method_type(b) == BIO_TYPE_SOCKET \ + && BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL)) +# else +# define BIO_get_ktls_send(b) (0) +# define BIO_get_ktls_recv(b) (0) +# endif /* modifiers */ # define BIO_FP_READ 0x02 diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index 24694b3ffa..f758f17dc2 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -211,9 +211,9 @@ int ssl3_get_record(SSL *s) SSL3_BUFFER_get_len(rbuf), 0, num_recs == 0 ? 1 : 0, &n); if (rret <= 0) { +#ifndef OPENSSL_NO_KTLS if (!BIO_get_ktls_recv(s->rbio)) return rret; /* error or non-blocking */ -#ifndef OPENSSL_NO_KTLS switch (errno) { case EBADMSG: SSLfatal(s, SSL_AD_BAD_RECORD_MAC, @@ -233,8 +233,8 @@ int ssl3_get_record(SSL *s) default: break; } - return rret; #endif + return rret; } RECORD_LAYER_set_rstate(&s->rlayer, SSL_ST_READ_BODY); |