Merge pull request #425 from drduh/wip-16mar24

Simplify instructions, reduce manual labor

contrib/gen-params-ed25519

@@ -1,32 +0,0 @@
-# Requires GnuPG v2.1.7 or newer
-
-%echo Generating a OpenPGP key
-
-# uncomment the following line to remove asking for a passphrase
-#%no-protection
-
-Key-Type: eddsa
-Key-Curve: Ed25519
-# Key generated is a master key ("certificate")
-Key-Usage: cert
-
-# Parameters to generate a subkey
-# Subkey-Type: ecdh
-# Subkey-Curve: Curve25519
-
-# Choose one of following options
-# Subkey-Usage: sign
-# Subkey-Usage: auth
-# Subkey-Usage: encrypt
-
-# select a name and email address - neither has to be valid nor existing
-Name-Real: YubiKey User
-Name-Email: yubikey@example
-
-# Do not set the key to expire
-Expire-Date: 0
-
-# Do a commit here, so that we can later print "done" :-)
-%commit
-
-%echo done

contrib/gen-params-rsa4096

@@ -1,29 +0,0 @@
-%echo Generating a OpenPGP key
-
-# uncomment the following line to remove asking for a passphrase
-#%no-protection
-
-Key-Type: RSA
-Key-Length: 4096
-# Key generated is a master key ("certificate")
-Key-Usage: cert
-
-# Parameters to generate a subkey
-# Subkey-Type: ELG-E
-# Subkey-Length: 4096
-# Choose one of following options
-# Subkey-Usage: encrypt
-# Subkey-Usage: sign
-# Subkey-Usage: auth
-
-# select a name and email address - neither has to be valid nor existing
-Name-Real: YubiKey User
-Name-Email: yubikey@example
-
-# Do not set the key to expire
-Expire-Date: 0
-
-# Do a commit here, so that we can later print "done" :-)
-%commit
-
-%echo done

flake.nix

@@ -40,7 +40,7 @@
                 name = "yubikey-guide";
                 icon = "${pkgs.yubikey-manager-qt}/share/ykman-gui/icons/ykman.png";
                 desktopName = "drduh's YubiKey Guide";
-                genericName = "Guide to using YubiKey for GPG and SSH";
+                genericName = "Guide to using YubiKey for GnuPG and SSH";
                 comment = "Open the guide in a reader program";
                 categories = ["Documentation"];
                 exec = "${viewYubikeyGuide}/bin/view-yubikey-guide";
@@ -167,7 +167,7 @@
               };
 
               # Unset history so it's never stored Set GNUPGHOME to an
-              # ephemeral location and configure GPG with the guide's
+              # ephemeral location and configure GPG with the guide
 
               environment.interactiveShellInit = ''
                 unset HISTFILE

reset-yubikey

@@ -0,0 +1,14 @@
+/hex
+scd serialno
+scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 81 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40
+scd apdu 00 20 00 83 08 40 40 40 40 40 40 40 40
+scd apdu 00 e6 00 00
+scd apdu 00 44 00 00
+/echo Card has been successfully reset.
+/bye