KTLS additional ciphersuites

Key update supported for patched kernels [1] Configuration option `ktls = false` [2] following ciphersuites are now supported: [3] * TLS_AES_128_CCM_SHA256 * TLS_CHACHA20_POLY1305_SHA256 Ivalidate session on KTLS error as there is no way to recover and new sockets as well as session have to be created. [4] [1] https://gitlab.com/gnutls/gnutls/-/merge_requests/1625 [2] https://gitlab.com/gnutls/gnutls/-/merge_requests/1673/diffs?commit_id=aefd7319c0b7b2410d06238246b7755b289e4837 [3] https://gitlab.com/gnutls/gnutls/-/merge_requests/1676 [4] https://gitlab.com/gnutls/gnutls/-/merge_requests/1664 Signed-off-by: Frantisek Krenzelok <krenzelok.frantisek@gmail.com>
2022-12-14 14:36:33 +01:00
30 changed files with 858 additions and 10710 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -141,35 +141,3 @@ gnutls-2.10.1-nosrp.tar.bz2
 /gnutls-3.7.6.tar.xz
 /gnutls-3.7.7.tar.xz
 /gnutls-3.7.8.tar.xz
-/gnutls-3.8.0.tar.xz
-/gnutls-3.8.0.tar.xz.sig
-/gnutls-release-keyring.gpg
-/gnutls-3.8.1.tar.xz
-/gnutls-3.8.1.tar.xz.sig
-/gnutls-3.8.2.tar.xz
-/gnutls-3.8.2.tar.xz.sig
-/gnutls-3.8.3.tar.xz
-/gnutls-3.8.3.tar.xz.sig
-/gnutls-3.8.4.tar.xz
-/gnutls-3.8.4.tar.xz.sig
-/gnutls-3.8.5.tar.xz
-/gnutls-3.8.5.tar.xz.sig
-/gnutls-3.8.6.tar.xz
-/gnutls-3.8.6.tar.xz.sig
-/gmp-6.2.1.tar.xz
-/gnutls-3.8.7.tar.xz
-/gnutls-3.8.7.tar.xz.sig
-/gnutls-3.8.7.1.tar.xz
-/gnutls-3.8.7.1.tar.xz.sig
-/gnutls-3.8.8.tar.xz
-/gnutls-3.8.8.tar.xz.sig
-/gnutls-3.8.9.tar.xz
-/gnutls-3.8.9.tar.xz.sig
-/leancrypto-1.2.0.tar.gz
-/leancrypto-1.3.0.tar.gz
-/gnutls-3.8.10.tar.xz
-/gnutls-3.8.10.tar.xz.sig
-/leancrypto-1.5.0.tar.gz
-/gnutls-3.8.11.tar.xz
-/gnutls-3.8.11.tar.xz.sig
-/leancrypto-1.6.0.tar.gz
--- a/.packit.yaml
+++ b/.packit.yaml
@ -15,6 +15,7 @@ actions:
  post-upstream-clone:
    - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls.spec"
    - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls-3.2.7-rpath.patch"
+    - "wget https://src.fedoraproject.org/rpms/gnutls/raw/main/f/gnutls-3.6.7-no-now-guile.patch"
  get-current-version:
    - "git describe --abbrev=0"
  create-archive:
@ -28,4 +29,5 @@ actions:
 jobs:
  - job: propose_downstream
    trigger: release
-    dist_git_branches: fedora-all
+    metadata:
+      dist_git_branches: fedora-all
--- a/README.packit
+++ b/README.packit
@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 1.12.0.
+The file was generated using packit 0.60.0.
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gmp-6.2.1-c23.patch
+++ b/gmp-6.2.1-c23.patch
@ -1,13 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index 906071c..a466b7c 100644
--- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -609,7 +609,7 @@ GMP_PROG_CC_WORKS_PART([$1], [long long reliability test 1],
- 
- #if defined (__GNUC__) && ! defined (__cplusplus)
- typedef unsigned long long t1;typedef t1*t2;
-void g(){}
-+void g(int, t2, t1, t2, t2, int){}
- void h(){}
- static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
- {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
--- a/gmp-6.2.1-intel-cet.patch
+++ b/gmp-6.2.1-intel-cet.patch
--- a/gnutls-3.6.7-no-now-guile.patch
+++ b/gnutls-3.6.7-no-now-guile.patch
@ -0,0 +1,11 @@
+--- a/guile/src/Makefile.in	2019-03-27 11:51:55.984398001 +0100
+++ b/guile/src/Makefile.in	2019-03-27 11:52:27.259626076 +0100
+@@ -1472,7 +1472,7 @@
+ # Use '-module' to build a "dlopenable module", in Libtool terms.
+ # Use '-undefined' to placate Libtool on Windows; see
+ # <https://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.
+-guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined
+guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined -Wl,-z,lazy
+ 
+ # Linking against GnuTLS.
+ GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la
--- a/gnutls-3.7.4.tar.xz.sig
+++ b/gnutls-3.7.4.tar.xz.sig
--- a/gnutls-3.7.5.tar.xz.sig
+++ b/gnutls-3.7.5.tar.xz.sig
--- a/gnutls-3.7.6.tar.xz.sig
+++ b/gnutls-3.7.6.tar.xz.sig
--- a/gnutls-3.7.7.tar.xz.sig
+++ b/gnutls-3.7.7.tar.xz.sig
--- a/gnutls-3.7.8-gcc_analyzer-suppress_warnings.patch
+++ b/gnutls-3.7.8-gcc_analyzer-suppress_warnings.patch
@ -0,0 +1,132 @@
+From 7fa942e08e64b761b19753ae74503de43cc1ff91 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Thu, 6 Oct 2022 18:44:48 +0900
+Subject: build: suppress GCC analyzer warnings
+
+Signed-off-by: Daiki Ueno <ueno@gnu.org>
+
+diff --git a/lib/auth/cert.c b/lib/auth/cert.c
+index 228d98468..f122049e1 100644
+--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
+@@ -1636,6 +1636,10 @@ _gnutls_select_server_cert(gnutls_session_t session, const gnutls_cipher_suite_e
+ 			if (session->internals.selected_cert_list_length == 0)
+ 				return gnutls_assert_val(GNUTLS_E_INSUFFICIENT_CREDENTIALS);
+ 
+			if (unlikely(session->internals.selected_cert_list == NULL)) {
+				return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+			}
+
+ 			_gnutls_debug_log("Selected (%s) cert\n",
+ 					  gnutls_pk_get_name(session->internals.selected_cert_list[0].pubkey->params.algo));
+ 		}
+diff --git a/lib/nettle/int/provable-prime.c b/lib/nettle/int/provable-prime.c
+index 585cd031e..3a626a2c8 100644
+--- a/lib/nettle/int/provable-prime.c
+++ b/lib/nettle/int/provable-prime.c
+@@ -1173,7 +1173,7 @@ st_provable_prime(mpz_t p,
+ 	if (iterations > 0) {
+ 		storage_length = iterations * DIGEST_SIZE;
+ 
+-		storage = malloc(storage_length);
+		storage = gnutls_malloc(storage_length);
+ 		if (storage == NULL)
+ 			goto fail;
+ 
+@@ -1307,7 +1307,7 @@ st_provable_prime(mpz_t p,
+ 	mpz_clear(t);
+ 	mpz_clear(tmp);
+ 	mpz_clear(c);
+-	free(pseed);
+-	free(storage);
+	gnutls_free(pseed);
+	gnutls_free(storage);
+ 	return ret;
+ }
+diff --git a/lib/pk.c b/lib/pk.c
+index c5600a32a..753cecd18 100644
+--- a/lib/pk.c
+++ b/lib/pk.c
+@@ -93,6 +93,7 @@ _gnutls_encode_ber_rs_raw(gnutls_datum_t * sig_value,
+ 	}
+ 
+ 	if (r->data[0] >= 0x80) {
+		assert(tmp);
+ 		tmp[0] = 0;
+ 		memcpy(&tmp[1], r->data, r->size);
+ 		result = asn1_write_value(sig, "r", tmp, 1+r->size);
+@@ -108,6 +109,7 @@ _gnutls_encode_ber_rs_raw(gnutls_datum_t * sig_value,
+ 
+ 
+ 	if (s->data[0] >= 0x80) {
+		assert(tmp);
+ 		tmp[0] = 0;
+ 		memcpy(&tmp[1], s->data, s->size);
+ 		result = asn1_write_value(sig, "s", tmp, 1+s->size);
+@@ -598,6 +600,10 @@ encode_ber_digest_info(const mac_entry_st * e,
+ 	uint8_t *tmp_output;
+ 	int tmp_output_size;
+ 
+	if (unlikely(e == NULL)) {
+		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+	}
+
+ 	/* prevent asn1_write_value() treating input as string */
+ 	if (digest->size == 0)
+ 		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c
+index 59eddcd2a..6f528a911 100644
+--- a/lib/x509/pkcs7-crypt.c
+++ b/lib/x509/pkcs7-crypt.c
+@@ -1211,6 +1211,10 @@ _gnutls_pkcs_raw_decrypt_data(schema_id schema, asn1_node pkcs8_asn,
+ 	}
+ 
+ 	ce = cipher_to_entry(enc_params->cipher);
+	if (unlikely(ce == NULL)) {
+		ret = gnutls_assert_val(GNUTLS_E_UNKNOWN_CIPHER_TYPE);
+		goto error;
+	}
+ 	block_size = _gnutls_cipher_get_block_size(ce);
+ 
+ 	if (ce->type == CIPHER_BLOCK) {
+diff --git a/src/tests.c b/src/tests.c
+index 85c4b6699..8526b6943 100644
+--- a/src/tests.c
+++ b/src/tests.c
+@@ -1613,7 +1613,9 @@ test_code_t test_chain_order(gnutls_session_t session)
+ 
+ 		gnutls_free(t.data);
+ 	}
+-	*pos = 0;
+	if (pos) {
+		*pos = 0;
+	}
+ 
+ 	t.size = p_size;
+ 	t.data = (void*)p;
+diff --git a/src/tpmtool.c b/src/tpmtool.c
+index 171b7fd41..1b230c2ff 100644
+--- a/src/tpmtool.c
+++ b/src/tpmtool.c
+@@ -263,15 +263,15 @@ static void tpm_generate(FILE * out, unsigned int key_type,
+ 	gnutls_datum_t privkey, pubkey;
+ 
+ 	if (!srk_well_known) {
+-		srk_pass = getpass("Enter SRK password: ");
+-		if (srk_pass != NULL)
+-			srk_pass = strdup(srk_pass);
+		char *pass = getpass("Enter SRK password: ");
+		if (pass != NULL)
+			srk_pass = strdup(pass);
+ 	}
+ 
+ 	if (!(flags & GNUTLS_TPM_REGISTER_KEY)) {
+-		key_pass = getpass("Enter key password: ");
+-		if (key_pass != NULL)
+-			key_pass = strdup(key_pass);
+		char *pass = getpass("Enter key password: ");
+		if (pass != NULL)
+			key_pass = strdup(pass);
+ 	}
+ 
+ 	ret =
--- a/gnutls-3.7.8-ktls-updates.patch
+++ b/gnutls-3.7.8-ktls-updates.patch
@ -0,0 +1,620 @@
+diff -rpu a/lib/alert.c a/lib/alert.c
+--- a/lib/alert.c	2022-12-09 14:58:19.713666537 +0100
+++ a/lib/alert.c	2022-12-09 15:26:30.976250789 +0100
+@@ -182,15 +182,10 @@ gnutls_alert_send(gnutls_session_t sessi
+ 		return ret;
+ 	}
+ 
+-	if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_SEND)) {
+-		ret =
+-			_gnutls_ktls_send_control_msg(session, GNUTLS_ALERT, data, 2);
+-	} else {
+-		ret =
+-			_gnutls_send_int(session, GNUTLS_ALERT, -1,
+-				EPOCH_WRITE_CURRENT, data, 2,
+-				MBUFFER_FLUSH);
+-	}
+	ret = _gnutls_send_int(session, GNUTLS_ALERT, -1,
+			      EPOCH_WRITE_CURRENT, data, 2,
+			      MBUFFER_FLUSH);
+
+ 	return (ret < 0) ? ret : 0;
+ }
+ 
+diff -rpu a/lib/handshake.c a/lib/handshake.c
+--- a/lib/handshake.c	2022-12-09 14:58:19.712666534 +0100
+++ a/lib/handshake.c	2022-12-09 15:31:51.768496850 +0100
+@@ -2924,7 +2924,13 @@ int gnutls_handshake(gnutls_session_t se
+ 
+ #ifdef ENABLE_KTLS
+ 	if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_DUPLEX)) {
+-		_gnutls_ktls_set_keys(session);
+		ret = _gnutls_ktls_set_keys(session, GNUTLS_KTLS_DUPLEX);
+		if (ret < 0) {
+			/* no need to invalidate the session as keys were not set */
+			session->internals.ktls_enabled = 0;
+			_gnutls_audit_log(session,
+					  "disabling KTLS: failed to set keys\n");
+		}
+ 	}
+ #endif
+ 
+diff -rpu a/lib/includes/gnutls/gnutls.h.in a/lib/includes/gnutls/gnutls.h.in
+--- a/lib/includes/gnutls/gnutls.h.in	2022-12-09 14:58:19.706666511 +0100
+++ a/lib/includes/gnutls/gnutls.h.in	2022-12-09 15:30:04.784082188 +0100
+@@ -3418,6 +3418,27 @@ int gnutls_fips140_pop_context(void);
+ 
+ int gnutls_fips140_run_self_tests(void);
+ 
+/**
+ * gnutls_transport_ktls_enable_flags_t:
+ * @GNUTLS_KTLS_RECV: ktls enabled for recv function.
+ * @GNUTLS_KTLS_SEND: ktls enabled for send function.
+ * @GNUTLS_KTLS_DUPLEX: ktls enabled for both recv and send functions.
+ *
+ * Flag enumeration of ktls enable status for recv and send functions.
+ * This is used by gnutls_transport_is_ktls_enabled().
+ *
+ * Since: 3.7.3
+ */
+typedef enum {
+	GNUTLS_KTLS_RECV = 1 << 0,
+	GNUTLS_KTLS_SEND = 1 << 1,
+	GNUTLS_KTLS_DUPLEX = GNUTLS_KTLS_RECV | GNUTLS_KTLS_SEND,
+} gnutls_transport_ktls_enable_flags_t;
+
+
+gnutls_transport_ktls_enable_flags_t
+gnutls_transport_is_ktls_enabled(gnutls_session_t session);
+
+   /* Gnutls error codes. The mapping to a TLS alert is also shown in
+    * comments.
+    */
+diff -rpu a/lib/includes/gnutls/socket.h a/lib/includes/gnutls/socket.h
+--- a/lib/includes/gnutls/socket.h	2022-12-09 14:58:19.706666511 +0100
+++ a/lib/includes/gnutls/socket.h	2022-12-09 15:30:04.785082192 +0100
+@@ -37,27 +37,6 @@ extern "C" {
+ #endif
+ /* *INDENT-ON* */
+ 
+-/**
+- * gnutls_transport_ktls_enable_flags_t:
+- * @GNUTLS_KTLS_RECV: ktls enabled for recv function.
+- * @GNUTLS_KTLS_SEND: ktls enabled for send function.
+- * @GNUTLS_KTLS_DUPLEX: ktls enabled for both recv and send functions.
+- *
+- * Flag enumeration of ktls enable status for recv and send functions.
+- * This is used by gnutls_transport_is_ktls_enabled().
+- *
+- * Since: 3.7.3
+- */
+-typedef enum {
+-	GNUTLS_KTLS_RECV = 1 << 0,
+-	GNUTLS_KTLS_SEND = 1 << 1,
+-	GNUTLS_KTLS_DUPLEX = GNUTLS_KTLS_RECV | GNUTLS_KTLS_SEND,
+-} gnutls_transport_ktls_enable_flags_t;
+-
+-
+-gnutls_transport_ktls_enable_flags_t
+-gnutls_transport_is_ktls_enabled(gnutls_session_t session);
+-
+ void gnutls_transport_set_fastopen(gnutls_session_t session,
+                                    int fd,
+                                    struct sockaddr *connect_addr,
+diff -rpu a/lib/priority.c a/lib/priority.c
+--- a/lib/priority.c	2022-12-09 14:58:19.712666534 +0100
+++ a/lib/priority.c	2022-12-09 15:30:04.787082200 +0100
+@@ -1541,6 +1541,8 @@ static int global_ini_handler(void *ctx,
+ 			p = clear_spaces(value, str);
+ 			if (c_strcasecmp(p, "true") == 0) {
+ 				cfg->ktls_enabled = true;
+			} else if (c_strcasecmp(p, "false") == 0) {
+				cfg->ktls_enabled = false;
+ 			} else {
+ 				_gnutls_debug_log("cfg: unknown ktls mode %s\n",
+ 					p);
+diff -rpu a/lib/record.c a/lib/record.c
+--- a/lib/record.c	2022-12-09 14:58:19.712666534 +0100
+++ a/lib/record.c	2022-12-09 15:26:30.978250796 +0100
+@@ -2065,11 +2065,17 @@ gnutls_record_send2(gnutls_session_t ses
+ 			session->internals.rsend_state = RECORD_SEND_KEY_UPDATE_3;
+ 			FALLTHROUGH;
+ 		case RECORD_SEND_KEY_UPDATE_3:
+-			ret = _gnutls_send_int(session, GNUTLS_APPLICATION_DATA,
+-						-1, EPOCH_WRITE_CURRENT,
+-						session->internals.record_key_update_buffer.data,
+-						session->internals.record_key_update_buffer.length,
+-						MBUFFER_FLUSH);
+			if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_SEND)) {
+				return _gnutls_ktls_send(session,
+							 session->internals.record_key_update_buffer.data,
+							 session->internals.record_key_update_buffer.length);
+			} else {
+				ret = _gnutls_send_int(session, GNUTLS_APPLICATION_DATA,
+							-1, EPOCH_WRITE_CURRENT,
+							session->internals.record_key_update_buffer.data,
+							session->internals.record_key_update_buffer.length,
+							MBUFFER_FLUSH);
+			}
+ 			_gnutls_buffer_clear(&session->internals.record_key_update_buffer);
+ 			session->internals.rsend_state = RECORD_SEND_NORMAL;
+ 			if (ret < 0)
+@@ -2494,8 +2500,11 @@ gnutls_handshake_write(gnutls_session_t
+ 		return gnutls_assert_val(0);
+ 
+ 	/* When using this, the outgoing handshake messages should
+-	 * also be handled manually */
+-	if (!session->internals.h_read_func)
+	 * also be handled manually unless KTLS is enabled exclusively
+	 * in GNUTLS_KTLS_RECV mode in which case the outgoing messages
+	 * are handled by GnuTLS.
+	 */
+	if (!session->internals.h_read_func && !IS_KTLS_ENABLED(session, GNUTLS_KTLS_RECV))
+ 		return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+ 
+ 	if (session->internals.initial_negotiation_completed) {
+diff -rpu a/lib/system/ktls.c a/lib/system/ktls.c
+--- a/lib/system/ktls.c	2022-12-09 14:58:19.710666526 +0100
+++ a/lib/system/ktls.c	2022-12-09 15:31:31.358417745 +0100
+@@ -80,13 +80,13 @@ void _gnutls_ktls_enable(gnutls_session_
+ 	}
+ }
+ 
+-int _gnutls_ktls_set_keys(gnutls_session_t session)
+int _gnutls_ktls_set_keys(gnutls_session_t session, gnutls_transport_ktls_enable_flags_t in)
+ {
+ 	gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(session);
+ 	gnutls_datum_t mac_key;
+ 	gnutls_datum_t iv;
+ 	gnutls_datum_t cipher_key;
+-	unsigned char seq_number[8];
+	unsigned char seq_number[12];
+ 	int sockin, sockout;
+ 	int ret;
+ 
+@@ -97,7 +97,9 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 	int version = gnutls_protocol_get_version(session);
+ 	if ((version != GNUTLS_TLS1_3 && version != GNUTLS_TLS1_2) ||
+ 		(gnutls_cipher_get(session) != GNUTLS_CIPHER_AES_128_GCM &&
+-		gnutls_cipher_get(session) != GNUTLS_CIPHER_AES_256_GCM)) {
+		gnutls_cipher_get(session) != GNUTLS_CIPHER_AES_256_GCM &&
+		gnutls_cipher_get(session) != GNUTLS_CIPHER_AES_128_CCM &&
+		gnutls_cipher_get(session) != GNUTLS_CIPHER_CHACHA20_POLY1305)) {
+ 		return  GNUTLS_E_UNIMPLEMENTED_FEATURE;
+ 	}
+ 
+@@ -107,12 +109,14 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 		return ret;
+ 	}
+ 
+-	if(session->internals.ktls_enabled & GNUTLS_KTLS_RECV){
+	in &= session->internals.ktls_enabled;
+
+	if(in & GNUTLS_KTLS_RECV){
+ 		switch (cipher) {
+ 			case GNUTLS_CIPHER_AES_128_GCM:
+ 			{
+ 				struct tls12_crypto_info_aes_gcm_128 crypto_info;
+-				memset(&crypto_info, 0, sizeof(crypto_info));
+				memset(&crypto_info, 0, sizeof (crypto_info));
+ 
+ 				crypto_info.info.cipher_type = TLS_CIPHER_AES_GCM_128;
+ 				assert(cipher_key.size == TLS_CIPHER_AES_GCM_128_KEY_SIZE);
+@@ -148,7 +152,7 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 			case GNUTLS_CIPHER_AES_256_GCM:
+ 			{
+ 				struct tls12_crypto_info_aes_gcm_256 crypto_info;
+-				memset(&crypto_info, 0, sizeof(crypto_info));
+				memset(&crypto_info, 0, sizeof (crypto_info));
+ 
+ 				crypto_info.info.cipher_type = TLS_CIPHER_AES_GCM_256;
+ 				assert (cipher_key.size == TLS_CIPHER_AES_GCM_256_KEY_SIZE);
+@@ -180,9 +184,83 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 				}
+ 			}
+ 			break;
+			case GNUTLS_CIPHER_AES_128_CCM:
+			{
+				struct tls12_crypto_info_aes_ccm_128 crypto_info;
+				memset(&crypto_info, 0, sizeof (crypto_info));
+
+				crypto_info.info.cipher_type = TLS_CIPHER_AES_CCM_128;
+				assert(cipher_key.size == TLS_CIPHER_AES_CCM_128_KEY_SIZE);
+
+				/* for TLS 1.2 IV is generated in kernel */
+				if (version == GNUTLS_TLS1_2) {
+					crypto_info.info.version = TLS_1_2_VERSION;
+					memcpy(crypto_info.iv, seq_number, TLS_CIPHER_AES_CCM_128_IV_SIZE);
+				} else {
+					crypto_info.info.version = TLS_1_3_VERSION;
+					assert(iv.size == TLS_CIPHER_AES_CCM_128_SALT_SIZE
+							+ TLS_CIPHER_AES_CCM_128_IV_SIZE);
+
+					memcpy(crypto_info.iv, iv.data +
+						TLS_CIPHER_AES_CCM_128_SALT_SIZE,
+						TLS_CIPHER_AES_CCM_128_IV_SIZE);
+				}
+
+				memcpy(crypto_info.salt, iv.data,
+				TLS_CIPHER_AES_CCM_128_SALT_SIZE);
+				memcpy(crypto_info.rec_seq, seq_number,
+				TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE);
+				memcpy(crypto_info.key, cipher_key.data,
+				TLS_CIPHER_AES_CCM_128_KEY_SIZE);
+
+				if (setsockopt (sockin, SOL_TLS, TLS_RX,
+						&crypto_info, sizeof (crypto_info))) {
+					session->internals.ktls_enabled &= ~GNUTLS_KTLS_RECV;
+					return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+				}
+			}
+			break;
+			case GNUTLS_CIPHER_CHACHA20_POLY1305:
+			{
+				struct tls12_crypto_info_chacha20_poly1305 crypto_info;
+				memset(&crypto_info, 0, sizeof (crypto_info));
+
+				crypto_info.info.cipher_type = TLS_CIPHER_CHACHA20_POLY1305;
+				assert(cipher_key.size == TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE);
+
+				/* for TLS 1.2 IV is generated in kernel */
+				if (version == GNUTLS_TLS1_2) {
+					crypto_info.info.version = TLS_1_2_VERSION;
+					memcpy(crypto_info.iv, seq_number, TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+				} else {
+					crypto_info.info.version = TLS_1_3_VERSION;
+					assert(iv.size == TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE
+							+ TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+
+					memcpy(crypto_info.iv, iv.data +
+						TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE,
+						TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+				}
+
+				memcpy(crypto_info.salt, iv.data,
+				TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE);
+				memcpy(crypto_info.rec_seq, seq_number,
+				TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE);
+				memcpy(crypto_info.key, cipher_key.data,
+				TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE);
+
+				if (setsockopt (sockin, SOL_TLS, TLS_RX,
+						&crypto_info, sizeof (crypto_info))) {
+					session->internals.ktls_enabled &= ~GNUTLS_KTLS_RECV;
+					return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+				}
+			}
+			break;
+ 			default:
+ 				assert(0);
+ 		}
+
+
+ 	}
+ 
+ 	ret = gnutls_record_get_state (session, 0, &mac_key, &iv, &cipher_key,
+@@ -191,12 +269,12 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 		return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+ 	}
+ 
+-	if(session->internals.ktls_enabled & GNUTLS_KTLS_SEND){
+	if(in & GNUTLS_KTLS_SEND){
+ 		switch (cipher) {
+ 			case GNUTLS_CIPHER_AES_128_GCM:
+ 			{
+ 				struct tls12_crypto_info_aes_gcm_128 crypto_info;
+-				memset(&crypto_info, 0, sizeof(crypto_info));
+				memset(&crypto_info, 0, sizeof (crypto_info));
+ 
+ 				crypto_info.info.cipher_type = TLS_CIPHER_AES_GCM_128;
+ 
+@@ -232,7 +310,7 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 			case GNUTLS_CIPHER_AES_256_GCM:
+ 			{
+ 				struct tls12_crypto_info_aes_gcm_256 crypto_info;
+-				memset(&crypto_info, 0, sizeof(crypto_info));
+				memset(&crypto_info, 0, sizeof (crypto_info));
+ 
+ 				crypto_info.info.cipher_type = TLS_CIPHER_AES_GCM_256;
+ 				assert (cipher_key.size == TLS_CIPHER_AES_GCM_256_KEY_SIZE);
+@@ -264,12 +342,90 @@ int _gnutls_ktls_set_keys(gnutls_session
+ 				}
+ 			}
+ 			break;
+			case GNUTLS_CIPHER_AES_128_CCM:
+			{
+				struct tls12_crypto_info_aes_ccm_128 crypto_info;
+				memset(&crypto_info, 0, sizeof (crypto_info));
+
+				crypto_info.info.cipher_type = TLS_CIPHER_AES_CCM_128;
+				assert (cipher_key.size == TLS_CIPHER_AES_CCM_128_KEY_SIZE);
+
+				/* for TLS 1.2 IV is generated in kernel */
+				if (version == GNUTLS_TLS1_2) {
+					crypto_info.info.version = TLS_1_2_VERSION;
+					memcpy(crypto_info.iv, seq_number, TLS_CIPHER_AES_CCM_128_IV_SIZE);
+				} else {
+					crypto_info.info.version = TLS_1_3_VERSION;
+					assert (iv.size == TLS_CIPHER_AES_CCM_128_SALT_SIZE +
+							TLS_CIPHER_AES_CCM_128_IV_SIZE);
+
+					memcpy (crypto_info.iv, iv.data + TLS_CIPHER_AES_CCM_128_SALT_SIZE,
+					TLS_CIPHER_AES_CCM_128_IV_SIZE);
+				}
+
+				memcpy (crypto_info.salt, iv.data,
+				TLS_CIPHER_AES_CCM_128_SALT_SIZE);
+				memcpy (crypto_info.rec_seq, seq_number,
+				TLS_CIPHER_AES_CCM_128_REC_SEQ_SIZE);
+				memcpy (crypto_info.key, cipher_key.data,
+				TLS_CIPHER_AES_CCM_128_KEY_SIZE);
+
+				if (setsockopt (sockout, SOL_TLS, TLS_TX,
+						&crypto_info, sizeof (crypto_info))) {
+					session->internals.ktls_enabled &= ~GNUTLS_KTLS_SEND;
+					return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+				}
+			}
+			break;
+			case GNUTLS_CIPHER_CHACHA20_POLY1305:
+			{
+				struct tls12_crypto_info_chacha20_poly1305 crypto_info;
+				memset(&crypto_info, 0, sizeof (crypto_info));
+
+				crypto_info.info.cipher_type = TLS_CIPHER_CHACHA20_POLY1305;
+				assert (cipher_key.size == TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE);
+
+				/* for TLS 1.2 IV is generated in kernel */
+				if (version == GNUTLS_TLS1_2) {
+					crypto_info.info.version = TLS_1_2_VERSION;
+					memcpy(crypto_info.iv, seq_number, TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+				} else {
+					crypto_info.info.version = TLS_1_3_VERSION;
+					assert (iv.size == TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE +
+							TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+
+					memcpy (crypto_info.iv, iv.data + TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE,
+					TLS_CIPHER_CHACHA20_POLY1305_IV_SIZE);
+				}
+
+				memcpy (crypto_info.salt, iv.data,
+				TLS_CIPHER_CHACHA20_POLY1305_SALT_SIZE);
+				memcpy (crypto_info.rec_seq, seq_number,
+				TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE);
+				memcpy (crypto_info.key, cipher_key.data,
+				TLS_CIPHER_CHACHA20_POLY1305_KEY_SIZE);
+
+				if (setsockopt (sockout, SOL_TLS, TLS_TX,
+						&crypto_info, sizeof (crypto_info))) {
+					session->internals.ktls_enabled &= ~GNUTLS_KTLS_SEND;
+					return gnutls_assert_val(GNUTLS_E_INTERNAL_ERROR);
+				}
+			}
+			break;
+ 			default:
+ 				assert(0);
+ 		}
+
+
+		// set callback for sending handshake messages
+		gnutls_handshake_set_read_function(session,
+						   _gnutls_ktls_send_handshake_msg);
+
+		// set callback for sending alert messages
+		gnutls_alert_set_read_function(session, _gnutls_ktls_send_alert_msg);
+ 	}
+ 
+-	return 0;
+	return in;
+ }
+ 
+ ssize_t _gnutls_ktls_send_file(gnutls_session_t session, int fd,
+@@ -353,6 +509,26 @@ int _gnutls_ktls_send_control_msg(gnutls
+ 	return data_size;
+ }
+ 
+int _gnutls_ktls_send_handshake_msg(gnutls_session_t session,
+				    gnutls_record_encryption_level_t level,
+				    gnutls_handshake_description_t htype,
+				    const void *data, size_t data_size)
+{
+	return _gnutls_ktls_send_control_msg(session, GNUTLS_HANDSHAKE,
+					     data, data_size);
+}
+
+int _gnutls_ktls_send_alert_msg(gnutls_session_t session,
+				gnutls_record_encryption_level_t level,
+				gnutls_alert_level_t alert_level,
+				gnutls_alert_description_t alert_desc)
+{
+	uint8_t data[2];
+	data[0] = (uint8_t) alert_level;
+	data[1] = (uint8_t) alert_desc;
+	return _gnutls_ktls_send_control_msg(session, GNUTLS_ALERT, data, 2);
+}
+
+ int _gnutls_ktls_recv_control_msg(gnutls_session_t session,
+ 			unsigned char *record_type, void *data, size_t data_size)
+ {
+@@ -438,7 +614,13 @@ int _gnutls_ktls_recv_int(gnutls_session
+ 				ret = 0;
+ 				break;
+ 			case GNUTLS_HANDSHAKE:
+-				// ignore post-handshake messages
+				ret = gnutls_handshake_write(session,
+						GNUTLS_ENCRYPTION_LEVEL_APPLICATION,
+						data, ret);
+
+				if (ret < 0)
+					return gnutls_assert_val(ret);
+
+ 				if (type != record_type)
+ 					return GNUTLS_E_AGAIN;
+ 				break;
+@@ -465,7 +647,7 @@ gnutls_transport_is_ktls_enabled(gnutls_
+ void _gnutls_ktls_enable(gnutls_session_t session) {
+ }
+ 
+-int _gnutls_ktls_set_keys(gnutls_session_t session) {
+int _gnutls_ktls_set_keys(gnutls_session_t sessioni, gnutls_transport_ktls_enable_flags_t in) {
+ 	return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+ }
+ 
+@@ -479,6 +661,15 @@ int _gnutls_ktls_send_control_msg(gnutls
+ 	return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+ }
+ 
+int _gnutls_ktls_send_handshake_msg(gnutls_session_t session,
+				    gnutls_record_encryption_level_t level,
+				    gnutls_handshake_description_t htype,
+				    const void *data, size_t data_size)
+{
+	(void)level;
+	return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+}
+
+ int _gnutls_ktls_recv_int(gnutls_session_t session, content_type_t type,
+ 		void *data, size_t data_size) {
+ 	return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+diff -rpu a/lib/system/ktls.h a/lib/system/ktls.h
+--- a/lib/system/ktls.h	2022-12-09 14:58:19.710666526 +0100
+++ a/lib/system/ktls.h	2022-12-09 15:26:30.979250800 +0100
+@@ -4,14 +4,29 @@
+ #include "gnutls_int.h"
+ 
+ void _gnutls_ktls_enable(gnutls_session_t session);
+-int _gnutls_ktls_set_keys(gnutls_session_t session);
+
+int _gnutls_ktls_set_keys(gnutls_session_t session, gnutls_transport_ktls_enable_flags_t in);
+
+ ssize_t _gnutls_ktls_send_file(gnutls_session_t session, int fd,
+ 		off_t *offset, size_t count);
+
+int _gnutls_ktls_send_handshake_msg(gnutls_session_t session,
+				    gnutls_record_encryption_level_t level,
+				    gnutls_handshake_description_t htype,
+				    const void *data, size_t data_size);
+
+int _gnutls_ktls_send_alert_msg(gnutls_session_t session,
+				gnutls_record_encryption_level_t level,
+				gnutls_alert_level_t alert_level,
+				gnutls_alert_description_t alert_desc);
+
+ int _gnutls_ktls_send_control_msg(gnutls_session_t session, unsigned char record_type,
+ 		const void *data, size_t data_size);
+ #define _gnutls_ktls_send(x, y, z) _gnutls_ktls_send_control_msg(x, GNUTLS_APPLICATION_DATA, y, z);
+
+ int _gnutls_ktls_recv_control_msg(gnutls_session_t session, unsigned char *record_type,
+ 		void *data, size_t data_size);
+
+ int _gnutls_ktls_recv_int(gnutls_session_t session, content_type_t type, void *data, size_t data_size);
+ #define _gnutls_ktls_recv(x, y, z) _gnutls_ktls_recv_int(x, GNUTLS_APPLICATION_DATA, y, z)
+ 
+diff -rpu a/lib/tls13/key_update.c a/lib/tls13/key_update.c
+--- a/lib/tls13/key_update.c	2022-12-09 14:58:19.711666530 +0100
+++ a/lib/tls13/key_update.c	2022-12-09 15:31:51.769496854 +0100
+@@ -27,10 +27,28 @@
+ #include "mem.h"
+ #include "mbuffers.h"
+ #include "secrets.h"
+#include "system/ktls.h"
+ 
+ #define KEY_UPDATES_WINDOW 1000
+ #define KEY_UPDATES_PER_WINDOW 8
+ 
+/*
+ * Sets kTLS keys if enabled.
+ * If this operation fails with GNUTLS_E_INTERNAL_ERROR, KTLS is disabled
+ * because KTLS most likely doesn't support key update.
+ */
+#define SET_KTLS_KEYS(session, interface)\
+{\
+if(_gnutls_ktls_set_keys(session, interface) < 0) {\
+		session->internals.ktls_enabled = 0;\
+		session->internals.invalid_connection = true;\
+		session->internals.resumable = false;\
+		_gnutls_audit_log(session,\
+			"invalidating session: KTLS - couldn't update keys\n");\
+		ret = GNUTLS_E_INTERNAL_ERROR;\
+}\
+}
+
+ static int update_keys(gnutls_session_t session, hs_stage_t stage)
+ {
+ 	int ret;
+@@ -49,8 +67,20 @@ static int update_keys(gnutls_session_t
+ 	 * write keys */
+ 	if (session->internals.recv_state == RECV_STATE_EARLY_START) {
+ 		ret = _tls13_write_connection_state_init(session, stage);
+		if (ret < 0)
+			return gnutls_assert_val(ret);
+
+		if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_SEND))
+			SET_KTLS_KEYS(session,  GNUTLS_KTLS_SEND)
+ 	} else {
+ 		ret = _tls13_connection_state_init(session, stage);
+		if (ret < 0)
+			return gnutls_assert_val(ret);
+
+		if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_SEND) && stage == STAGE_UPD_OURS)
+			SET_KTLS_KEYS(session, GNUTLS_KTLS_SEND)
+		else if (IS_KTLS_ENABLED(session, GNUTLS_KTLS_RECV) && stage == STAGE_UPD_PEERS)
+			SET_KTLS_KEYS(session, GNUTLS_KTLS_RECV)
+ 	}
+ 	if (ret < 0)
+ 		return gnutls_assert_val(ret);
+diff -rpu a/src/common.c a/src/common.c
+--- a/src/common.c	2022-12-09 14:58:19.737666626 +0100
+++ a/src/common.c	2022-12-09 15:30:04.788082204 +0100
+@@ -498,6 +498,7 @@ int print_info(gnutls_session_t session,
+ 	gnutls_datum_t p;
+ 	char *desc;
+ 	gnutls_protocol_t version;
+	gnutls_transport_ktls_enable_flags_t ktls_flags;
+ 	int rc;
+ 
+ 	desc = gnutls_session_get_desc(session);
+@@ -646,6 +647,15 @@ int print_info(gnutls_session_t session,
+ 
+ 	print_channel_bindings(session, verbose);
+ 
+	ktls_flags = gnutls_transport_is_ktls_enabled(session);
+	if (ktls_flags != 0) {
+		log_msg(stdout, "- KTLS: %s\n",
+			(ktls_flags & GNUTLS_KTLS_DUPLEX) == GNUTLS_KTLS_DUPLEX ? "send, recv" :
+			(ktls_flags & GNUTLS_KTLS_SEND) == GNUTLS_KTLS_SEND ? "send" :
+			(ktls_flags & GNUTLS_KTLS_RECV) == GNUTLS_KTLS_RECV ? "recv" :
+			"unknown");
+	}
+
+ 	fflush(stdout);
+ 
+ 	return 0;
+diff -rpu a/tests/gnutls_ktls.c a/tests/gnutls_ktls.c
+--- a/tests/gnutls_ktls.c	2022-12-09 14:58:19.751666678 +0100
+++ a/tests/gnutls_ktls.c	2022-12-09 15:31:31.359417748 +0100
+@@ -350,8 +350,12 @@ void doit(void)
+ {
+ 	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM");
+ 	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-256-GCM");
+	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CCM");
+	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+CHACHA20-POLY1305");
+ 	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-GCM");
+ 	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-256-GCM");
+	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-CCM");
+	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+CHACHA20-POLY1305");
+ }
+ 
+ #endif				/* _WIN32 */
+diff -rpu a/tests/Makefile.am a/tests/Makefile.am
+--- a/tests/Makefile.am	2022-12-09 14:58:19.748666667 +0100
+++ a/tests/Makefile.am	2022-12-09 15:26:30.979250800 +0100
+@@ -500,6 +500,8 @@ endif
+ if ENABLE_KTLS
+ indirect_tests += gnutls_ktls
+ dist_check_SCRIPTS += ktls.sh
+indirect_tests += ktls_keyupdate
+dist_check_SCRIPTS += ktls_keyupdate.sh
+ endif
+ 
+ if !WINDOWS
--- a/gnutls-3.7.8.tar.xz.sig
+++ b/gnutls-3.7.8.tar.xz.sig
--- a/gnutls-3.8.10-tests-ktls.patch
+++ b/gnutls-3.8.10-tests-ktls.patch
@ -1,114 +0,0 @@
-From e0eb2bbb212a5c9d72311c59e7235832a0075dcc Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 9 Jul 2025 18:54:48 +0900
-Subject: [PATCH] add tests/ktls_utils.h
-
-Signed-off-by: rpm-build <rpm-build>
---
- tests/ktls_utils.h | 94 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 94 insertions(+)
- create mode 100644 tests/ktls_utils.h
-
-diff --git a/tests/ktls_utils.h b/tests/ktls_utils.h
-new file mode 100644
-index 0000000..231618d
--- /dev/null
-+++ b/tests/ktls_utils.h
-@@ -0,0 +1,94 @@
-+#ifndef GNUTLS_TESTS_KTLS_UTILS_H
-+#define GNUTLS_TESTS_KTLS_UTILS_H
-+
-+#include <fcntl.h>
-+#include <signal.h>
-+
-+#include <netinet/in.h>
-+
-+#include <sys/socket.h>
-+#include <sys/wait.h>
-+
-+/* Sets the NONBLOCK flag on the socket(fd) */
-+inline static int set_nonblocking(int fd)
-+{
-+	int flags = fcntl(fd, F_GETFL, 0);
-+	if (flags == -1) {
-+		return 1;
-+	}
-+
-+	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1) {
-+		return 2;
-+	}
-+
-+	return 0;
-+}
-+
-+/* Creates a pair of TCP connected sockets */
-+static int create_socket_pair(int *client_fd, int *server_fd)
-+{
-+	int ret;
-+	struct sockaddr_in saddr;
-+	socklen_t addrlen;
-+	int listener;
-+
-+	listener = socket(AF_INET, SOCK_STREAM, 0);
-+	if (listener == -1) {
-+		fail("error in listener(): %s\n", strerror(errno));
-+		return 1;
-+	}
-+
-+	int opt = 0;
-+	setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
-+
-+	memset(&saddr, 0, sizeof(saddr));
-+	saddr.sin_family = AF_INET;
-+	saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+	saddr.sin_port = 0;
-+
-+	ret = bind(listener, (struct sockaddr *)&saddr, sizeof(saddr));
-+	if (ret == -1) {
-+		fail("error in bind(): %s\n", strerror(errno));
-+		return 1;
-+	}
-+
-+	addrlen = sizeof(saddr);
-+	ret = getsockname(listener, (struct sockaddr *)&saddr, &addrlen);
-+	if (ret == -1) {
-+		fail("error in getsockname(): %s\n", strerror(errno));
-+		return 1;
-+	}
-+
-+	ret = listen(listener, 1);
-+	if (ret == -1) {
-+		fail("error in listen(): %s\n", strerror(errno));
-+		close(listener);
-+		return 1;
-+	}
-+
-+	*client_fd = socket(AF_INET, SOCK_STREAM, 0);
-+	if (*client_fd < 0) {
-+		fail("error in socket(): %s\n", strerror(errno));
-+		return 1;
-+	}
-+
-+	ret = connect(*client_fd, (struct sockaddr *)&saddr, addrlen);
-+	if (ret < 0) {
-+		fail("error in connect(): %s\n", strerror(errno));
-+		close(listener);
-+		close(*client_fd);
-+		return 1;
-+	}
-+
-+	*server_fd = accept(listener, NULL, NULL);
-+	if (*server_fd < 0) {
-+		fail("error in accept(): %s\n", strerror(errno));
-+		close(listener);
-+		close(*client_fd);
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+#endif //GNUTLS_TESTS_KTLS_UTILS_H
-- 
-2.49.0
-
--- a/gnutls-3.8.10-tests-mldsa.patch
+++ b/gnutls-3.8.10-tests-mldsa.patch
@ -1,58 +0,0 @@
-From 15fb5ad536c375a74cc0d87859c9fc919d924c9d Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Thu, 10 Jul 2025 05:45:06 +0900
-Subject: [PATCH] support VPATH build for mldsa tests
-
-Signed-off-by: rpm-build <rpm-build>
---
- tests/cert-tests/mldsa.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/cert-tests/mldsa.sh b/tests/cert-tests/mldsa.sh
-index 7e31e11..55e31ce 100644
--- a/tests/cert-tests/mldsa.sh
-+++ b/tests/cert-tests/mldsa.sh
-@@ -130,7 +130,7 @@ for variant in 44 65 87; do
- 	# Check default
- 	TMPKEYDEFAULT=$testdir/key-$algo-$format-default
- 	TMPKEY=$testdir/key-$algo-$format
-	${VALGRIND} "${CERTTOOL}" -k --no-text --infile "data/key-$algo-$format.pem" >"$TMPKEYDEFAULT"
-+	${VALGRIND} "${CERTTOOL}" -k --no-text --infile "$srcdir/data/key-$algo-$format.pem" >"$TMPKEYDEFAULT"
- 	if [ $? != 0 ]; then
- 	    cat "$TMPKEYDEFAULT"
- 	    exit 1
-@@ -138,19 +138,19 @@ for variant in 44 65 87; do
- 
- 	# The "expandedKey" format doesn't have public key part
- 	if [ "$format" = seed ] || [ "$format" = both ]; then
-	    if ! "${DIFF}" "$TMPKEYDEFAULT" "data/key-$algo-both.pem"; then
-+	    if ! "${DIFF}" "$TMPKEYDEFAULT" "$srcdir/data/key-$algo-both.pem"; then
- 		exit 1
- 	    fi
- 	fi
- 
- 	# Check roundtrip with --key-format
-	${VALGRIND} "${CERTTOOL}" -k --no-text --key-format "$format" --infile "data/key-$algo-$format.pem" >"$TMPKEY"
-+	${VALGRIND} "${CERTTOOL}" -k --no-text --key-format "$format" --infile "$srcdir/data/key-$algo-$format.pem" >"$TMPKEY"
- 	if [ $? != 0 ]; then
- 	    cat "$TMPKEY"
- 	    exit 1
- 	fi
- 
-	if ! "${DIFF}" "$TMPKEY" "data/key-$algo-$format.pem"; then
-+	if ! "${DIFF}" "$TMPKEY" "$srcdir/data/key-$algo-$format.pem"; then
- 	    exit 1
- 	fi
-     done
-@@ -164,7 +164,7 @@ for n in 1; do
-     fi
- 
-     echo "Testing inconsistent ML-DSA key ($n)"
-    if "${CERTTOOL}" -k --infile "data/key-mldsa-inconsistent$n.pem"; then
-+    if "${CERTTOOL}" -k --infile "$srcdir/data/key-mldsa-inconsistent$n.pem"; then
- 	exit 1
-     fi
- done
-- 
-2.49.0
-
--- a/gnutls-3.8.6-compression-dlwrap.patch
+++ b/gnutls-3.8.6-compression-dlwrap.patch
--- a/gnutls-3.8.6-liboqs-x25519-kyber768d00.patch
+++ b/gnutls-3.8.6-liboqs-x25519-kyber768d00.patch
--- a/gnutls-3.8.6-nettle-rsa-oaep.patch
+++ b/gnutls-3.8.6-nettle-rsa-oaep.patch
@ -1,27 +0,0 @@
-From a9800309197fe5aef913944b2fc77164946f0689 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Tue, 23 Jul 2024 16:04:56 +0900
-Subject: [PATCH] build: link against libhogweed when checking
- nettle_rsa_oaep_*
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index fb0aefe1f4..8b55808bd7 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -795,7 +795,7 @@ AM_CONDITIONAL([NEED_SIV_GCM], [test "$ac_cv_func_nettle_siv_gcm_encrypt_message
- 
- # Check for RSA-OAEP
- save_LIBS=$LIBS
-LIBS="$LIBS $NETTLE_LIBS"
-+LIBS="$LIBS $HOGWEED_LIBS $NETTLE_LIBS $GMP_LIBS"
- AC_CHECK_FUNCS(nettle_rsa_oaep_sha256_encrypt)
- LIBS=$save_LIBS
- AM_CONDITIONAL([NEED_RSA_OAEP], [test "$ac_cv_func_nettle_rsa_oaep_sha256_encrypt" != yes])
-- 
-2.45.2
-
--- a/gnutls-3.8.8-tests-ktls-skip-tls12-chachapoly.patch
+++ b/gnutls-3.8.8-tests-ktls-skip-tls12-chachapoly.patch
@ -1,29 +0,0 @@
-From a36b73a21e4b5b6e051b23192a645dea34c9d6af Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Tue, 5 Nov 2024 14:45:46 +0900
-Subject: [PATCH] tests: skip CHACHA20-POLY1305 in TLS 1.2 when KTLS is enabled
-
-Signed-off-by: Daiki Ueno <ueno@gnu.org>
---
- tests/gnutls_ktls.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/gnutls_ktls.c b/tests/gnutls_ktls.c
-index 90d3e9af91..d5ac4efecc 100644
--- a/tests/gnutls_ktls.c
-+++ b/tests/gnutls_ktls.c
-@@ -347,9 +347,11 @@ void doit(void)
- {
- 	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM");
- 	run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-256-GCM");
-+#if 0
- 	if (!gnutls_fips140_mode_enabled()) {
- 		run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+CHACHA20-POLY1305");
- 	}
-+#endif
- 	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-GCM");
- 	run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-256-GCM");
- 	if (!gnutls_fips140_mode_enabled()) {
-- 
-2.47.0
-
--- a/gnutls-3.8.9-ktls-kernel-check.patch
+++ b/gnutls-3.8.9-ktls-kernel-check.patch
--- a/gnutls-release-keyring.gpg
+++ b/gnutls-release-keyring.gpg
--- a/gnutls.spec
+++ b/gnutls.spec
@ -12,58 +12,37 @@ sha256sum:close()
 print(string.sub(hash, 0, 16))
 }

-Version: 3.8.11
-Release: %{?autorelease}%{!?autorelease:1%{?dist}}
-Patch: gnutls-3.2.7-rpath.patch
+%global with_mingw 0
+%if 0%{?fedora}
+%global with_mingw 0%{!?_without_mingw:1}
+%endif 

-# follow https://gitlab.com/gnutls/gnutls/-/issues/1443
-Patch: gnutls-3.8.8-tests-ktls-skip-tls12-chachapoly.patch
+Version: 3.7.8
+Release: %{?autorelease}%{!?autorelease:1%{?dist}}
+Patch: gnutls-3.7.8-ktls-updates.patch
+Patch: gnutls-3.7.8-gcc_analyzer-suppress_warnings.patch
+Patch: gnutls-3.6.7-no-now-guile.patch
+Patch: gnutls-3.2.7-rpath.patch

 %bcond_without bootstrap
 %bcond_without dane
+%if 0%{?rhel}
+%bcond_with guile
 %bcond_without fips
+%else
+%bcond_without guile
+%bcond_without fips
+%endif
 %bcond_with tpm12
 %bcond_without tpm2
-%if 0%{?rhel} >= 9
-%bcond_with gost
-%else
 %bcond_without gost
-%endif
-%bcond_without certificate_compression
-%bcond_without leancrypto
-%bcond_without crypto_auditing
+%bcond_with certificate_compression
 %bcond_without tests

-%if 0%{?fedora} && 0%{?fedora} < 38
-%bcond_without srp
-%else
-%bcond_with srp
-%endif
-
-%if 0%{?fedora}
-%bcond_without mingw
-%else
-%bcond_with mingw
-%endif
-
-%if 0%{?rhel} >= 9 && %{with fips}
-%bcond_without bundled_gmp
-%else
-%bcond_with bundled_gmp
-%endif
-
-
-%define fips_requires() %{lua:
-local f = assert(io.popen("rpm -q --queryformat '%{EVR}' --whatprovides "..rpm.expand("'%1%{?_isa}'")))
-local v = f:read("*all")
-f:close()
-print("Requires: "..rpm.expand("%1%{?_isa}").." = "..v.."\\n")
-}
-
 Summary: A TLS protocol implementation
 Name: gnutls
 # The libraries are LGPLv2.1+, utilities are GPLv3+
-License: GPL-3.0-or-later AND LGPL-2.1-or-later
+License: GPLv3+ and LGPLv2+
 BuildRequires: p11-kit-devel >= 0.21.3, gettext-devel
 BuildRequires: readline-devel, libtasn1-devel >= 4.3
 %if %{with certificate_compression}
@ -72,10 +51,7 @@ BuildRequires: zlib-devel, brotli-devel, libzstd-devel
 %if %{with bootstrap}
 BuildRequires: automake, autoconf, gperf, libtool, texinfo
 %endif
-BuildRequires: nettle-devel >= 3.10.1
-%if %{with leancrypto}
-BuildRequires: meson
-%endif
+BuildRequires: nettle-devel >= 3.5.1
 %if %{with tpm12}
 BuildRequires: trousers-devel >= 0.3.11.2
 %endif
@ -84,20 +60,16 @@ BuildRequires: tpm2-tss-devel >= 3.0.3
 %endif
 BuildRequires: libidn2-devel
 BuildRequires: libunistring-devel
-BuildRequires: net-tools, softhsm, gcc, gcc-c++
+BuildRequires: net-tools, datefudge, softhsm, gcc, gcc-c++
 BuildRequires: gnupg2
 BuildRequires: git-core
-%if %{with crypto_auditing}
-BuildRequires: systemtap-sdt-devel
-%endif

 # for a sanity check on cert loading
 BuildRequires: p11-kit-trust, ca-certificates
 Requires: crypto-policies
 Requires: p11-kit-trust
 Requires: libtasn1 >= 4.3
-# always bump when a nettle release is packaged
-Requires: nettle >= 3.10.1
+Requires: nettle >= 3.4.1
 %if %{with tpm12}
 Recommends: trousers >= 0.3.11.2
 %endif
@ -105,24 +77,27 @@ Recommends: trousers >= 0.3.11.2
 %if %{with dane}
 BuildRequires: unbound-devel unbound-libs
 %endif
+%if %{with guile}
+BuildRequires: guile22-devel
+%endif
 BuildRequires: make gtk-doc

-%if %{with mingw}
-BuildRequires:  mingw32-cpp
+%if %{with_mingw}
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-libtasn1 >= 4.3
 BuildRequires:  mingw32-readline
 BuildRequires:  mingw32-zlib
+BuildRequires:  mingw32-p11-kit >= 0.23.1
 BuildRequires:  mingw32-nettle >= 3.6
-BuildRequires:  mingw64-cpp
 BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw64-gcc
 BuildRequires:  mingw64-gcc-c++
 BuildRequires:  mingw64-libtasn1 >= 4.3
 BuildRequires:  mingw64-readline
 BuildRequires:  mingw64-zlib
+BuildRequires:  mingw64-p11-kit >= 0.23.1
 BuildRequires:  mingw64-nettle >= 3.6
 %endif

@ -130,20 +105,7 @@ URL: http://www.gnutls.org/
 %define short_version %(echo %{version} | grep -m1 -o "[0-9]*\.[0-9]*" | head -1)
 Source0: https://www.gnupg.org/ftp/gcrypt/gnutls/v%{short_version}/%{name}-%{version}.tar.xz
 Source1: https://www.gnupg.org/ftp/gcrypt/gnutls/v%{short_version}/%{name}-%{version}.tar.xz.sig
-Source2: https://gnutls.org/gnutls-release-keyring.gpg
-
-%if %{with bundled_gmp}
-Provides:	bundled(gmp) = 6.2.1
-Source100:	gmp-6.2.1.tar.xz
-# Taken from the main gmp package
-Source101:	gmp-6.2.1-intel-cet.patch
-Source102:	gmp-6.2.1-c23.patch
-%endif
-
-%if %{with leancrypto}
-Provides:	bundled(leancrypto) = 1.6.0
-Source300:	leancrypto-1.6.0.tar.gz
-%endif
+Source2: gnutls-release-keyring.gpg

 # Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = 20130424
@ -162,7 +124,7 @@ Requires: %{name}-dane%{?_isa} = %{version}-%{release}
 Requires: pkgconfig

 %package utils
-License: GPL-3.0-or-later
+License: GPLv3+
 Summary: Command line tools for TLS protocol
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %if %{with dane}
@ -175,14 +137,11 @@ Summary: A DANE protocol implementation for GnuTLS
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %endif

-%if %{with fips}
-%package fips
-Summary: Virtual package to install packages required to use %{name} under FIPS mode
+%if %{with guile}
+%package guile
+Summary: Guile bindings for the GNUTLS library
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%{fips_requires nettle}
-%if !%{with bundled_gmp}
-%{fips_requires gmp}
-%endif
+Requires: guile22
 %endif

 %description
@ -228,18 +187,17 @@ This package contains library that implements the DANE protocol for verifying
 TLS certificates through DNSSEC.
 %endif

-%if %{with fips}
-%description fips
+%if %{with guile}
+%description guile
 GnuTLS is a secure communications library implementing the SSL, TLS and DTLS 
 protocols and technologies around them. It provides a simple C language 
 application programming interface (API) to access the secure communications 
 protocols as well as APIs to parse and write X.509, PKCS #12, OpenPGP and 
-other required structures.
-This package does not contain any file, but installs required packages
-to use GnuTLS under FIPS mode.
+other required structures. 
+This package contains Guile bindings for the library.
 %endif

-%if %{with mingw}
+%if %{with_mingw}
 %package -n mingw32-%{name}
 Summary:        MinGW GnuTLS TLS/SSL encryption library
 Requires:       pkgconfig
@ -268,73 +226,9 @@ for MinGW.

 %autosetup -p1 -S git

-%if %{with bundled_gmp}
-mkdir -p bundled_gmp
-pushd bundled_gmp
-tar --strip-components=1 -xf %{SOURCE100}
-patch -p1 < %{SOURCE101}
-patch -p1 < %{SOURCE102}
-popd
-%endif
-
 %build
 %define _lto_cflags %{nil}

-%if %{with leancrypto}
-mkdir -p bundled_leancrypto
-pushd bundled_leancrypto
-tar --strip-components=1 -xf %{SOURCE300}
-popd
-%endif
-
-%if %{with bundled_gmp}
-pushd bundled_gmp
-autoreconf -ifv
-%configure --disable-cxx --disable-shared --enable-fat --with-pic
-%make_build
-popd
-
-export GMP_CFLAGS="-I$PWD/bundled_gmp"
-export GMP_LIBS="$PWD/bundled_gmp/.libs/libgmp.a"
-%endif
-
-%if %{with leancrypto}
-pushd bundled_leancrypto
-%set_build_flags
-meson setup -Dprefix="$PWD/install" -Dlibdir="$PWD/install/lib" \
-        -Ddefault_library=static \
-        -Dascon=disabled -Dascon_keccak=disabled \
-        -Dbike_5=disabled -Dbike_3=disabled -Dbike_1=disabled \
-        -Dkyber_x25519=disabled -Ddilithium_ed25519=disabled \
-        -Dx509_parser=disabled -Dx509_generator=disabled \
-        -Dpkcs7_parser=disabled -Dpkcs7_generator=disabled \
-        -Dsha2-256=disabled \
-        -Daes_gcm=disabled -Daes_cbc=disabled -Daes_ctr=disabled -Daes_xts=disabled \
-        -Dchacha20=disabled -Dchacha20poly1305=disabled -Dchacha20_drng=disabled \
-        -Ddrbg_hash=disabled -Ddrbg_hmac=disabled \
-        -Dhash_crypt=disabled \
-        -Dhmac=disabled -Dhkdf=disabled \
-        -Dkdf_ctr=disabled -Dkdf_fb=disabled -Dkdf_dpi=disabled \
-        -Dpbkdf2=disabled \
-        -Dkmac_drng=disabled -Dcshake_drng=disabled \
-        -Dhotp=disabled -Dtotp=disabled \
-        -Daes_block=disabled -Daes_cbc=disabled -Daes_ctr=disabled \
-        -Daes_kw=disabled -Dapps=disabled \
-        -Ddisable-asm=true \
-        _build
-# the reason for -Ddisable-asm=true being bz2416812
-# revert once the root cause is fixed
-meson compile -C _build
-meson install -C _build
-
-popd
-
-export LEANCRYPTO_DIR="$PWD/bundled_leancrypto/install"
-
-export LEANCRYPTO_CFLAGS="-I$LEANCRYPTO_DIR/include"
-export LEANCRYPTO_LIBS="$LEANCRYPTO_DIR/lib/libleancrypto.a"
-%endif
-
 %if %{with bootstrap}
 autoreconf -fi
 %endif
@ -347,6 +241,15 @@ echo "SYSTEM=NORMAL" >> tests/system.prio
 CCASFLAGS="$CCASFLAGS -Wa,--generate-missing-build-notes=yes"
 export CCASFLAGS

+%if %{with guile}
+# These should be checked by m4/guile.m4 instead of configure.ac
+# taking into account of _guile_suffix
+guile_snarf=%{_bindir}/guile-snarf2.2
+export guile_snarf
+GUILD=%{_bindir}/guild2.2
+export GUILD
+%endif
+
 %if %{with fips}
 eval $(sed -n 's/^\(\(NAME\|VERSION_ID\)=.*\)/OS_\1/p' /etc/os-release)
 export FIPS_MODULE_NAME="$OS_NAME ${OS_VERSION_ID%%.*} %name"
@ -354,7 +257,6 @@ export FIPS_MODULE_NAME="$OS_NAME ${OS_VERSION_ID%%.*} %name"

 mkdir native_build
 pushd native_build
-
 %global _configure ../configure
 %configure \
 %if %{with fips}
@ -366,12 +268,6 @@ pushd native_build
    	   --enable-gost \
 %else
 	   --disable-gost \
-%endif
-%if %{with srp}
-           --enable-srp-authentication \
-%endif
-%ifarch %{ix86}
-           --disable-year2038 \
 %endif
 	   --enable-sha1-support \
           --disable-static \
@ -391,6 +287,12 @@ pushd native_build
 %endif
           --enable-ktls \
           --htmldir=%{_docdir}/manual \
+%if %{with guile}
+           --enable-guile \
+           --with-guile-extension-dir=%{_libdir}/guile/2.2 \
+%else
+           --disable-guile \
+%endif
 %if %{with dane}
           --with-unbound-root-key-file=/var/lib/unbound/root.key \
           --enable-libdane \
@ -401,47 +303,32 @@ pushd native_build
 	   --with-zlib --with-brotli --with-zstd \
 %else
 	   --without-zlib --without-brotli --without-zstd \
-%endif
-%if %{with leancrypto}
-           --with-leancrypto \
-%else
-           --without-leancrypto \
-%endif
-%if %{with crypto_auditing}
-           --enable-crypto-auditing \
-%else
-           --disable-crypto-auditing \
 %endif
           --disable-rpath \
           --with-default-priority-string="@SYSTEM"

 %make_build
-%if %{with leancrypto}
-sed -i '/^Requires.private:/s/leancrypto[ ,]*//g' lib/gnutls.pc
-%endif
 popd

-%if %{with mingw}
+%if %{with_mingw}
 # MinGW does not support CCASFLAGS
 export CCASFLAGS=""
 %mingw_configure \
-%if %{with srp}
-    --enable-srp-authentication \
-%endif
    --enable-sha1-support \
    --disable-static \
    --disable-openssl-compatibility \
    --disable-non-suiteb-curves \
+    --disable-guile \
    --disable-libdane \
    --disable-rpath \
    --disable-nls \
    --disable-cxx \
+    --enable-local-libopts \
    --enable-shared \
    --without-tpm \
    --with-included-unistring \
    --disable-doc \
-    --with-default-priority-string="@SYSTEM" \
-    --without-p11-kit
+    --with-default-priority-string="@SYSTEM"
 %mingw_make %{?_smp_mflags}
 %endif

@ -451,6 +338,8 @@ pushd native_build
 make -C doc install-html DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/guile/2.2/guile-gnutls*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/guile/2.2/guile-gnutls*.la
 %if %{without dane}
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
 %endif
@ -458,12 +347,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gnutls-dane.pc
 %if %{with fips}
 # doing it twice should be a no-op the second time,
 # and this way we avoid redefining it and missing a future change
-%global __debug_package 1
 %{__spec_install_post}
-fname=`basename $RPM_BUILD_ROOT%{_libdir}/libgnutls.so.30.*.*`
-./lib/fipshmac "$RPM_BUILD_ROOT%{_libdir}/libgnutls.so.30" > "$RPM_BUILD_ROOT%{_libdir}/.$fname.hmac"
-sed -i "s^$RPM_BUILD_ROOT/usr^^" "$RPM_BUILD_ROOT%{_libdir}/.$fname.hmac"
-ln -s ".$fname.hmac" "$RPM_BUILD_ROOT%{_libdir}/.libgnutls.so.30.hmac"
+./lib/fipshmac "$RPM_BUILD_ROOT%{_libdir}/libgnutls.so.30" > $RPM_BUILD_ROOT%{_libdir}/.gnutls.hmac
+sed -i "s^$RPM_BUILD_ROOT/usr^^" $RPM_BUILD_ROOT%{_libdir}/.gnutls.hmac
 %endif

 %if %{with fips}
@ -477,7 +363,7 @@ ln -s ".$fname.hmac" "$RPM_BUILD_ROOT%{_libdir}/.libgnutls.so.30.hmac"
 %find_lang gnutls
 popd

-%if %{with mingw}
+%if %{with_mingw}
 %mingw_make_install

 # Remove .la files
@ -509,17 +395,17 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/ncrypt.dll*
 %check
 %if %{with tests}
 pushd native_build
-make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null || { cat tests/test-suite.log tests/cert-tests/test-suite.log tests/slow/test-suite.log src/gl/tests/test-suite.log; exit 1; }
+make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null
 popd
 %endif

 %files -f native_build/gnutls.lang
 %{_libdir}/libgnutls.so.30*
 %if %{with fips}
-%{_libdir}/.libgnutls.so.30*.hmac
+%{_libdir}/.gnutls.hmac
 %endif
 %doc README.md AUTHORS NEWS THANKS
-%license COPYING COPYING.LESSERv2
+%license LICENSE doc/COPYING doc/COPYING.LESSER

 %files c++
 %{_libdir}/libgnutlsxx.so.*
@ -542,9 +428,7 @@ popd
 %{_bindir}/ocsptool
 %{_bindir}/psktool
 %{_bindir}/p11tool
-%if %{with srp}
 %{_bindir}/srptool
-%endif
 %if %{with dane}
 %{_bindir}/danetool
 %endif
@ -557,42 +441,43 @@ popd
 %{_libdir}/libgnutls-dane.so.*
 %endif

-%if %{with fips}
-%files fips
+%if %{with guile}
+%files guile
+%{_libdir}/guile/2.2/guile-gnutls*.so*
+%{_libdir}/guile/2.2/site-ccache/gnutls.go
+%{_libdir}/guile/2.2/site-ccache/gnutls/extra.go
+%{_datadir}/guile/site/2.2/gnutls.scm
+%{_datadir}/guile/site/2.2/gnutls/extra.scm
 %endif

-%if %{with mingw}
+%if %{with_mingw}
 %files -n mingw32-%{name}
-%license COPYING COPYING.LESSERv2
+%license LICENSE doc/COPYING doc/COPYING.LESSER
 %{mingw32_bindir}/certtool.exe
 %{mingw32_bindir}/gnutls-cli-debug.exe
 %{mingw32_bindir}/gnutls-cli.exe
 %{mingw32_bindir}/gnutls-serv.exe
 %{mingw32_bindir}/libgnutls-30.dll
 %{mingw32_bindir}/ocsptool.exe
-#%%{mingw32_bindir}/p11tool.exe
+%{mingw32_bindir}/p11tool.exe
 %{mingw32_bindir}/psktool.exe
-%if %{with srp}
 %{mingw32_bindir}/srptool.exe
-%endif
 %{mingw32_libdir}/libgnutls.dll.a
 %{mingw32_libdir}/libgnutls-30.def
 %{mingw32_libdir}/pkgconfig/gnutls.pc
 %{mingw32_includedir}/gnutls/

 %files -n mingw64-%{name}
-%license COPYING COPYING.LESSERv2
+%license LICENSE doc/COPYING doc/COPYING.LESSER
 %{mingw64_bindir}/certtool.exe
 %{mingw64_bindir}/gnutls-cli-debug.exe
 %{mingw64_bindir}/gnutls-cli.exe
 %{mingw64_bindir}/gnutls-serv.exe
 %{mingw64_bindir}/libgnutls-30.dll
 %{mingw64_bindir}/ocsptool.exe
-#%%{mingw64_bindir}/p11tool.exe
+%{mingw64_bindir}/p11tool.exe
 %{mingw64_bindir}/psktool.exe
-%if %{with srp}
 %{mingw64_bindir}/srptool.exe
-%endif
 %{mingw64_libdir}/libgnutls.dll.a
 %{mingw64_libdir}/libgnutls-30.def
 %{mingw64_libdir}/pkgconfig/gnutls.pc
--- a/plans/fips-smoke.fmf
+++ b/plans/fips-smoke.fmf
@ -1,4 +0,0 @@
-summary: Runs FIPS library integrity checks.
-name: fips-smoke
-execute:
-    script: if [[ $(GNUTLS_DEBUG_LEVEL=99 GNUTLS_FORCE_FIPS_MODE=1 certtool 2>&1 | grep "Error") ]]; then exit 1; else exit 0; fi;
--- a/plans/nss-2way.fmf
+++ b/plans/nss-2way.fmf
@ -1,10 +0,0 @@
-summary: Upstreamed gnutls-openssl interop-2way tests
-contact: Stanislav Zidek <szidek@redhat.com>
-discover:
-  # upstreamed tests (public)
-  - name: interop-nss-2way
-    how: fmf
-    url: https://gitlab.com/redhat-crypto/tests/interop.git
-    filter: 'tag: interop-gnutls & tag: interop-nss & tag: interop-2way'
-execute:
-    how: tmt
--- a/plans/openssl-2way.fmf
+++ b/plans/openssl-2way.fmf
@ -1,10 +0,0 @@
-summary: Upstreamed gnutls-openssl interop-2way tests
-contact: Stanislav Zidek <szidek@redhat.com>
-discover:
-  # upstreamed tests (public)
-  - name: interop-openssl-2way
-    how: fmf
-    url: https://gitlab.com/redhat-crypto/tests/interop.git
-    filter: 'tag: interop-gnutls & tag: interop-openssl & tag: interop-2way'
-execute:
-    how: tmt
--- a/plans/short-interop-tests.fmf
+++ b/plans/short-interop-tests.fmf
@ -1,10 +0,0 @@
-summary: Upstreamed gnutls interop tests - short tests which do not need to run in parallel
-contact: Stanislav Zidek <szidek@redhat.com>
-discover:
-  # upstreamed tests (public)
-  - name: interop-gnutls-short
-    how: fmf
-    url: https://gitlab.com/redhat-crypto/tests/interop.git
-    filter: 'tag: interop-gnutls & tag: -interop-slow'
-execute:
-    how: tmt
--- a/6
+++ b/6
@ -1,5 +1 @@
-SHA512 (gnutls-3.8.11.tar.xz) = 68f9e5bec3aa6686fd3319cc9c88a5cc44e2a75144049fc9de5fb55fef2241b4e16996af4be5dd48308abbee8cfaed6c862903f6bb89aff5dfa5410075bd7386
-SHA512 (gnutls-3.8.11.tar.xz.sig) = 90883e5736299b103844ca42b85d371969ef66b50b60cb185e814ad9978598796e9ed07a590245ff28ac6ac084b1dee93fae0845576464583a5941835990957d
-SHA512 (gnutls-release-keyring.gpg) = 8c2b39239d1d8c5319757fcf669f28a11de7f8ec4a726f9904c57ba8105bea80240083c0de71b747115907bab46569f10cf58004137cc7884ac5c20f8319ae0a
-SHA512 (gmp-6.2.1.tar.xz) = c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
-SHA512 (leancrypto-1.6.0.tar.gz) = cb6ace4a1642208dd7656b62a48e99d6261f471aa7967b738057745a4534abfa11d380dd5de98a737c0c13b1e1cb37ce780e02297eefc1cf839581629d34e100
+SHA512 (gnutls-3.7.8.tar.xz) = 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,13 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - smoke-fips:
+        dir: .
+        run: if [[ $(GNUTLS_DEBUG_LEVEL=99 GNUTLS_FORCE_FIPS_MODE=1 certtool 2>&1 | grep "Error") ]]; then exit 1; else exit 0; fi;
+    required_packages:
+    - gnutls
+    - gnutls-utils