Skip to content

Commit

Permalink
Reference SHA256 instead of MD5 in documentation about SSH to reflect…
Browse files Browse the repository at this point in the history
… new UI (github#15857)
  • Loading branch information
mattpollard authored Oct 2, 2020
1 parent abb0abe commit fb0dc61
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 17 deletions.
Binary file modified assets/images/help/enterprises/your-enterprises.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/settings/settings-sidebar-ssh-keys.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/settings/settings-ssh-key-review.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/settings/ssh-sso-authorize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/settings/ssh-sso-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/help/settings/userbar-account-settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion content/developers/overview/using-ssh-agent-forwarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Sometimes, system configurations disallow SSH agent forwarding. You can check if
```shell
$ ssh -v <em>example.com</em>
# Connect to example.com with verbose debug output
> OpenSSH_5.6p1, OpenSSL 0.9.8r 8 Feb 2011</span>
> OpenSSH_8.1p1, LibreSSL 2.7.3</span>
> debug1: Reading configuration data /Users/<em>you</em>/.ssh/config
> debug1: Applying options for example.com
> debug1: Reading configuration data /etc/ssh_config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/<em>you</em>/.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 %}.
Expand All @@ -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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
# start the ssh-agent in the background
$ eval "$(ssh-agent -s)"
Expand All @@ -68,6 +68,14 @@ $ ssh -T git@{% data variables.command_line.codeblock %}
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>you</em>/.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 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
{% endmac %}
Expand All @@ -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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>you</em>/.ssh/id_rsa (RSA)
Expand All @@ -89,13 +97,18 @@ $ ssh -T git@{% data variables.command_line.codeblock %}
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>you</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
# start the ssh-agent in the background
$ eval "$(ssh-agent -s)"
Expand All @@ -112,6 +125,12 @@ $ ssh -T git@{% data variables.command_line.codeblock %}
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>you</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
{% endlinux %}
Expand Down Expand Up @@ -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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
Expand All @@ -178,6 +197,11 @@ You must provide your public key to {% data variables.product.product_name %} to
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.ssh %}
Expand All @@ -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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
Expand All @@ -205,6 +229,11 @@ You must provide your public key to {% data variables.product.product_name %} to
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
{% data reusables.user_settings.access_settings %}
{% data reusables.user_settings.ssh %}
Expand Down
27 changes: 21 additions & 6 deletions content/github/authenticating-to-github/reviewing-your-ssh-keys.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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 %}

4. Open Terminal.

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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
Expand All @@ -40,6 +40,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer.
Expand All @@ -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 %}
Expand All @@ -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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
Expand All @@ -75,6 +80,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer.
Expand All @@ -89,15 +99,15 @@ 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 %}
4. Open Terminal.
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 "[email protected]" %}If you're using OpenSSH 6.7 or older:
```shell
$ ssh-add -l
> 2048 <em>a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
Expand All @@ -108,6 +118,11 @@ You can delete unauthorized (or possibly compromised) SSH keys to ensure that an
$ ssh-add -l -E md5
> 2048 <em>MD5:a0:dd:42:3c:5a:9d:e4:2a:21:52:4e:78:07:6e:c8:4d</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```
{% else %}
```shell
$ ssh-add -l -E sha256
> 2048 <em>SHA256:274ffWxgaxq/tSINAykStUL7XWyRNcRTlcST1Ei7gBQ</em> /Users/<em>USERNAME</em>/.ssh/id_rsa (RSA)
```{% endif %}
7. The SSH keys on {% data variables.product.product_name %} *should* match the same keys on your computer.
Expand Down

0 comments on commit fb0dc61

Please sign in to comment.