[bug#67399] [PATCH 0/8] Coreboot related patches.

[bug#67399] [PATCH 0/8] Coreboot related patches.

[Denis 'GNUtoo' Carikli]

Hi,

This patchset updates some tools that use the Coreboot source, fixes a freedom
bug, code and also add two new tools (bucts and nvramtool).

The freedom bug is the bug #66986[1] ("ifdtool: Firmwares with missing source
code present in source code"). It is fixed because the files mentioned in this
bug report are gone in Coreboot 4.22. I've also done a quick grep for words
like "reverse engineering" and that didn't find any nonfree license.

So upstream probably finished moving the nonfree files in a separate
repositories.

[1]https://issues.guix.gnu.org/66986

Denis 'GNUtoo' Carikli (8):
  gnu: ifdtool: Update to 4.22.
  gnu: Add bucts.
  gnu: intelmetool: Update to 4.22.
  gnu: ifdtool: Update to new style.
  gnu: ifdtool: Use cc-for-target.
  gnu: intelmetool: Update to new style.
  gnu: intelmetool: Use cc-for-target.
  gnu: Add nvramtool.

 gnu/packages/flashing-tools.scm | 161 +++++++++++++++++++++++---------
 1 file changed, 117 insertions(+), 44 deletions(-)


base-commit: 5283d24062be62f59ff9f14fa7095ebcfcb7a9a4
-- 
2.41.0

[bug#67399] [PATCH] gnu: Add grub-coreboot

[Denis 'GNUtoo' Carikli]

* gnu/packages/bootloaders.scm (grub-coreboot): New variable.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/bootloaders.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 01fd1093ff..c5090d1ead 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -15,7 +15,7 @@
 ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
-;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
 ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
 ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
@@ -297,6 +297,21 @@ (define-public grub-minimal
 
                #t))))))))
 
+(define-public grub-coreboot
+  (package
+    (inherit grub)
+    (name "grub-coreboot")
+    (synopsis "GRand Unified Boot loader (Coreboot payload version)")
+    (arguments
+     `(,@(substitute-keyword-arguments (package-arguments grub)
+           ;; Several tests fail
+           ((#:tests? _ #f)
+            #f)
+           ((#:configure-flags flags
+             ''())
+            `(cons* "--with-platform=coreboot"
+                    ,flags)))))))
+
 (define-public grub-efi
   (package
     (inherit grub)

base-commit: 796c823a0d1d0aec9f4af908eca462e58e5675b5
-- 
2.41.0

[bug#67399] [PATCH] gnu: libressl: Update to 3.8.0 [fixes CVE-2023-35784].

[Denis 'GNUtoo' Carikli]

* gnu/packages/tls.scm (libressl): Update to 3.8.0.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 gnu/packages/tls.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index f51c47db04..deec73b43f 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -659,14 +659,14 @@ (define-public bearssl
 (define-public libressl
   (package
     (name "libressl")
-    (version "3.6.1")
+    (version "3.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://openbsd/LibreSSL/"
                                   "libressl-" version ".tar.gz"))
               (sha256
                (base32
-                "0x37037rb0zx34zp0kbbqj2xwd57gh1m6bfn52f92fz92q9wdymc"))))
+                "1b5c45gkrfcvjpf5dx288r6x1zhc9dk9j61ixfmwdi88r0g1qlqj"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags

base-commit: 39fbc041f92489ec30075a85937c8a38723752dc
-- 
2.41.0

[bug#67399] [PATCH] gnu: aflplusplus: Add python support

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add python.
---
 gnu/packages/debug.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 060e6a7b36..27a57c2f30 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -473,7 +473,7 @@ (define-public aflplusplus
               (sha256
                (base32
                 "0cl0bgvd2yy331zchjz5drcnadam6w0vfmwcq1jf285hw0x8b0bk"))))
-    (inputs (list qemu))
+    (inputs (list python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of

base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7
prerequisite-patch-id: 529f1c3b53aec479891730e8b6e21f6a59cd7c71
-- 
2.41.0

[bug#67399] [PATCH] gnu: aflplusplus: Add python support

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add python.
---
 gnu/packages/debug.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 31f59f02f8..b6d84495e4 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -479,7 +479,9 @@ (define-public aflplusplus
     ;; aflplusplus source code has the following comment: "GCC 12 is producing
     ;; compile errors for some targets so we stay at GCC 11", however with
     ;; Guix GCC 12 seems to work fine so far.
-    (inputs (list gcc gmp qemu))
+    ;; The python input is needed to support writing custom mutations in
+    ;; python.
+    (inputs (list gcc gmp python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of

base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7
prerequisite-patch-id: 529f1c3b53aec479891730e8b6e21f6a59cd7c71
prerequisite-patch-id: 6f0e10ac9b56f321f690b28d50f7bde94b8c3933
prerequisite-patch-id: c27dc1855d1350c395cd0f5788b57ee6be532328
-- 
2.41.0

[bug#67399] [PATCH v2 1/3] gnu: Add aflplusplus.

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): New variable.
---
 gnu/packages/debug.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index e2a29a3ae9..cd1eccbd7b 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -459,6 +459,37 @@ (define-public qemu-for-american-fuzzy-lop
     ;; Several tests fail on MIPS.
     (supported-systems (delete "mips64el-linux" %supported-systems))))))
 
+(define-public aflplusplus
+  (package
+    (inherit american-fuzzy-lop)
+    (name "aflplusplus")
+    (version "4.08c")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/AFLplusplus/AFLplusplus")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
+    (inputs (list qemu))
+    (home-page "https://aflplus.plus")
+    (description
+     "AFLplusplus is a security-oriented fuzzer that employs a novel type of
+compile-time instrumentation and genetic algorithms to automatically discover
+clean, interesting test cases that trigger new internal states in the targeted
+binary.  This substantially improves the functional coverage for the fuzzed
+code.  The compact synthesized corpora produced by the tool are also useful
+for seeding other, more labor- or resource-intensive testing regimes down the
+road.  It is a fork of American Fuzzy Lop fuzzer and compared to it:
+@itemize
+@item It Supports a more recent qemu version
+@item It supports more algorithms like collision-free coverage, enhanced
+laf-intel & redqueen, AFLfast++ power schedules, MOpt mutators, unicorn_mode,
+etc.
+@end itemize")))
+
 (define-public stress-make
   (let ((commit "97815bed8060de33952475b3498767c91f59ffd9")
         (revision "2"))                 ;No official source distribution

base-commit: 0c1aa354048f82023e6d2043bfecc4fd58bc9b58
-- 
2.41.0

[bug#67399] [PATCH v2 2/3] gnu: aflplusplus: Add python support

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add python.
---
 gnu/packages/debug.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index cd1eccbd7b..04458d0220 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -473,7 +473,7 @@ (define-public aflplusplus
               (sha256
                (base32
                 "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
-    (inputs (list qemu))
+    (inputs (list python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of
-- 
2.41.0

[bug#67399] [PATCH v2 3/3] gnu: aflplusplus: Build afl-gcc/g++-fast

[Denis 'GNUtoo' Carikli]

* gnu/packages/debug.scm (aflplusplus): [inputs]: Add gcc, gmp.
---
 gnu/packages/debug.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 04458d0220..c9fdca8c8b 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages code)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gdb)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -59,6 +60,7 @@ (define-module (gnu packages debug)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages ninja)
   #:use-module (gnu packages perl)
@@ -473,7 +475,35 @@ (define-public aflplusplus
               (sha256
                (base32
                 "01hxj65if6rkjrj1fqcgq0jl95dirhkn00mi2k65mff6bckaamxg"))))
-    (inputs (list python qemu))
+    (arguments
+     (substitute-keyword-arguments (package-arguments american-fuzzy-lop)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           ;; TODO: Enable to cross compile aflplusplus by also enabling qemu
+           ;; to be cross compiled and by fixing the use-build-gcc phase below.
+           (add-before 'build 'use-build-gcc
+             (lambda _
+               ;; We need to patch it to select the build-time gcc else we get
+               ;; something like that:
+               ;; $ afl-gcc-fast main.c
+               ;; afl-cc++4.08c by [...] - mode: GCC_PLUGIN-DEFAULT
+               ;; cc1: error: cannot load plugin
+               ;; /gnu/[...]-aflplusplus-4.08c/bin/../lib/afl//afl-gcc-pass.so:
+               ;; /gnu/[...]-aflplusplus-4.08c/bin/../lib/afl//afl-gcc-pass.so:
+               ;; undefined symbol:
+               ;; _Z30gimple_build_call_internal_vec11internal_fn3vecIP9tree_node7va_heap6vl_ptrE
+               (substitute* "src/afl-cc.c"
+                 (("alt_cc = \"gcc\";")
+                  (string-append "alt_cc = \""
+                                 (which "gcc") "\";"))
+                 (("alt_cxx = \"g\\+\\+\";")
+                  (string-append "alt_cxx = \""
+                                 (which "g++") "\";")))))))))
+    ;; afl-gcc and g++-fast require gcc and gmp. The gcc-11 input is used
+    ;; instead of gcc because in the Dockerfile inside aflplusplus source code
+    ;; has the following comment: "GCC 12 is producing compile errors for some
+    ;; targets so we stay at GCC 11".
+    (inputs (list gcc-11 gmp python qemu))
     (home-page "https://aflplus.plus")
     (description
      "AFLplusplus is a security-oriented fuzzer that employs a novel type of
-- 
2.41.0

[bug#67399] (no subject)

[Denis 'GNUtoo' Carikli]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

Sorry, 

I ran the git send-email command of the manual in the wrong
directory, so it sent the wrong patches.

I'll then close this bug and reopen a new one as this will make the
discussion easier.

Denis.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]