summaryrefslogtreecommitdiff
path: root/doc/security/ssh_keys_restrictions.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-26 03:09:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-26 03:09:01 +0000
commitbaaa5c45c022d394bf1478d462a3b1aea413b7ed (patch)
treec18f52b77c9b4a92f504dfd1060e7495e293a937 /doc/security/ssh_keys_restrictions.md
parentb3618e799d30ae6df5c55e47b8ec8ebedb1af5a0 (diff)
downloadgitlab-ce-baaa5c45c022d394bf1478d462a3b1aea413b7ed.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security/ssh_keys_restrictions.md')
-rw-r--r--doc/security/ssh_keys_restrictions.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md
index f2e11385ff2..7a17d2f22ff 100644
--- a/doc/security/ssh_keys_restrictions.md
+++ b/doc/security/ssh_keys_restrictions.md
@@ -36,6 +36,16 @@ An icon is visible to the user of a restricted key in the SSH keys section of th
Hovering over this icon tells you why the key is restricted.
+## Default settings
+
+By default, the GitLab.com and self-managed settings for the
+[supported key types](../ssh/index.md#supported-ssh-key-types) are:
+
+- RSA SSH keys are allowed.
+- DSA SSH keys are forbidden ([since GitLab 11.0](https://about.gitlab.com/releases/2018/06/22/gitlab-11-0-released/#support-for-dsa-ssh-keys)).
+- ECDSA SSH keys are allowed.
+- ED25519 SSH keys are allowed.
+
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues