Merge pull request #1395 from giuseppe/drop-gcrypt-dependency

Drop gcrypt dependency and use blake3

Makefile.am

@@ -35,6 +35,8 @@ endif
 check_LIBRARIES = libcrun_testing.a
 
 libcrun_SOURCES = src/libcrun/utils.c \
+		src/libcrun/blake3/blake3.c \
+		src/libcrun/blake3/blake3_portable.c \
 		src/libcrun/cgroup-cgroupfs.c \
 		src/libcrun/cgroup-resources.c \
 		src/libcrun/cgroup-setup.c \
@@ -138,6 +140,7 @@ crun_LDFLAGS = $(CRUN_LDFLAGS)
 endif
 
 EXTRA_DIST = COPYING COPYING.libcrun README.md NEWS SECURITY.md rpm/crun.spec autogen.sh \
+	src/libcrun/blake3/blake3_impl.h src/libcrun/blake3/blake3.h \
 	src/crun.h src/list.h src/run.h src/delete.h src/kill.h src/pause.h src/unpause.h \
 	src/create.h src/start.h src/state.h src/exec.h src/oci_features.h src/spec.h src/update.h src/ps.h \
 	src/checkpoint.h src/restore.h src/libcrun/seccomp_notify.h src/libcrun/seccomp_notify_plugin.h \
@@ -290,7 +293,7 @@ generate-mount_flags.c: src/libcrun/mount_flags.perf
 
 clang-format:
 # do not format files that were copied into the source directory.
-	git ls-files src tests | grep -E "\\.[hc]" | grep -v "chroot_realpath.c\|cloned_binary.c\|signals.c\|mount_flags.c" | xargs clang-format -style=file -i
+	git ls-files src tests | grep -E "\\.[hc]" | grep -v "blake3\|chroot_realpath.c\|cloned_binary.c\|signals.c\|mount_flags.c" | xargs clang-format -style=file -i
 
 shellcheck:
 	shellcheck tests/*/*.sh contrib/*.sh

README.md

@@ -60,7 +60,7 @@ These dependencies are required for the build:
 
 ```console
 $ sudo dnf install -y make python git gcc automake autoconf libcap-devel \
-    systemd-devel yajl-devel libseccomp-devel pkg-config libgcrypt-devel \
+    systemd-devel yajl-devel libseccomp-devel pkg-config \
     go-md2man glibc-static python3-libmount libtool
 ```
 
@@ -69,7 +69,7 @@ $ sudo dnf install -y make python git gcc automake autoconf libcap-devel \
 ```console
 $ sudo yum --enablerepo='*' --disablerepo='media-*' install -y make automake \
     autoconf gettext \
-    libtool gcc libcap-devel systemd-devel yajl-devel libgcrypt-devel \
+    libtool gcc libcap-devel systemd-devel yajl-devel \
     glibc-static libseccomp-devel python36 git
 ```
 
@@ -89,7 +89,7 @@ $ export PATH=$PATH:$GOPATH/bin
 ```console
 $ sudo apt-get install -y make git gcc build-essential pkgconf libtool \
    libsystemd-dev libprotobuf-c-dev libcap-dev libseccomp-dev libyajl-dev \
-   libgcrypt20-dev go-md2man autoconf python3 automake
+   go-md2man autoconf python3 automake
 ```
 
 ### Alpine

cfg.mk

@@ -21,6 +21,6 @@ local-checks-to-skip = \
 show-vc-list-except:
 	@$(VC_LIST_EXCEPT)
 
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|git.mk|tests.*|COPYING|contrib/.*$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^ABOUT-NLS|maint.mk|git.mk|tests.*|COPYING|contrib/.*|src/libcrun/blake3/.*$$
 
 export gl_public_submodule_commit=

configure.ac

@@ -27,7 +27,6 @@ AM_CONDITIONAL([HAVE_MD2MAN], [test "x$ac_cv_path_MD2MAN" != x])
 AC_CHECK_HEADERS([error.h linux/openat2.h stdatomic.h linux/ioprio.h])
 
 AC_CHECK_TYPES([atomic_int], [], [], [[#include <stdatomic.h>]])
-AC_CHECK_TYPES([atomic_bool], [], [], [[#include <stdatomic.h>]])
 
 AC_CHECK_FUNCS(copy_file_range fgetxattr statx fgetpwent_r issetugid memfd_create)
 
@@ -90,9 +89,6 @@ AS_IF([test "x$enable_caps" != "xno"], [
 	])
 ])
 
-dnl libgcrypt
-AC_SEARCH_LIBS([gcry_check_version], [gcrypt], [AC_DEFINE([HAVE_GCRYPT], 1, [Define if gcrypt is available])], [])
-
 dnl dl
 AC_ARG_ENABLE([dl], AS_HELP_STRING([--disable-dl], [Disable dynamic libraries support]))
 AS_IF([test "x$enable_dl" != "xno"], [

nix/derivation.nix

@@ -18,7 +18,6 @@ with pkgs; stdenv.mkDerivation {
     which
   ];
   buildInputs = [
-    gcrypt
     glibc
     glibc.static
     libcap
@@ -32,7 +31,7 @@ with pkgs; stdenv.mkDerivation {
     export LDFLAGS='-s -w -static-libgcc -static'
     export EXTRA_LDFLAGS='-s -w -linkmode external -extldflags "-static -lm"'
     export CRUN_LDFLAGS='-all-static'
-    export LIBS='${lib.optionalString enableCriu "${criu}/lib/libcriu.a"} ${glibc.static}/lib/libc.a ${glibc.static}/lib/libpthread.a ${glibc.static}/lib/librt.a ${lib.getLib libcap}/lib/libcap.a ${lib.getLib libseccomp}/lib/libseccomp.a ${lib.optionalString enableSystemd "${lib.getLib libsystemd}/lib/libsystemd.a"} ${yajl}/lib/libyajl.a ${gcrypt}/lib/libgcrypt.a'
+    export LIBS='${lib.optionalString enableCriu "${criu}/lib/libcriu.a"} ${glibc.static}/lib/libc.a ${glibc.static}/lib/libpthread.a ${glibc.static}/lib/librt.a ${lib.getLib libcap}/lib/libcap.a ${lib.getLib libseccomp}/lib/libseccomp.a ${lib.optionalString enableSystemd "${lib.getLib libsystemd}/lib/libsystemd.a"} ${yajl}/lib/libyajl.a'
   '';
   buildPhase = ''
     patchShebangs .

nix/overlay.nix

@@ -4,7 +4,6 @@ in
 self: super:
 {
   criu = (static super.criu);
-  gcrypt = (static super.libgcrypt);
   gpgme = (static super.gpgme);
   libassuan = (static super.libassuan);
   libgpgerror = (static super.libgpgerror);