Merge PR #583.

README.adoc

@@ -115,7 +115,7 @@ Yubico also provides packages for Ubuntu in the yubico/stable PPA:
   $ sudo apt install yubikey-manager
 
 ==== FreeBSD
-Althought not being officially supported on this platform, YubiKey Manager can be
+Although not being officially supported on this platform, YubiKey Manager can be
 installed on FreeBSD. It's available via its ports tree or as pre-built package.
 Should you opt to install and use YubiKey Manager on this platform, please be aware
 that it's **NOT** maintained by Yubico.

doc/Development.adoc

@@ -18,7 +18,7 @@ Make sure the http://www.swig.org/[swig] executable is in your PATH.
 
     $ sudo apt install swig libu2f-udev pcscd libpcsclite-dev
 
-==== Linux (RPM-based distributons)
+==== Linux (RPM-based distributions)
 
     # Tested on Fedora 34
     $ sudo dnf install pcsc-lite-devel python3-devel swig

doc/Scripting.adoc

@@ -32,7 +32,7 @@ These arguments are accessible in the standard Python way of using sys.argv:
 
 === Scripting utilities
 We include some functions which may be helpful for scripting purposes in
-`ykman/scripting.py`, such as connectiong to one or more YubiKeys to perform
+`ykman/scripting.py`, such as connecting to one or more YubiKeys to perform
 actions upon them. See "Writing your first script" below for some example
 usage.
 
@@ -88,7 +88,7 @@ Found a YubiKey: YubiKey 5 NFC (9681624)
 ....
 
 Now, let's pass an argument to our script. We'll modify the script to take a
-serial number, and check for the presense of that particular YubiKey. We'll use
+serial number, and check for the presence of that particular YubiKey. We'll use
 the `s.multi` function to keep waiting for more YubiKeys until either the
 correct one is found, or the user presses CTRL+C to stop the script. By setting
 `allow_initial=True` we allow there to be YubiKeys connected at the start of

examples/yubiotp_batch_nfc.py

@@ -19,7 +19,7 @@
 
 
 try:
-    # name of the NFC reader to use. Case-insentitive substring matching.
+    # name of the NFC reader to use. Case-insensitive substring matching.
     nfc_reader = sys.argv[1]  # e.g: "hid"
     # csv file out output to, given as an argument
     output_fname = sys.argv[2]  # e.g: "output.csv"

resources/macos/make_release.sh

@@ -51,7 +51,7 @@ STATUS=$(xcrun notarytool submit "$PKG" --apple-id $1 --team-id LQA3CS5MM7 --pas
 echo "Notarization status: ${STATUS}"
 
 if [[ "$STATUS" == *"Accepted"* ]]; then
-	echo "Notarization successfull. Staple the .pkg"
+	echo "Notarization successful. Staple the .pkg"
 	xcrun stapler staple -v "$PKG"
 
 	echo "# .pkg stapled. Everything should be ready for release!"

ykman/_cli/__main__.py

@@ -388,7 +388,7 @@ def main():
         elif isinstance(e, ValueError):
             msg = f"{e}"
         else:
-            msg = "An unexpected error has occured"
+            msg = "An unexpected error has occurred"
             formatter.show_trace = True
         logger.exception(msg)
         sys.exit(status)

ykman/_cli/apdu.py

@@ -106,7 +106,7 @@ def _print_response(resp: bytes, sw: int, no_pretty: bool) -> None:
 @click.option("-s", "--send-apdu", multiple=True, help="provide full APDUs")
 def apdu(ctx, no_pretty, app, apdu, send_apdu):
     """
-    Execute arbitary APDUs.
+    Execute arbitrary APDUs.
     Provide APDUs as a hex encoded, space-separated list using the following syntax:
     [CLA]INS[P1P2][:DATA][=EXPECTED_SW]
 

ykman/_cli/config.py

@@ -552,7 +552,7 @@ def mode(ctx, mode, touch_eject, autoeject_timeout, chalresp_timeout, force):
     """
     Manage connection modes (USB Interfaces).
 
-    This command is generaly used with YubiKeys prior to the 5 series.
+    This command is generally used with YubiKeys prior to the 5 series.
     Use "ykman config usb" for more granular control on YubiKey 5 and later.
 
     Get the current connection mode of the YubiKey, or set it to MODE.

ykman/util.py

@@ -141,7 +141,7 @@ def get_leaf_certificates(certs):
     """Extract the leaf certificates from a list of certificates.
 
     Leaf certificates are ones whose subject does not appear as
-    issuer among theothers.
+    issuer among the others.
 
     :param certs: The list of cryptography x509 certificate objects.
     """

yubikit/core/otp.py

@@ -176,7 +176,7 @@ def _receive(self):
         report = self.connection.receive()
         if len(report) != FEATURE_RPT_SIZE:
             raise Exception(
-                f"Incorrect reature report size (was {len(report)}, "
+                f"Incorrect feature report size (was {len(report)}, "
                 f"expected {FEATURE_RPT_SIZE})"
             )
         return report

yubikit/hsmauth.py

@@ -79,7 +79,7 @@
 INS_GET_MANAGEMENT_KEY_RETRIES = 0x09
 INS_GET_PUBLIC_KEY = 0x0A
 
-# Lengths for paramters
+# Lengths for parameters
 MANAGEMENT_KEY_LEN = 16
 CREDENTIAL_PASSWORD_LEN = 16
 MIN_LABEL_LEN = 1
@@ -411,7 +411,7 @@ def generate_credential_asymmetric(
         return self._put_credential(
             management_key,
             label,
-            b"",  # Emtpy byte will generate key
+            b"",  # Empty byte will generate key
             ALGORITHM.EC_P256_YUBICO_AUTHENTICATION,
             credential_password,
             touch_required,

yubikit/management.py

@@ -469,7 +469,7 @@ def write_device_config(
     ) -> None:
         """Write configuration settings for YubiKey.
 
-        :pararm config: The device configuration.
+        :param config: The device configuration.
         :param reboot: If True the YubiKey will reboot.
         :param cur_lock_code: Current lock code.
         :param new_lock_code: New lock code.

yubikit/openpgp.py

@@ -1652,7 +1652,7 @@ def delete_certificate(self, key_ref: KEY_REF) -> None:
     def attest_key(self, key_ref: KEY_REF) -> x509.Certificate:
         """Create an attestation certificate for a key.
 
-        The certificte is written to the certificate slot for the key, and its
+        The certificate is written to the certificate slot for the key, and its
         content is returned.
 
         Requires User PIN verification.

yubikit/yubiotp.py

@@ -129,7 +129,7 @@ class CFGFLAG(IntFlag):
     # Yubikey 2 and above
     SHORT_TICKET = 0x02  # Send truncated ticket (half length)
     STRONG_PW1 = 0x10  # Strong password policy flag #1 (mixed case)
-    STRONG_PW2 = 0x40  # Strong password policy flag #2 (subtitute 0..7 to digits)
+    STRONG_PW2 = 0x40  # Strong password policy flag #2 (substitute 0..7 to digits)
     MAN_UPDATE = 0x80  # Allow manual (local) update of static OTP
 
     # Yubikey 2.1 and above