derivepassphrase.git

@@ -345,17 +345,17 @@ specifically marked as such.)

 ### Added  {#added-in-v0.5}

   - For the [`Vault`][derivepassphrase.vault.Vault] API, support reporting

-    on whether two master passphrases are interchangable with respect to the

-    service passphrases they can derive.

+    on whether two master passphrases are interchangeable with respect to

+    the service passphrases they can derive.

     This is an artefact of how the master passphrase is converted to the

     random bit sequence with which the service passphrases are generated.

-    See the corresponding [FAQ entry: What are "interchangable passphrases"

-    in vault?][INTERCHANGABLE_PASSPHRASES] for details, including the

+    See the corresponding [FAQ entry: What are "interchangeable passphrases"

+    in vault?][INTERCHEANGABLE_PASSPHRASES] for details, including the

     practical security (non-)implications.

     The [`derivepassphrase vault`][CLI_VAULT] command-line interface does

     not address this in any manner, mostly because the "non-standard"

-    interchangable variants of a given master password tend to be ugly to

+    interchangeable variants of a given master password tend to be ugly to

     type in, and because they do not have practical security implications.

   - For the [`Vault`][derivepassphrase.vault.Vault] API, accept arbitrary

@@ -876,7 +876,7 @@ specifically marked as such.)

 [CLI_EXPORT]: reference/derivepassphrase-export.1.md

 [CLI_EXPORT_VAULT]: reference/derivepassphrase-export-vault.1.md

 [CLI_VAULT]: reference/derivepassphrase-vault.1.md

-[INTERCHANGABLE_PASSPHRASES]: explanation/faq-vault-interchangable-passphrases.md

+[INTERCHANGEABLE_PASSPHRASES]: explanation/faq-vault-interchangeable-passphrases.md

 [REFERENCE]: reference/index.md

 [BUG_ALLOW_ALL_UNICODE_PASSPHRASES]: wishlist/allow-all-unicode-passphrases.md "Bug entry: “Allow all Unicode text strings as master passphrases”"

@@ -1,10 +1,10 @@

 ---

-title: What are "interchangable passphrases" in `vault`, and what does that mean in practice?

+title: What are "interchangeable passphrases" in `vault`, and what does that mean in practice?

 ---

-# What are "interchangable passphrases" in `vault`, and what does that mean in practice?

+# What are "interchangeable passphrases" in `vault`, and what does that mean in practice?

-## What are "interchangable passphrases"?

+## What are "interchangeable passphrases"?

 The "vault" derivation scheme internally uses PBKDF2-HMAC-SHA1[^1] to turn

 the master passphrase[^2] into a pseudo-random bit sequence, which then

@@ -15,7 +15,7 @@ key is thus subject to the HMAC key mapping procedure.

 Because the mapping of infinitely many arbitrarily sized keys to 64-byte

 sized keys cannot be one-to-one, there exist pairs of keys that behave

 identically when passed into (PBKDF2-)HMAC-SHA1, i.e., the keys (master

-passphrases) are "interchangable" from the vault scheme's perspective.

+passphrases) are "interchangeable" from the vault scheme's perspective.

 Fundamentally, this is an issue of *encoding*: the master passphrase is

 interpreted as an encoding of the HMAC-SHA1 key, and this encoding is not

@@ -117,15 +117,15 @@ SHA1) is secure against preimage attacks:

 ## What effect does the HMAC key mapping procedure have on `derivepassphrase`?

-`derivepassphrase vault` does not check for interchangable passphrases, and

+`derivepassphrase vault` does not check for interchangeable passphrases, and

 will happily accept any (non-empty) passphrase it is given.

 The [`derivepassphrase.vault.Vault`][] class does not check for

-interchangable passphrases either, and will happily accept any passphrase it

+interchangeable passphrases either, and will happily accept any passphrase it

 is given, even empty ones.

-Most interchangable variations of a master passphrase contain binary

+Most interchangeable variations of a master passphrase contain binary

 characters such as NUL, or even arbitrary byte sequences, which may be hard

 to type in or impossible to express in certain storage formats.  As such, it

 is unlikely---but otherwise supported---that the user would want to enter

-or store a different, interchangable version of their master passphrase in

+or store a different, interchangeable version of their master passphrase in

 the first place.

@@ -4,13 +4,13 @@ title: Explanation overview

 * [How to comply with the "altered versions" clause of the

   license][FAQ_ALTERED_VERSIONS]

-* [What are "interchangable passphrases" in `vault`, and what does that mean

-  in practice?][FAQ_INTERCHANGABLE_PASSPHRASES]

+* [What are "interchangeable passphrases" in `vault`, and what does that mean

+  in practice?][FAQ_INTERCHANGEABLE_PASSPHRASES]

 * [Tradeoffs between a master passphrase and a master SSH

   key][TRADEOFFS_PASSPHRASE_SSH_KEY]

 * [Should I use one master SSH key/master passphrase, or many?][MANY_MASTER_SECRETS]

 [FAQ_ALTERED_VERSIONS]: faq-altered-versions.md

-[FAQ_INTERCHANGABLE_PASSPHRASES]: faq-vault-interchangable-passphrases.md

+[FAQ_INTERCHANGEABLE_PASSPHRASES]: faq-vault-interchangeable-passphrases.md

 [TRADEOFFS_PASSPHRASE_SSH_KEY]: tradeoffs-passphrase-ssh-key.md

 [MANY_MASTER_SECRETS]: many-master-secrets.md

@@ -602,13 +602,13 @@ class Vault:

         return bytes(base64.standard_b64encode(signature_blob))

     @classmethod

-    def phrases_are_interchangable(

+    def phrases_are_interchangeable(

         cls,

         phrase1: Buffer,

         phrase2: Buffer,

         /,

     ) -> bool:

-        """Return true if the passphrases are interchangable to Vault.

+        """Return true if the passphrases are interchangeable to Vault.

         Vault internally passes the passphrase as the key to HMAC-SHA1.

         HMAC requires keys to have a certain fixed length, and therefore

@@ -659,7 +659,7 @@ class Vault:

         This is the actual HMAC key this passphrase would be transformed

         into when used within Vault.

-        See [`phrases_are_interchangable`][] for further explanations

+        See [`phrases_are_interchangeable`][] for further explanations

         and warnings about timing attack resistance.

         Args: