1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00

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.
This commit is contained in:
Ludovic Courtès
2020-06-23 12:11:00 +02:00
parent 3fb6b8f304
commit 8dc6c38785
8 changed files with 27 additions and 279 deletions

View File

@@ -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 \