summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/patches/progress-linux/0001-ssh-keygen-default-key-type.patch31
-rw-r--r--debian/patches/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/progress-linux/0001-ssh-keygen-default-key-type.patch b/debian/patches/progress-linux/0001-ssh-keygen-default-key-type.patch
new file mode 100644
index 0000000..3682850
--- /dev/null
+++ b/debian/patches/progress-linux/0001-ssh-keygen-default-key-type.patch
@@ -0,0 +1,31 @@
+Author: Daniel Baumann <daniel.baumann@progress-linux.org>
+Description: Setting default key type in ssh-keygen to ED25519.
+
+diff -Naurp openssh.orig/ssh-keygen.1 openssh/ssh-keygen.1
+--- openssh.orig/ssh-keygen.1
++++ openssh/ssh-keygen.1
+@@ -151,7 +151,7 @@ The type of key to be generated is speci
+ option.
+ If invoked without any arguments,
+ .Nm
+-will generate an RSA key.
++will generate an ED25519 key.
+ .Pp
+ .Nm
+ is also used to generate groups for use in Diffie-Hellman group
+diff -Naurp openssh.orig/ssh-keygen.c openssh/ssh-keygen.c
+--- openssh.orig/ssh-keygen.c
++++ openssh/ssh-keygen.c
+@@ -61,11 +61,7 @@
+ #include "utf8.h"
+ #include "authfd.h"
+
+-#ifdef WITH_OPENSSL
+-# define DEFAULT_KEY_TYPE_NAME "rsa"
+-#else
+-# define DEFAULT_KEY_TYPE_NAME "ed25519"
+-#endif
++#define DEFAULT_KEY_TYPE_NAME "ed25519"
+
+ /* Number of bits in the RSA/DSA key. This value can be set on the command line. */
+ #define DEFAULT_BITS 2048
diff --git a/debian/patches/series b/debian/patches/series
index aed9546..b694d4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ scp-handle-braces.patch
revert-ipqos-defaults.patch
seccomp-handle-shm.patch
sandbox-seccomp-ipc.patch
+progress-linux/0001-ssh-keygen-default-key-type.patch