futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Move OpenPGP helpers to (guix tests gnupg).

Browse Source 
* tests/git-authenticate.scm (key-id): Remove.
(%ed25519-public-key-file, %ed25519-secret-key-file)
(%ed25519bis-public-key-file, %ed25519bis-secret-key-file)
(read-openpgp-packet, key-fingerprint): Move to...
* guix/tests/gnupg.scm: ... here.
This commit is contained in:
Ludovic Courtès 2020-06-08 16:34:53 +02:00
parent 41946b79f1
commit 1e2b9bf2d4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
guix/tests/gnupg.scm
View File

@ -17,12 +17,23 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix tests gnupg) (define-module (guix tests gnupg)
#:use-module (guix openpgp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (rnrs io ports)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:export (gpg-command #:export (gpg-command
gpgconf-command gpgconf-command
with-fresh-gnupg-setup)) with-fresh-gnupg-setup
%ed25519-public-key-file
%ed25519-secret-key-file
%ed25519bis-public-key-file
%ed25519bis-secret-key-file
read-openpgp-packet
key-fingerprint
key-id))
(define gpg-command (define gpg-command
(make-parameter "gpg")) (make-parameter "gpg"))
@ -50,3 +61,22 @@ listed in IMPORTED, and only them, have been imported. This sets 'GNUPGHOME'
such that the user's real GnuPG files are left untouched. The 'gpg-agent' such that the user's real GnuPG files are left untouched. The 'gpg-agent'
process is terminated afterwards." process is terminated afterwards."
(call-with-fresh-gnupg-setup imported (lambda () exp ...))) (call-with-fresh-gnupg-setup imported (lambda () exp ...)))
(define %ed25519-public-key-file
(search-path %load-path "tests/ed25519.key"))
(define %ed25519-secret-key-file
(search-path %load-path "tests/ed25519.sec"))
(define %ed25519bis-public-key-file
(search-path %load-path "tests/ed25519bis.key"))
(define %ed25519bis-secret-key-file
(search-path %load-path "tests/ed25519bis.sec"))
(define (read-openpgp-packet file)
(get-openpgp-packet
(open-bytevector-input-port
(call-with-input-file file read-radix-64))))
(define key-fingerprint
(compose openpgp-format-fingerprint
openpgp-public-key-fingerprint
read-openpgp-packet))

25
tests/git-authenticate.scm
View File

@ -32,31 +32,6 @@
;; Test the (guix git-authenticate) tools. ;; Test the (guix git-authenticate) tools.
(define %ed25519-public-key-file
(search-path %load-path "tests/ed25519.key"))
(define %ed25519-secret-key-file
(search-path %load-path "tests/ed25519.sec"))
(define %ed25519bis-public-key-file
(search-path %load-path "tests/ed25519bis.key"))
(define %ed25519bis-secret-key-file
(search-path %load-path "tests/ed25519bis.sec"))
(define (read-openpgp-packet file)
(get-openpgp-packet
(open-bytevector-input-port
(call-with-input-file file read-radix-64))))
(define key-fingerprint
(compose openpgp-format-fingerprint
openpgp-public-key-fingerprint
read-openpgp-packet))
(define (key-id file)
(define id
(openpgp-public-key-id (read-openpgp-packet)))
(string-pad (number->string id 16) 16 #\0))
(define (gpg+git-available?) (define (gpg+git-available?)
(and (which (git-command)) (and (which (git-command))
(which (gpg-command)) (which (gpgconf-command)))) (which (gpg-command)) (which (gpgconf-command))))