01/04: squash! rename <openpgp-signature> getters

[guix-commits]

civodul pushed a commit to branch wip-openpgp
in repository guix.

commit 29aae8cfc9d107303c5a059c9f923c2bfd104a6a
Author: Ludovic Courtès <address@hidden>
AuthorDate: Sun Apr 26 15:58:11 2020 +0200

    squash! rename <openpgp-signature> getters
---
 guix/openpgp.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/guix/openpgp.scm b/guix/openpgp.scm
index 1028e96..a779ac2 100644
--- a/guix/openpgp.scm
+++ b/guix/openpgp.scm
@@ -34,10 +34,8 @@
             openpgp-signature?
             openpgp-signature-issuer
             openpgp-signature-issuer-fingerprint
-            (openpgp-signature-pkalg
-             . openpgp-signature-public-key-algorithm)
-            (openpgp-signature-halg
-             . openpgp-signature-hash-algorithm)
+            openpgp-signature-public-key-algorithm
+            openpgp-signature-hash-algorithm
             openpgp-signature-creation-time
             openpgp-signature-expiration-time
 
@@ -476,15 +474,15 @@ writes to PORT the value 42 as an 8-bit integer and the 
value #x7777 as a
 ;;; Signatures
 
 (define-record-type <openpgp-signature>
-  (make-openpgp-signature version type pkalg halg hashl16
+  (make-openpgp-signature version type pk-algorithm hash-algorithm hashl16
                           append-data hashed-subpackets unhashed-subpackets
                           value)
   openpgp-signature?
   (version               openpgp-signature-version)
   (type                  openpgp-signature-type)
-  (pkalg                 openpgp-signature-pkalg)
-  (halg                  openpgp-signature-halg)
-  (hashl16               openpgp-signature-hashl16)
+  (pk-algorithm          openpgp-signature-public-key-algorithm)
+  (hash-algorithm        openpgp-signature-hash-algorithm)
+  (hashl16               openpgp-signature-hashl16) ;left 16 bits of signed 
hash
   (append-data           openpgp-signature-append-data) ;append to data when 
hashing
   (hashed-subpackets     openpgp-signature-hashed-subpackets)
   (unhashed-subpackets   openpgp-signature-unhashed-subpackets)
@@ -547,7 +545,7 @@ symbol, such as 'bad-signature or 'missing-key, and 
additional info, such as
 the issuer's OpenPGP public key extracted from KEYRING."
   (define (check key sig)
     (let*-values (((hash-algorithm) (lookup-hash-algorithm
-                                     (openpgp-signature-halg sig)))
+                                     (openpgp-signature-hash-algorithm sig)))
                   ((port get-hash) (open-hash-port hash-algorithm)))
       (dump-port dataport port)