summaryrefslogtreecommitdiff
path: root/doc/ssh
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2019-06-14 03:51:13 +0000
committerEvan Read <eread@gitlab.com>2019-06-14 03:51:13 +0000
commitb8928f0a072ac60f23041813c891dfef3f94b3ce (patch)
treeb4723aff8e3482ab431a45c0f340c0f458d1be4f /doc/ssh
parent6de8cb7e9cf715e720fab9e7359ddb63c992af3b (diff)
downloadgitlab-ce-b8928f0a072ac60f23041813c891dfef3f94b3ce.tar.gz
Clarify ED25519 SSH key support
Diffstat (limited to 'doc/ssh')
-rw-r--r--doc/ssh/README.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index 09b5fbd9260..dbd9bcee935 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -64,9 +64,14 @@ Following [best practices](https://linux-audit.com/using-ed25519-openssh-keys-in
you should always favor [ED25519](https://ed25519.cr.yp.to/) SSH keys, since they
are more secure and have better performance over the other types.
-They were introduced in OpenSSH 6.5, so any modern OS should include the
-option to create them. If for any reason your OS or the GitLab instance you
-interact with doesn't support this, you can fallback to RSA.
+ED25519 SSH keys were introduced in OpenSSH 6.5,
+so any modern OS should include the option to create them.
+If for any reason your OS or the GitLab instance you interact with doesn't
+support ED25519, you can fallback to RSA.
+
+NOTE: **Note:**
+Omnibus does not ship with OpenSSH, so it uses the version on your GitLab server. If using
+Omnibus, ensure the version of OpenSSH installed is version 6.5 or newer if you want to use ED25519 SSH keys.
### RSA SSH keys