diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-19 00:17:48 +0200 |
| commit | 1a8f7a0f584e5dd6e8f1a379b92f689b71902295 (patch) | |
| tree | 8586450fc3068b217e60a7e942fa4c7d89ad74e7 /guix/openpgp.scm | |
| parent | 19d42e0e23a7f90ac2dcc1c279bd23a967ff0314 (diff) | |
| parent | 2a4f3c1711fdb947e615b5a89e285421b3bf0925 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/openpgp.scm')
| -rw-r--r-- | guix/openpgp.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/openpgp.scm b/guix/openpgp.scm index 153752ee73..648c359621 100644 --- a/guix/openpgp.scm +++ b/guix/openpgp.scm @@ -34,6 +34,7 @@ openpgp-error? openpgp-unrecognized-packet-error? openpgp-unrecognized-packet-error-port + openpgp-unrecognized-packet-error-type openpgp-invalid-signature-error? openpgp-invalid-signature-error-port @@ -132,6 +133,7 @@ ;; Error raised when reading an unsupported or unrecognized packet tag. (define-condition-type &openpgp-unrecognized-packet-error &openpgp-error openpgp-unrecognized-packet-error? + (type openpgp-unrecognized-packet-error-type) (port openpgp-unrecognized-packet-error-port)) ;; Error raised when reading an invalid signature packet. @@ -477,7 +479,8 @@ hexadecimal format for fingerprints." ((= tag PACKET-ONE-PASS-SIGNATURE) 'one-pass-signature) ;TODO: implement (else - (raise (condition (&openpgp-unrecognized-packet-error (port p)))))))) + (raise (condition (&openpgp-unrecognized-packet-error (type tag) + (port p)))))))) (define-record-type <openpgp-public-key> (make-openpgp-public-key version subkey? time value fingerprint) @@ -817,6 +820,7 @@ FINGERPRINT, a bytevector." (if critical? (raise (condition (&openpgp-unrecognized-packet-error + (type type) (port signature-port)))) (list 'unsupported-subpacket type data)))))) |