QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-01 20:19:39 +00:00
Code Issues Projects Releases Wiki Activity

Support for KTLS TX on FreeBSD for TLS 1.3.

Browse Source 
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12111)
This commit is contained in:
John Baldwin 2019-12-04 16:50:06 -08:00 committed by Matt Caswell
parent 3c1641e8e8
commit b22a3ccc07
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/internal/ktls.h
View File

@ -38,6 +38,7 @@
# endif # endif
# define OPENSSL_KTLS_AES_GCM_128 # define OPENSSL_KTLS_AES_GCM_128
# define OPENSSL_KTLS_AES_GCM_256 # define OPENSSL_KTLS_AES_GCM_256
# define OPENSSL_KTLS_TLS13
/* /*
* Only used by the tests in sslapitest.c. * Only used by the tests in sslapitest.c.
@ -221,6 +222,7 @@ static ossl_inline int ktls_check_supported_cipher(const SSL *s,
case TLS1_VERSION: case TLS1_VERSION:
case TLS1_1_VERSION: case TLS1_1_VERSION:
case TLS1_2_VERSION: case TLS1_2_VERSION:
case TLS1_3_VERSION:
break; break;
default: default:
return 0; return 0;
@ -263,7 +265,10 @@ static ossl_inline int ktls_configure_crypto(const SSL *s, const EVP_CIPHER *c,
case SSL_AES128GCM: case SSL_AES128GCM:
case SSL_AES256GCM: case SSL_AES256GCM:
crypto_info->cipher_algorithm = CRYPTO_AES_NIST_GCM_16; crypto_info->cipher_algorithm = CRYPTO_AES_NIST_GCM_16;
crypto_info->iv_len = EVP_GCM_TLS_FIXED_IV_LEN; if (s->version == TLS1_3_VERSION)
crypto_info->iv_len = EVP_CIPHER_CTX_iv_length(dd);
else
crypto_info->iv_len = EVP_GCM_TLS_FIXED_IV_LEN;
break; break;
case SSL_AES128: case SSL_AES128:
case SSL_AES256: case SSL_AES256:

4
ssl/tls13_enc.c
View File

@ -516,10 +516,8 @@ int tls13_change_cipher_state(SSL *s, int which)
const EVP_MD *md = NULL; const EVP_MD *md = NULL;
const EVP_CIPHER *cipher = NULL; const EVP_CIPHER *cipher = NULL;
#if !defined(OPENSSL_NO_KTLS) && defined(OPENSSL_KTLS_TLS13) #if !defined(OPENSSL_NO_KTLS) && defined(OPENSSL_KTLS_TLS13)
# ifndef __FreeBSD__
ktls_crypto_info_t crypto_info; ktls_crypto_info_t crypto_info;
BIO *bio; BIO *bio;
# endif
#endif #endif
if (which & SSL3_CC_READ) { if (which & SSL3_CC_READ) {
@ -784,7 +782,6 @@ int tls13_change_cipher_state(SSL *s, int which)
s->statem.enc_write_state = ENC_WRITE_STATE_VALID; s->statem.enc_write_state = ENC_WRITE_STATE_VALID;
#ifndef OPENSSL_NO_KTLS #ifndef OPENSSL_NO_KTLS
# if defined(OPENSSL_KTLS_TLS13) # if defined(OPENSSL_KTLS_TLS13)
# ifndef __FreeBSD__
if (!(which & SSL3_CC_WRITE) || !(which & SSL3_CC_APPLICATION) if (!(which & SSL3_CC_WRITE) || !(which & SSL3_CC_APPLICATION)
|| ((which & SSL3_CC_WRITE) && (s->mode & SSL_MODE_NO_KTLS_TX))) || ((which & SSL3_CC_WRITE) && (s->mode & SSL_MODE_NO_KTLS_TX)))
goto skip_ktls; goto skip_ktls;
@ -822,7 +819,6 @@ int tls13_change_cipher_state(SSL *s, int which)
/* ktls works with user provided buffers directly */ /* ktls works with user provided buffers directly */
if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE)) if (BIO_set_ktls(bio, &crypto_info, which & SSL3_CC_WRITE))
ssl3_release_write_buffer(s); ssl3_release_write_buffer(s);
# endif
skip_ktls: skip_ktls:
# endif # endif
#endif #endif