diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-23 12:11:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-06-27 23:42:20 +0200 |
| commit | 8dc6c387852bb9505be44567a5f56913633cc23a (patch) | |
| tree | 872914ede2ea33f72f8c09b2c3517fdf92ee85f5 /nix/local.mk | |
| parent | 3fb6b8f30444d41963ba5bdd441123a6d2df17bd (diff) | |
| download | guix-patches-8dc6c387852bb9505be44567a5f56913633cc23a.tar guix-patches-8dc6c387852bb9505be44567a5f56913633cc23a.tar.gz | |
daemon: Remove OpenSSL hash compatibility wrappers.
* nix/libutil/hash.cc (struct Ctx): Copy from gcrypt-hash.hh.
(start, update, finish): Use gcrypt functions directly instead of
OpenSSL-like wrappers.
* nix/libutil/gcrypt-hash.cc, nix/libutil/gcrypt-hash.hh,
nix/libutil/md5.h, nix/libutil/sha1.h, nix/libutil/sha256.h,
nix/libutil/sha512.h: Remove.
* nix/local.mk (libutil_a_SOURCES, libutil_headers): Adjust
accordingly.
Diffstat (limited to 'nix/local.mk')
| -rw-r--r-- | nix/local.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/nix/local.mk b/nix/local.mk index c136fb7202..005cde5563 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> # Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> # @@ -56,8 +56,7 @@ libutil_a_SOURCES = \ %D%/libutil/affinity.cc \ %D%/libutil/serialise.cc \ %D%/libutil/util.cc \ - %D%/libutil/hash.cc \ - %D%/libutil/gcrypt-hash.cc + %D%/libutil/hash.cc libutil_headers = \ %D%/libutil/affinity.hh \ @@ -65,12 +64,7 @@ libutil_headers = \ %D%/libutil/serialise.hh \ %D%/libutil/util.hh \ %D%/libutil/archive.hh \ - %D%/libutil/types.hh \ - %D%/libutil/gcrypt-hash.hh \ - %D%/libutil/md5.h \ - %D%/libutil/sha1.h \ - %D%/libutil/sha256.h \ - %D%/libutil/sha512.h + %D%/libutil/types.hh libutil_a_CPPFLAGS = \ -I$(top_builddir)/nix \ |