diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-22 09:50:06 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-22 14:05:59 +0100 |
| commit | ab2a74e4dbfd396566a8b14223f5849304d4fe6b (patch) | |
| tree | 69f74204ea1a360e2043740de982851eb2340615 /guix/pk-crypto.scm | |
| parent | 5cd074ea32debac844ce3761f6baa3f63e3d61b2 (diff) | |
| download | guix-patches-ab2a74e4dbfd396566a8b14223f5849304d4fe6b.tar guix-patches-ab2a74e4dbfd396566a8b14223f5849304d4fe6b.tar.gz | |
publish: The public and private keys are now SRFI-39 parameters.
* guix/scripts/publish.scm (%default-options): Add 'public-key-file' and
'private-key-file'.
(lazy-read-file-sexp): Remove.
(%private-key, %public-key): Turn into SRFI-39 parameters.
(signed-string, render-narinfo): Adjust accordingly.
(guix-publish): Honor 'public-key-file' and 'private-key-file' from
OPTS. Use 'parameterize'.
* guix/pk-crypto.scm (read-file-sexp): New procedure.
* tests/publish.scm: Initialize '%public-key' and '%private-key'.
Diffstat (limited to 'guix/pk-crypto.scm')
| -rw-r--r-- | guix/pk-crypto.scm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/guix/pk-crypto.scm b/guix/pk-crypto.scm index 7017006a71..55ba7b1bb8 100644 --- a/guix/pk-crypto.scm +++ b/guix/pk-crypto.scm @@ -23,11 +23,13 @@ #:use-module (system foreign) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) + #:use-module (ice-9 rdelim) #:export (canonical-sexp? error-source error-string string->canonical-sexp canonical-sexp->string + read-file-sexp number->canonical-sexp canonical-sexp-car canonical-sexp-cdr @@ -143,6 +145,12 @@ thrown along with 'gcry-error'." (loop (* len 2)) (pointer->string buf size "ISO-8859-1"))))))) +(define (read-file-sexp file) + "Return the canonical sexp read from FILE." + (call-with-input-file file + (compose string->canonical-sexp + read-string))) + (define canonical-sexp-car (let* ((ptr (libgcrypt-func "gcry_sexp_car")) (proc (pointer->procedure '* ptr '(*)))) |