diff --git a/assets/images/help/enterprises/your-enterprises.png b/assets/images/help/enterprises/your-enterprises.png index d0e5da43d5..39010150b4 100644 Binary files a/assets/images/help/enterprises/your-enterprises.png and b/assets/images/help/enterprises/your-enterprises.png differ diff --git a/assets/images/help/settings/settings-sidebar-ssh-keys.png b/assets/images/help/settings/settings-sidebar-ssh-keys.png index c48d203519..1ad509a2cf 100644 Binary files a/assets/images/help/settings/settings-sidebar-ssh-keys.png and b/assets/images/help/settings/settings-sidebar-ssh-keys.png differ diff --git a/assets/images/help/settings/settings-ssh-key-review.png b/assets/images/help/settings/settings-ssh-key-review.png index 992d130778..765c760227 100644 Binary files a/assets/images/help/settings/settings-ssh-key-review.png and b/assets/images/help/settings/settings-ssh-key-review.png differ diff --git a/assets/images/help/settings/ssh-sso-authorize.png b/assets/images/help/settings/ssh-sso-authorize.png index de143cf818..45fda14956 100644 Binary files a/assets/images/help/settings/ssh-sso-authorize.png and b/assets/images/help/settings/ssh-sso-authorize.png differ diff --git a/assets/images/help/settings/ssh-sso-button.png b/assets/images/help/settings/ssh-sso-button.png index f88421df8c..61bdbcd4e0 100644 Binary files a/assets/images/help/settings/ssh-sso-button.png and b/assets/images/help/settings/ssh-sso-button.png differ diff --git a/assets/images/help/settings/userbar-account-settings.png b/assets/images/help/settings/userbar-account-settings.png index f54ce518cd..8594e68400 100644 Binary files a/assets/images/help/settings/userbar-account-settings.png and b/assets/images/help/settings/userbar-account-settings.png differ diff --git a/content/developers/overview/using-ssh-agent-forwarding.md b/content/developers/overview/using-ssh-agent-forwarding.md index f928053493..2cc54b1808 100644 --- a/content/developers/overview/using-ssh-agent-forwarding.md +++ b/content/developers/overview/using-ssh-agent-forwarding.md @@ -93,7 +93,7 @@ Sometimes, system configurations disallow SSH agent forwarding. You can check if ```shell $ ssh -v example.com # Connect to example.com with verbose debug output -> OpenSSH_5.6p1, OpenSSL 0.9.8r 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Reading configuration data /Users/you/.ssh/config > debug1: Applying options for example.com > debug1: Reading configuration data /etc/ssh_config diff --git a/content/github/authenticating-to-github/error-bad-file-number.md b/content/github/authenticating-to-github/error-bad-file-number.md index e619acb185..fa1ee2bcf5 100644 --- a/content/github/authenticating-to-github/error-bad-file-number.md +++ b/content/github/authenticating-to-github/error-bad-file-number.md @@ -12,7 +12,7 @@ When running remote Git commands or SSH, your connection might time out: ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} -> OpenSSH_5.8p1, OpenSSL 1.0.0d 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Connecting to {% data variables.command_line.codeblock %} [207.97.227.239] port 22. > debug1: connect to address 207.97.227.239 port 22: Connection timed out > ssh: connect to host {% data variables.command_line.codeblock %} port 22: Connection timed out diff --git a/content/github/authenticating-to-github/error-permission-denied-publickey.md b/content/github/authenticating-to-github/error-permission-denied-publickey.md index 247985dd8c..75af14ce41 100644 --- a/content/github/authenticating-to-github/error-permission-denied-publickey.md +++ b/content/github/authenticating-to-github/error-permission-denied-publickey.md @@ -20,11 +20,11 @@ To make sure you are connecting to the right domain, you can enter the following ```shell $ ssh -vT git@{% data variables.command_line.codeblock %} -> OpenSSH_5.6p1, OpenSSL 0.9.8r 8 Feb 2011 +> OpenSSH_8.1p1, LibreSSL 2.7.3 > debug1: Reading configuration data /Users/you/.ssh/config -> debug1: Reading configuration data /etc/ssh_config -> debug1: Applying options for * -> debug1: Connecting to {% data variables.command_line.codeblock %} [IP ADDRESS] port 22. +> debug1: Reading configuration data /etc/ssh/ssh_config +> debug1: /etc/ssh/ssh_config line 47: Applying options for * +> debug1: Connecting to {% data variables.command_line.codeblock %} port 22. ``` The connection should be made on port 22{% if currentVersion == "free-pro-team@latest" %}, unless you're overriding settings to use [SSH over HTTPS](/articles/using-ssh-over-the-https-port){% endif %}. @@ -51,7 +51,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} {% mac %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. If you're using OpenSSH 6.7 or older: +2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -68,6 +68,14 @@ $ ssh -T git@{% data variables.command_line.codeblock %} $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + # start the ssh-agent in the background + $ eval "$(ssh-agent -s)" + > Agent pid 59566 + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} {% endmac %} @@ -78,7 +86,7 @@ $ ssh -T git@{% data variables.command_line.codeblock %} 1. {% data reusables.desktop.windows_git_bash_turn_on_ssh_agent %} {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -2. Verify that you have a private key generated and loaded into SSH. If you're using OpenSSH 6.7 or older: +2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) @@ -89,13 +97,18 @@ $ ssh -T git@{% data variables.command_line.codeblock %} $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} {% endwindows %} {% linux %} {% data reusables.command_line.open_the_multi_os_terminal %} -2. Verify that you have a private key generated and loaded into SSH. If you're using OpenSSH 6.7 or older: +2. Verify that you have a private key generated and loaded into SSH. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell # start the ssh-agent in the background $ eval "$(ssh-agent -s)" @@ -112,6 +125,12 @@ $ ssh -T git@{% data variables.command_line.codeblock %} $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/you/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} + {% endlinux %} @@ -167,7 +186,7 @@ You must provide your public key to {% data variables.product.product_name %} to $ eval "$(ssh-agent -s)" > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -178,6 +197,11 @@ You must provide your public key to {% data variables.product.product_name %} to $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} @@ -194,7 +218,7 @@ You must provide your public key to {% data variables.product.product_name %} to $ ssh-agent -s > Agent pid 59566 ``` -3. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +3. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -205,6 +229,11 @@ You must provide your public key to {% data variables.product.product_name %} to $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} {% data reusables.user_settings.access_settings %} {% data reusables.user_settings.ssh %} diff --git a/content/github/authenticating-to-github/reviewing-your-ssh-keys.md b/content/github/authenticating-to-github/reviewing-your-ssh-keys.md index a71621fb77..71ea5e3d05 100644 --- a/content/github/authenticating-to-github/reviewing-your-ssh-keys.md +++ b/content/github/authenticating-to-github/reviewing-your-ssh-keys.md @@ -21,7 +21,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% tip %} - **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. ![Unverified SSH key](/assets/images/help/settings/settings-ssh-key-review-highlight.png) + **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. {% endtip %} @@ -29,7 +29,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -40,6 +40,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} 7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer. @@ -54,7 +59,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% tip %} - **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys.![Unverified SSH key](/assets/images/help/settings/settings-ssh-key-review-highlight.png) + **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. {% endtip %} @@ -64,7 +69,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% data reusables.desktop.windows_git_for_windows_turn_on_ssh_agent %} -6. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -75,6 +80,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} 7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer. @@ -89,7 +99,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an {% tip %} - **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. ![Unverified SSH key](/assets/images/help/settings/settings-ssh-key-review-highlight.png) + **Note:** If you're auditing your SSH keys due to an unsuccessful Git operation, the unverified key that caused the [SSH key audit error](/articles/error-we-re-doing-an-ssh-key-audit) will be highlighted in the list of SSH keys. {% endtip %} @@ -97,7 +107,7 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an 5. {% data reusables.command_line.start_ssh_agent %} -6. Find and take a note of your public key fingerprint. If you're using OpenSSH 6.7 or older: +6. Find and take a note of your public key fingerprint. {% if currentVersion ver_lt "enterprise-server@2.23" %}If you're using OpenSSH 6.7 or older: ```shell $ ssh-add -l > 2048 a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) @@ -108,6 +118,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an $ ssh-add -l -E md5 > 2048 MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d /Users/USERNAME/.ssh/id_rsa (RSA) ``` + {% else %} + ```shell + $ ssh-add -l -E sha256 + > 2048 SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ /Users/USERNAME/.ssh/id_rsa (RSA) + ```{% endif %} 7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer.