D31443.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31443.diff
View Options

	diff --git a/crypto/openssl/include/internal/ktls.h b/crypto/openssl/include/internal/ktls.h
	--- a/crypto/openssl/include/internal/ktls.h
	+++ b/crypto/openssl/include/internal/ktls.h
	@@ -38,6 +38,11 @@
	# define OPENSSL_KTLS_AES_GCM_128
	# define OPENSSL_KTLS_AES_GCM_256
	# define OPENSSL_KTLS_TLS13
	+# ifdef TLS_CHACHA20_IV_LEN
	+# ifndef OPENSSL_NO_CHACHA
	+# define OPENSSL_KTLS_CHACHA20_POLY1305
	+# endif
	+# endif

	typedef struct tls_enable ktls_crypto_info_t;

	diff --git a/crypto/openssl/ssl/ktls.c b/crypto/openssl/ssl/ktls.c
	--- a/crypto/openssl/ssl/ktls.c
	+++ b/crypto/openssl/ssl/ktls.c
	@@ -37,6 +37,10 @@
	case SSL_AES128GCM:
	case SSL_AES256GCM:
	return 1;
	+# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
	+ case SSL_CHACHA20POLY1305:
	+ return 1;
	+# endif
	case SSL_AES128:
	case SSL_AES256:
	if (s->ext.use_etm)
	@@ -71,6 +75,12 @@
	else
	crypto_info->iv_len = EVP_GCM_TLS_FIXED_IV_LEN;
	break;
	+# ifdef OPENSSL_KTLS_CHACHA20_POLY1305
	+ case SSL_CHACHA20POLY1305:
	+ crypto_info->cipher_algorithm = CRYPTO_CHACHA20_POLY1305;
	+ crypto_info->iv_len = EVP_CIPHER_CTX_iv_length(dd);
	+ break;
	+# endif
	case SSL_AES128:
	case SSL_AES256:
	switch (s->s3->tmp.new_cipher->algorithm_mac) {