hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/Documentation/process/maintainer-pgp-guide.rst
....@@ -238,7 +238,10 @@
238238 work.
239239
240240 If for some reason you prefer to stay with RSA subkeys, just replace
241
- "ed25519" with "rsa2048" in the above command.
241
+ "ed25519" with "rsa2048" in the above command. Additionally, if you
242
+ plan to use a hardware device that does not support ED25519 ECC
243
+ keys, like Nitrokey Pro or a Yubikey, then you should use
244
+ "nistp256" instead or "ed25519."
242245
243246
244247 Back up your master key for disaster recovery
....@@ -432,23 +435,23 @@
432435
433436 Unless all your laptops and workstations have smartcard readers, the
434437 easiest is to get a specialized USB device that implements smartcard
435
-functionality. There are several options available:
438
+functionality. There are several options available:
436439
437440 - `Nitrokey Start`_: Open hardware and Free Software, based on FSI
438
- Japan's `Gnuk`_. Offers support for ECC keys, but fewest security
439
- features (such as resistance to tampering or some side-channel
440
- attacks).
441
-- `Nitrokey Pro`_: Similar to the Nitrokey Start, but more
442
- tamper-resistant and offers more security features, but no ECC
443
- support.
444
-- `Yubikey 4`_: proprietary hardware and software, but cheaper than
441
+ Japan's `Gnuk`_. One of the few available commercial devices that
442
+ support ED25519 ECC keys, but offer fewest security features (such as
443
+ resistance to tampering or some side-channel attacks).
444
+- `Nitrokey Pro 2`_: Similar to the Nitrokey Start, but more
445
+ tamper-resistant and offers more security features. Pro 2 supports ECC
446
+ cryptography (NISTP).
447
+- `Yubikey 5`_: proprietary hardware and software, but cheaper than
445448 Nitrokey Pro and comes available in the USB-C form that is more useful
446449 with newer laptops. Offers additional security features such as FIDO
447
- U2F, but no ECC.
450
+ U2F, among others, and now finally supports ECC keys (NISTP).
448451
449452 `LWN has a good review`_ of some of the above models, as well as several
450
-others. If you want to use ECC keys, your best bet among commercially
451
-available devices is the Nitrokey Start.
453
+others. Your choice will depend on cost, shipping availability in your
454
+geographical region, and open/proprietary hardware considerations.
452455
453456 .. note::
454457
....@@ -457,9 +460,9 @@
457460 Foundation.
458461
459462 .. _`Nitrokey Start`: https://shop.nitrokey.com/shop/product/nitrokey-start-6
460
-.. _`Nitrokey Pro`: https://shop.nitrokey.com/shop/product/nitrokey-pro-3
461
-.. _`Yubikey 4`: https://www.yubico.com/product/yubikey-4-series/
462
-.. _Gnuk: http://www.fsij.org/doc-gnuk/
463
+.. _`Nitrokey Pro 2`: https://shop.nitrokey.com/shop/product/nitrokey-pro-2-3
464
+.. _`Yubikey 5`: https://www.yubico.com/products/yubikey-5-overview/
465
+.. _Gnuk: https://www.fsij.org/doc-gnuk/
463466 .. _`LWN has a good review`: https://lwn.net/Articles/736231/
464467 .. _`qualify for a free Nitrokey Start`: https://www.kernel.org/nitrokey-digital-tokens-for-kernel-developers.html
465468
....@@ -943,7 +946,7 @@
943946
944947 Next, open the `PGP pathfinder`_. In the "From" field, paste the key
945948 fingerprint of Linus Torvalds from the output above. In the "To" field,
946
-paste they key-id you found via ``gpg --search`` of the unknown key, and
949
+paste the key-id you found via ``gpg --search`` of the unknown key, and
947950 check the results:
948951
949952 - `Finding paths to Linus`_