diff --git a/source/components/nethsm/ejbca.rst b/source/components/nethsm/ejbca.rst index ae1751bc39..4a6b713ec1 100644 --- a/source/components/nethsm/ejbca.rst +++ b/source/components/nethsm/ejbca.rst @@ -35,15 +35,15 @@ If you want to experiment with the given example you can use git to clone the `n 1. Configure a NetHSM, either a real one or a container. Refer to chapter `Getting Started `__ to learn more. 2. Change the libnethsm_pkcs11 configuration to match your NetHSM in ``container/ejbca/p11nethsm.conf``. 3. Build the container. - - .. code-block:: shell-session - - docker build -f container/ejbca/Dockerfile . -t pkcs-ejbca + + .. code-block:: shell-session + + docker build -f container/ejbca/Dockerfile . -t pkcs-ejbca 4. Run the container. - .. code-block:: shell-session - - docker run --rm -it -p 9443:8443 -p 9080:8080 -h mycahostname -e TLS_SETUP_ENABLED="simple" pkcs-ejbca + .. code-block:: shell-session + + docker run --rm -it -p 9443:8443 -p 9080:8080 -h mycahostname -e TLS_SETUP_ENABLED="simple" pkcs-ejbca The container will be available at `https://localhost:9443/ `__. diff --git a/source/components/nitrokeys/features/piv/guides/local_user_logon_on_macos.rst b/source/components/nitrokeys/features/piv/guides/local_user_logon_on_macos.rst index 79204ee148..18a86c9b96 100644 --- a/source/components/nitrokeys/features/piv/guides/local_user_logon_on_macos.rst +++ b/source/components/nitrokeys/features/piv/guides/local_user_logon_on_macos.rst @@ -25,33 +25,33 @@ It is easier to use ``nitropy nk3 piv`` commands when PIN, PUK and management ke .. code-block:: bash - nitropy nk3 piv --experimental generate-key --key 9a --algo nistp256 --subject-name "CN=Foo Bar" --subject-alt-name-upn "foo@bar.com" + nitropy nk3 piv --experimental generate-key --key 9a --algo nistp256 --subject-name "CN=Foo Bar" --subject-alt-name-upn "foo@bar.com" 2. Generate a key and a certificate in PIV slot 9d: .. code-block:: bash - nitropy nk3 piv --experimental generate-key --key 9d --algo nistp256 --subject-name "CN=Foo Bar" --subject-alt-name-upn "foo@bar.com" + nitropy nk3 piv --experimental generate-key --key 9d --algo nistp256 --subject-name "CN=Foo Bar" --subject-alt-name-upn "foo@bar.com" 3. Verify that the Nitrokey now has certificates in slots 9a and 9d: .. code-block:: bash - nitropy nk3 piv --experimental list-certificates + nitropy nk3 piv --experimental list-certificates 4. Verify that the Nitrokey is recognized by the system and that identities are found: .. code-block:: bash - sc_auth identities + sc_auth identities -This should print something like this: + This should print something like this: -:: + :: - SmartCard: com.apple.pivtoken: - Unpaired identities: - someId - Zertifikat zur PIV-Authentifizierung () + SmartCard: com.apple.pivtoken: + Unpaired identities: + someId - Zertifikat zur PIV-Authentifizierung () 5. Now unplug the Nitrokey and plug it in again. The operating system should recognize the Nitrokey as a PIV smartcard and suggest to pair with the user that is currently logged in. 6. Confirm, you may need to enter the PIV PIN for some initial signing and you may also need to enter you password to allow the PIV certificate to be imported into MacOS keychain. @@ -59,12 +59,12 @@ This should print something like this: .. code-block:: bash - sc_auth list + sc_auth list -This should print something like this: + This should print something like this: -:: + :: - Hash: someId + Hash: someId 8. Done. You should now be able to log into your Mac with your Nitrokey by using the PIV PIN. diff --git a/source/components/nitrokeys/nitrokey3/faq.rst b/source/components/nitrokeys/nitrokey3/faq.rst index bf98a12faa..b0c1fc49cb 100644 --- a/source/components/nitrokeys/nitrokey3/faq.rst +++ b/source/components/nitrokeys/nitrokey3/faq.rst @@ -41,7 +41,7 @@ Nitrokey 3 FAQ With the OpenPGP Card feature you can store three key pairs. All keys use the same identity but are used for different purposes: authentication, encryption and signing. - For FIDO2 it can store up to 10 passkeys also known as discoverable credentials and an unlimited number of non-discoverable credentials. + For FIDO2 depending on the other features usage, it can store up to 100 passkeys for the Nitrokey 3A Mini and up to 35 passkeys for the Nitrokey 3 NFC, also known as discoverable credentials and an unlimited number of non-discoverable credentials. The PIV feature can store up to 24 key pairs. .. faq:: How many password can my Nitrokey 3 store? diff --git a/source/components/software/nk-app2/passwords.rst b/source/components/software/nk-app2/passwords.rst index dc4febfe71..0fa2e71415 100644 --- a/source/components/software/nk-app2/passwords.rst +++ b/source/components/software/nk-app2/passwords.rst @@ -13,7 +13,7 @@ Password entries may consist of: All fields are optional and can be edited and added at any time using the "Edit" button. - You can store up to 100 passwords. + You can store up to 50 passwords. .. figure:: ./images/credential-example.png