diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:42:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 14:42:56 +0000 |
| commit | 32fc13d2bc5a9d30ce4efe72121c469f90c14557 (patch) | |
| tree | 0e40c7f2f754f634789c2521e1fac52364e1ef54 | |
| parent | Disabling pam_motd.so. (diff) | |
| download | openssh-32fc13d2bc5a9d30ce4efe72121c469f90c14557.tar.xz openssh-32fc13d2bc5a9d30ce4efe72121c469f90c14557.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.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
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..24fa8c9 --- /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 +@@ -180,7 +180,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 +@@ -67,11 +67,7 @@ + #include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ + #include "cipher.h" + +-#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 f9d3791..fb6eec5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ CVE-2023-28531.patch CVE-2023-48795.patch CVE-2023-51384.patch CVE-2023-51385.patch +progress-linux/0001-ssh-keygen-default-key-type.patch |