From 77394c2773716144d4948c3043ad7181cd104e91 Mon Sep 17 00:00:00 2001 From: Wheest Date: Sat, 25 Jul 2020 17:25:45 +0100 Subject: [PATCH 1/2] Added clearer recovery options --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 124e4ec..63f8c33 100644 --- a/README.md +++ b/README.md @@ -2634,7 +2634,7 @@ To enable GnuPG support, one can just use the config file `gpg.rc` provided by m If PIN attempts are exceeded, the card is locked and must be [reset](https://developers.yubico.com/ykneo-openpgp/ResetApplet.html) and set up again using the encrypted backup. -Copy the following script to a file and run `gpg-connect-agent --run $file` to lock and terminate the card. Then re-insert YubiKey to reset. +Copy the following script to a file and run `gpg-connect-agent -r $file` to lock and terminate the card. Then re-insert YubiKey to reset. ```console /hex @@ -2664,6 +2664,13 @@ Reset code: NOT SET Admin PIN: 12345678 ``` + +# Recovery after reset + +If for whatever reason you need to reinstate your YubiKey from your master key backup (such as the one stored on an encrypted USB described in [Backup keys](#backup-keys)), follow the following steps in [Rotating keys](#rotating-keys) to setup your environment, and then follow the steps of again [Configure Smartcard](#configure-smartcard). + +Before you unmount your backup, ask yourself if you should make another one just in case. + # Notes 1. YubiKey has two configurations: one invoked with a short press, and the other with a long press. By default, the short-press mode is configured for HID OTP - a brief touch will emit an OTP string starting with `cccccccc`. If you rarely use the OTP mode, you can swap it to the second configuration via the YubiKey Personalization tool. If you *never* use OTP, you can disable it entirely using the [YubiKey Manager](https://developers.yubico.com/yubikey-manager) application (note, this not the similarly named older YubiKey NEO Manager). From 248e207527c3585b7fb1e28340c8f0384530f0dc Mon Sep 17 00:00:00 2001 From: Derek Gaffney <17263955+gaffneyd4@users.noreply.github.com> Date: Sun, 10 Oct 2021 08:52:12 -0400 Subject: [PATCH 2/2] Add TOC entry, fix link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63f8c33..71d73eb 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ If you have a comment or suggestion, please open an [Issue](https://github.com/d * [Mailvelope on macOS](#mailvelope-on-macos) * [Mutt](#mutt) - [Reset](#reset) +- [Recovery after reset](#recovery-after-reset) - [Notes](#notes) - [Troubleshooting](#troubleshooting) - [Alternatives](#alternatives) @@ -2664,10 +2665,9 @@ Reset code: NOT SET Admin PIN: 12345678 ``` - # Recovery after reset -If for whatever reason you need to reinstate your YubiKey from your master key backup (such as the one stored on an encrypted USB described in [Backup keys](#backup-keys)), follow the following steps in [Rotating keys](#rotating-keys) to setup your environment, and then follow the steps of again [Configure Smartcard](#configure-smartcard). +If for whatever reason you need to reinstate your YubiKey from your master key backup (such as the one stored on an encrypted USB described in [Backup](#backup)), follow the following steps in [Rotating keys](#rotating-keys) to setup your environment, and then follow the steps of again [Configure Smartcard](#configure-smartcard). Before you unmount your backup, ask yourself if you should make another one just in case.