diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-31 23:47:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-31 23:47:02 +0200 |
| commit | e4687a5e68fce458685dd33bfa240758c816b3a2 (patch) | |
| tree | a104d2d3cdbf73f9bc740e21b442cfedcd99d5f3 /guix.scm | |
| parent | 81deef270ded7dabcc623d9522ae593ed02160af (diff) | |
| download | patches-e4687a5e68fce458685dd33bfa240758c816b3a2.tar patches-e4687a5e68fce458685dd33bfa240758c816b3a2.tar.gz | |
Use 'signature-case' in (guix nar) and 'substitute-binary'.
* guix/nar.scm (restore-file-set)[assert-valid-signature]: Rewrite in
terms of 'signature-case'.
* guix/scripts/substitute-binary.scm (narinfo-signature->canonical-sexp):
Call 'leave' instead of 'raise' when SIGNATURE is invalid.
(&nar-signature-error, &nar-invalid-hash-error): Remove.
(assert-valid-signature): Add 'narinfo' parameter; remove 'port'.
Rewrite in terms of 'signature-case' and 'leave'. Mention NARINFO's
URI in error messages. Adjust caller.
(narinfo-sha256): New procedure.
(assert-valid-narinfo): Use it.
(valid-narinfo?): Rewrite using 'narinfo-sha256' and
'signature-case'.
* tests/substitute-binary.scm (assert-valid-signature,
test-error-condition): Remove.
("corrupt signature data", "unauthorized public key", "invalid
signature"): Remove.
Diffstat (limited to 'guix.scm')
0 files changed, 0 insertions, 0 deletions