16 files changed, 32 insertions, 29 deletions

diff --git a/Makefile.am b/Makefile.am
index 1ef57af7a58..976c5cad742 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -802,17 +802,17 @@ EXTRA_DIST +=						\
   etc/manifests/upgrade.scm                             \
   scripts/guix.in                                       \
   tests/cve-sample.json                                 \
-  tests/keys/civodul.pub                                \
-  tests/keys/dsa.pub                                    \
-  tests/keys/ed25519-2.pub                              \
-  tests/keys/ed25519-2.sec                              \
-  tests/keys/ed25519-3.pub                              \
-  tests/keys/ed25519-3.sec                              \
-  tests/keys/ed25519.pub                                \
-  tests/keys/ed25519.sec                                \
-  tests/keys/rsa.pub                                    \
-  tests/keys/signing-key.pub                            \
-  tests/keys/signing-key.sec                            \
+  tests/keys/openpgp/civodul.pub                        \
+  tests/keys/openpgp/dsa.pub                            \
+  tests/keys/openpgp/ed25519-2.pub                      \
+  tests/keys/openpgp/ed25519-2.sec                      \
+  tests/keys/openpgp/ed25519-3.pub                      \
+  tests/keys/openpgp/ed25519-3.sec                      \
+  tests/keys/openpgp/ed25519.pub                        \
+  tests/keys/openpgp/ed25519.sec                        \
+  tests/keys/openpgp/rsa.pub                            \
+  tests/keys/openpgp/signing-key.pub                    \
+  tests/keys/openpgp/signing-key.sec                    \
   tests/test.drv                                        \
   $(TESTS)
 
diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index 86c2e585d73..ade0190f08b 100644
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -73,8 +73,8 @@ then
         # Copy the keys so that the secret key has the right permissions (the
         # daemon errors out when this is not the case.)
         mkdir -p "$GUIX_CONFIGURATION_DIRECTORY"
-        cp "@abs_top_srcdir@/tests/keys/signing-key.sec"        \
-           "@abs_top_srcdir@/tests/keys/signing-key.pub"        \
+        cp "@abs_top_srcdir@/tests/keys/openpgp/signing-key.sec"        \
+           "@abs_top_srcdir@/tests/keys/openpgp/signing-key.pub"        \
            "$GUIX_CONFIGURATION_DIRECTORY"
         chmod 400 "$GUIX_CONFIGURATION_DIRECTORY/signing-key.sec"
     fi
diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm
index 0e4573ae4da..104c621502c 100644
--- a/guix/tests/gnupg.scm
+++ b/guix/tests/gnupg.scm
@@ -65,17 +65,17 @@ process is terminated afterwards."
   (call-with-fresh-gnupg-setup imported (lambda () exp ...)))
 
 (define %ed25519-public-key-file
-  (search-path %load-path "tests/keys/ed25519.pub"))
+  (search-path %load-path "tests/keys/openpgp/ed25519.pub"))
 (define %ed25519-secret-key-file
-  (search-path %load-path "tests/keys/ed25519.sec"))
+  (search-path %load-path "tests/keys/openpgp/ed25519.sec"))
 (define %ed25519-2-public-key-file
-  (search-path %load-path "tests/keys/ed25519-2.pub"))
+  (search-path %load-path "tests/keys/openpgp/ed25519-2.pub"))
 (define %ed25519-2-secret-key-file
-  (search-path %load-path "tests/keys/ed25519-2.sec"))
+  (search-path %load-path "tests/keys/openpgp/ed25519-2.sec"))
 (define %ed25519-3-public-key-file
-  (search-path %load-path "tests/keys/ed25519-3.pub"))
+  (search-path %load-path "tests/keys/openpgp/ed25519-3.pub"))
 (define %ed25519-3-secret-key-file
-  (search-path %load-path "tests/keys/ed25519-3.sec"))
+  (search-path %load-path "tests/keys/openpgp/ed25519-3.sec"))
 
 (define (read-openpgp-packet file)
   (get-openpgp-packet
diff --git a/tests/guix-authenticate.sh b/tests/guix-authenticate.sh
index ddd39d09c44..3fe974955c3 100644
--- a/tests/guix-authenticate.sh
+++ b/tests/guix-authenticate.sh
@@ -28,7 +28,7 @@ rm -f "$sig" "$hash"
 
 trap 'rm -f "$sig" "$hash"' EXIT
 
-key="$abs_top_srcdir/tests/keys/signing-key.sec"
+key="$abs_top_srcdir/tests/keys/openpgp/signing-key.sec"
 key_len="`echo -n $key | wc -c`"
 
 # A hexadecimal string as long as a sha256 hash.
@@ -67,7 +67,7 @@ test "$code" -ne 0
 # encoded independently of the current locale: <https://bugs.gnu.org/43421>.
 hash="636166e9636166e9636166e9636166e9636166e9636166e9636166e9636166e9"
 latin1_cafe="caf$(printf '\351')"
-echo "sign 26:tests/keys/signing-key.sec 64:$hash" | guix authenticate \
+echo "sign 34:tests/keys/openpgp/signing-key.sec 64:$hash" | guix authenticate \
     | LC_ALL=C grep "hash sha256 \"$latin1_cafe"
 
 # Test for <http://bugs.gnu.org/17312>: make sure 'guix authenticate' produces
diff --git a/tests/keys/civodul.pub b/tests/keys/openpgp/civodul.pub
index 272600ac937..272600ac937 100644
--- a/tests/keys/civodul.pub
+++ b/tests/keys/openpgp/civodul.pub
diff --git a/tests/keys/dsa.pub b/tests/keys/openpgp/dsa.pub
index 4727975c634..4727975c634 100644
--- a/tests/keys/dsa.pub
+++ b/tests/keys/openpgp/dsa.pub
diff --git a/tests/keys/ed25519-2.pub b/tests/keys/openpgp/ed25519-2.pub
index ef050e3845f..ef050e3845f 100644
--- a/tests/keys/ed25519-2.pub
+++ b/tests/keys/openpgp/ed25519-2.pub
diff --git a/tests/keys/ed25519-2.sec b/tests/keys/openpgp/ed25519-2.sec
index 059765f557e..059765f557e 100644
--- a/tests/keys/ed25519-2.sec
+++ b/tests/keys/openpgp/ed25519-2.sec
diff --git a/tests/keys/ed25519-3.pub b/tests/keys/openpgp/ed25519-3.pub
index 057f29577e8..057f29577e8 100644
--- a/tests/keys/ed25519-3.pub
+++ b/tests/keys/openpgp/ed25519-3.pub
diff --git a/tests/keys/ed25519-3.sec b/tests/keys/openpgp/ed25519-3.sec
index 04128a41318..04128a41318 100644
--- a/tests/keys/ed25519-3.sec
+++ b/tests/keys/openpgp/ed25519-3.sec
diff --git a/tests/keys/ed25519.pub b/tests/keys/openpgp/ed25519.pub
index 5a2fccc9f9a..5a2fccc9f9a 100644
--- a/tests/keys/ed25519.pub
+++ b/tests/keys/openpgp/ed25519.pub
diff --git a/tests/keys/ed25519.sec b/tests/keys/openpgp/ed25519.sec
index 068738dfabd..068738dfabd 100644
--- a/tests/keys/ed25519.sec
+++ b/tests/keys/openpgp/ed25519.sec
diff --git a/tests/keys/rsa.pub b/tests/keys/openpgp/rsa.pub
index 0ef9145ef0d..0ef9145ef0d 100644
--- a/tests/keys/rsa.pub
+++ b/tests/keys/openpgp/rsa.pub
diff --git a/tests/keys/signing-key.pub b/tests/keys/openpgp/signing-key.pub
index 092424a15d2..092424a15d2 100644
--- a/tests/keys/signing-key.pub
+++ b/tests/keys/openpgp/signing-key.pub
diff --git a/tests/keys/signing-key.sec b/tests/keys/openpgp/signing-key.sec
index 558e1891027..558e1891027 100644
--- a/tests/keys/signing-key.sec
+++ b/tests/keys/openpgp/signing-key.sec
diff --git a/tests/openpgp.scm b/tests/openpgp.scm
index 1f204667721..30be6644684 100644
--- a/tests/openpgp.scm
+++ b/tests/openpgp.scm
@@ -172,7 +172,7 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
   (not (port-ascii-armored? (open-bytevector-input-port %binary-sample))))
 
 (test-assert "get-openpgp-keyring"
-  (let* ((key (search-path %load-path "tests/keys/civodul.pub"))
+  (let* ((key (search-path %load-path "tests/keys/openpgp/civodul.pub"))
          (keyring (get-openpgp-keyring
                    (open-bytevector-input-port
                     (call-with-input-file key read-radix-64)))))
@@ -232,10 +232,11 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                          (verify-openpgp-signature signature keyring
                                                    (open-input-string "Hello!\n"))))
              (list status (openpgp-public-key-id key)))))
-       (list "tests/keys/rsa.pub" "tests/keys/dsa.pub"
-             "tests/keys/ed25519.pub"
-             "tests/keys/ed25519.pub"
-             "tests/keys/ed25519.pub")
+       (list "tests/keys/openpgp/rsa.pub"
+             "tests/keys/openpgp/dsa.pub"
+             "tests/keys/openpgp/ed25519.pub"
+             "tests/keys/openpgp/ed25519.pub"
+             "tests/keys/openpgp/ed25519.pub")
        (list %hello-signature/rsa %hello-signature/dsa
              %hello-signature/ed25519/sha256
              %hello-signature/ed25519/sha512
@@ -254,9 +255,11 @@ Pz7oopeN72xgggYUNT37ezqN3MeCqw0=
                              (call-with-input-file key read-radix-64))
                             keyring)))
                        %empty-keyring
-                       '("tests/keys/rsa.pub" "tests/keys/dsa.pub"
-                         "tests/keys/ed25519.pub" "tests/keys/ed25519.pub"
-                         "tests/keys/ed25519.pub"))))
+                       '("tests/keys/openpgp/rsa.pub"
+                         "tests/keys/openpgp/dsa.pub"
+                         "tests/keys/openpgp/ed25519.pub"
+                         "tests/keys/openpgp/ed25519.pub"
+                         "tests/keys/openpgp/ed25519.pub"))))
     (map (lambda (signature)
            (let ((signature (string->openpgp-packet signature)))
              (let-values (((status key)