From df7dcbd974fc2d27665a820ce24097343a688cb9 Mon Sep 17 00:00:00 2001 From: Furkan Onder <furkanonder@protonmail.com> Date: Thu, 5 Sep 2024 02:53:48 +0300 Subject: [PATCH 1/4] Fix implicit declaration of 'explicit_memset' for NetBSD 10.0 in Lib_Memzero0.c --- Modules/_hacl/Lib_Memzero0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/_hacl/Lib_Memzero0.c b/Modules/_hacl/Lib_Memzero0.c index 3d8a1e5f265605..5b1a2f7797db76 100644 --- a/Modules/_hacl/Lib_Memzero0.c +++ b/Modules/_hacl/Lib_Memzero0.c @@ -13,7 +13,7 @@ #include <string.h> #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) #include <strings.h> #endif From ad7aa7489a72c56e800d3976bd26f4f72b7215d2 Mon Sep 17 00:00:00 2001 From: Furkan Onder <furkanonder@protonmail.com> Date: Fri, 6 Sep 2024 02:14:50 +0300 Subject: [PATCH 2/4] run make regen-all --- Programs/test_frozenmain.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 624d9c0b653ad7..661ce867c1ce00 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -12,26 +12,26 @@ unsigned char M_test_frozenmain[] = { 0,0,111,6,88,2,31,0,79,6,88,6,12,0,79,7, 88,5,88,6,2,0,0,0,12,0,47,4,49,1,0,0, 0,0,0,0,29,0,72,22,0,0,9,0,29,0,100,1, - 41,8,233,0,0,0,0,78,122,18,70,114,111,122,101,110, - 32,72,101,108,108,111,32,87,111,114,108,100,122,8,115,121, + 41,8,233,0,0,0,0,78,218,18,70,114,111,122,101,110, + 32,72,101,108,108,111,32,87,111,114,108,100,218,8,115,121, 115,46,97,114,103,118,218,6,99,111,110,102,105,103,41,5, 218,12,112,114,111,103,114,97,109,95,110,97,109,101,218,10, 101,120,101,99,117,116,97,98,108,101,218,15,117,115,101,95, 101,110,118,105,114,111,110,109,101,110,116,218,17,99,111,110, 102,105,103,117,114,101,95,99,95,115,116,100,105,111,218,14, - 98,117,102,102,101,114,101,100,95,115,116,100,105,111,122,7, - 99,111,110,102,105,103,32,122,2,58,32,41,7,218,3,115, + 98,117,102,102,101,114,101,100,95,115,116,100,105,111,218,7, + 99,111,110,102,105,103,32,218,2,58,32,41,7,218,3,115, 121,115,218,17,95,116,101,115,116,105,110,116,101,114,110,97, 108,99,97,112,105,218,5,112,114,105,110,116,218,4,97,114, 103,118,218,11,103,101,116,95,99,111,110,102,105,103,115,114, - 3,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0, + 5,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0, 218,18,116,101,115,116,95,102,114,111,122,101,110,109,97,105, - 110,46,112,121,218,8,60,109,111,100,117,108,101,62,114,18, + 110,46,112,121,218,8,60,109,111,100,117,108,101,62,114,22, 0,0,0,1,0,0,0,115,94,0,0,0,240,3,1,1, 1,243,8,0,1,11,219,0,24,225,0,5,208,6,26,212, 0,27,217,0,5,128,106,144,35,151,40,145,40,212,0,27, 216,9,26,215,9,38,210,9,38,211,9,40,168,24,209,9, 50,128,6,243,2,6,12,2,128,67,241,14,0,5,10,136, 71,144,67,144,53,152,2,152,54,160,35,153,59,152,45,208, - 10,40,214,4,41,242,15,6,12,2,114,16,0,0,0, + 10,40,214,4,41,242,15,6,12,2,114,20,0,0,0, }; From 5d2161cf26f314fc9d04d2b9a6b4e0f8b5156aa0 Mon Sep 17 00:00:00 2001 From: Furkan Onder <furkanonder@protonmail.com> Date: Fri, 6 Sep 2024 02:41:15 +0300 Subject: [PATCH 3/4] revert changes in test_frozenmain.h --- Programs/test_frozenmain.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 661ce867c1ce00..624d9c0b653ad7 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -12,26 +12,26 @@ unsigned char M_test_frozenmain[] = { 0,0,111,6,88,2,31,0,79,6,88,6,12,0,79,7, 88,5,88,6,2,0,0,0,12,0,47,4,49,1,0,0, 0,0,0,0,29,0,72,22,0,0,9,0,29,0,100,1, - 41,8,233,0,0,0,0,78,218,18,70,114,111,122,101,110, - 32,72,101,108,108,111,32,87,111,114,108,100,218,8,115,121, + 41,8,233,0,0,0,0,78,122,18,70,114,111,122,101,110, + 32,72,101,108,108,111,32,87,111,114,108,100,122,8,115,121, 115,46,97,114,103,118,218,6,99,111,110,102,105,103,41,5, 218,12,112,114,111,103,114,97,109,95,110,97,109,101,218,10, 101,120,101,99,117,116,97,98,108,101,218,15,117,115,101,95, 101,110,118,105,114,111,110,109,101,110,116,218,17,99,111,110, 102,105,103,117,114,101,95,99,95,115,116,100,105,111,218,14, - 98,117,102,102,101,114,101,100,95,115,116,100,105,111,218,7, - 99,111,110,102,105,103,32,218,2,58,32,41,7,218,3,115, + 98,117,102,102,101,114,101,100,95,115,116,100,105,111,122,7, + 99,111,110,102,105,103,32,122,2,58,32,41,7,218,3,115, 121,115,218,17,95,116,101,115,116,105,110,116,101,114,110,97, 108,99,97,112,105,218,5,112,114,105,110,116,218,4,97,114, 103,118,218,11,103,101,116,95,99,111,110,102,105,103,115,114, - 5,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0, + 3,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0, 218,18,116,101,115,116,95,102,114,111,122,101,110,109,97,105, - 110,46,112,121,218,8,60,109,111,100,117,108,101,62,114,22, + 110,46,112,121,218,8,60,109,111,100,117,108,101,62,114,18, 0,0,0,1,0,0,0,115,94,0,0,0,240,3,1,1, 1,243,8,0,1,11,219,0,24,225,0,5,208,6,26,212, 0,27,217,0,5,128,106,144,35,151,40,145,40,212,0,27, 216,9,26,215,9,38,210,9,38,211,9,40,168,24,209,9, 50,128,6,243,2,6,12,2,128,67,241,14,0,5,10,136, 71,144,67,144,53,152,2,152,54,160,35,153,59,152,45,208, - 10,40,214,4,41,242,15,6,12,2,114,20,0,0,0, + 10,40,214,4,41,242,15,6,12,2,114,16,0,0,0, }; From 2e99668fbd51d5a936ae4273362b2051f266ab97 Mon Sep 17 00:00:00 2001 From: Furkan Onder <furkanonder@protonmail.com> Date: Fri, 6 Sep 2024 02:41:35 +0300 Subject: [PATCH 4/4] run make regen-sbom --- Misc/sbom.spdx.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json index 1013c0ad6f1696..05647c1fe417b8 100644 --- a/Misc/sbom.spdx.json +++ b/Misc/sbom.spdx.json @@ -538,11 +538,11 @@ "checksums": [ { "algorithm": "SHA1", - "checksumValue": "e52071a35fc1893928804fe91b098ad5682c2508" + "checksumValue": "47ce34375d43a27312e1fffb96b8965610b05855" }, { "algorithm": "SHA256", - "checksumValue": "c4424a4851cd2d4f27633ca19faf5cb1135a680443727a8d1b134737f9a71e62" + "checksumValue": "8affd767d7644150064d8bccd05d7bf4c4ae41fd4bb5bf5b8e943eabf09f3d74" } ], "fileName": "Modules/_hacl/Lib_Memzero0.c"