From 19a454448b97d2e84164f8add9aaed42c645e338 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 26 Jan 2015 21:42:23 +0100 Subject: hash: Initialize libgcrypt before use. Fixes . Reported by Mark H Weaver . * guix/hash.scm: Use (guix gcrypt). (sha256, open-sha256-md, md-write, md-close): Use 'libgcrypt-func' instead of 'dynamic-func'. --- guix/hash.scm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/guix/hash.scm b/guix/hash.scm index 593c2e1aee..a61dc980e6 100644 --- a/guix/hash.scm +++ b/guix/hash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +17,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix hash) - #:use-module (guix config) + #:use-module (guix gcrypt) #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (system foreign) @@ -46,8 +46,7 @@ (define-syntax GCRY_MD_SHA256 (define sha256 (let ((hash (pointer->procedure void - (dynamic-func "gcry_md_hash_buffer" - (dynamic-link %libgcrypt)) + (libgcrypt-func "gcry_md_hash_buffer") `(,int * * ,size_t)))) (lambda (bv) "Return the SHA256 of BV as a bytevector." @@ -58,8 +57,7 @@ (define sha256 (define open-sha256-md (let ((open (pointer->procedure int - (dynamic-func "gcry_md_open" - (dynamic-link %libgcrypt)) + (libgcrypt-func "gcry_md_open") `(* ,int ,unsigned-int)))) (lambda () (let* ((md (bytevector->pointer (make-bytevector (sizeof '*)))) @@ -70,20 +68,17 @@ (define open-sha256-md (define md-write (pointer->procedure void - (dynamic-func "gcry_md_write" - (dynamic-link %libgcrypt)) + (libgcrypt-func "gcry_md_write") `(* * ,size_t))) (define md-read (pointer->procedure '* - (dynamic-func "gcry_md_read" - (dynamic-link %libgcrypt)) + (libgcrypt-func "gcry_md_read") `(* ,int))) (define md-close (pointer->procedure void - (dynamic-func "gcry_md_close" - (dynamic-link %libgcrypt)) + (libgcrypt-func "gcry_md_close") '(*))) -- cgit v1.2.3