guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/09: openpgp: '&openpgp-unrecognized-packet-error' includes type tag.


From: guix-commits
Subject: 02/09: openpgp: '&openpgp-unrecognized-packet-error' includes type tag.
Date: Wed, 14 Oct 2020 09:25:13 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 37a8f5b281644bd5355406a4df76bbb9efc50d9c
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Oct 14 10:19:38 2020 +0200

    openpgp: '&openpgp-unrecognized-packet-error' includes type tag.
    
    * guix/openpgp.scm (&openpgp-unrecognized-packet-error)[type]: New
    field.
    (get-data, parse-subpackets): Initialize 'type' field.
---
 guix/openpgp.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 153752e..648c359 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))))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]