From 1cbfce16691327bd309d6b03d8cbe3aef38e57bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 17 Mar 2014 23:49:35 +0100
Subject: [PATCH] guix archive: Generate curve Ed25519 keys by default.

* guix/scripts/archive.scm (%options) <generate-key>: Default to curve
  Ed25519.  Suggested by Christian Grothoff <grothoff@in.tum.de>.
---
 guix/scripts/archive.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index f513f33dd4..0e67321026 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -110,9 +110,12 @@ (define %options
                  (lambda (opt name arg result)
                    (catch 'gcry-error
                      (lambda ()
+                       ;; XXX: Curve25519 was actually introduced in
+                       ;; libgcrypt 1.6.0.
                        (let ((params
                               (string->canonical-sexp
-                               (or arg "(genkey (rsa (nbits 4:4096)))"))))
+                               (or arg "\
+ (genkey (ecdsa (curve Ed25519) (flags rfc6979)))"))))
                          (alist-cons 'generate-key params result)))
                      (lambda (key err)
                        (leave (_ "invalid key generation parameters: ~a: ~a~%")