summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 05:19:43 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-28 05:19:43 +0000
commit119ef95f73c32f106c02cbb5d525758498e0e7e6 (patch)
treee48c06d5dc557b10e6af5ea599c72c78cac8f764
parentDisabling pam_motd.so. (diff)
downloadopenssh-119ef95f73c32f106c02cbb5d525758498e0e7e6.tar.xz
openssh-119ef95f73c32f106c02cbb5d525758498e0e7e6.zip
Setting default key type in ssh-keygen to ED25519.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-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..6f054dd
--- /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
+@@ -169,7 +169,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
+@@ -66,11 +66,7 @@
+ #include "ssh-sk.h"
+ #include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */
+
+-#ifdef WITH_OPENSSL
+-# define DEFAULT_KEY_TYPE_NAME "rsa"
+-#else
+-# define DEFAULT_KEY_TYPE_NAME "ed25519"
+-#endif
++#define DEFAULT_KEY_TYPE_NAME "ed25519"
+
+ /*
+ * Default number of bits in the RSA, DSA and ECDSA keys. These value can be
diff --git a/debian/patches/series b/debian/patches/series
index d62e524..ae031d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ CVE-2021-41617-1.patch
CVE-2021-41617-2.patch
CVE-2023-48795.patch
CVE-2023-51385.patch
+progress-linux/0001-ssh-keygen-default-key-type.patch