Skip to content

Better and more consistent hyphenation#225

Merged
athoelke merged 10 commits into
ARM-software:mainfrom
athoelke:crypto-grammar
Nov 20, 2024
Merged

Better and more consistent hyphenation#225
athoelke merged 10 commits into
ARM-software:mainfrom
athoelke:crypto-grammar

Conversation

@athoelke
Copy link
Copy Markdown
Contributor

@athoelke athoelke commented Nov 1, 2024

Some grammar fixes for hyphenation inconsistencies.

  • "pseudo-random" -> "pseudorandom"
  • Hyphenate "key-generation", "key-derivation", or "key-agreement" when they are used as a noun modifier (i.e. key-derivation algorithm), but not when they are the noun itself.

@athoelke athoelke added Crypto API Issue or PR related to the Cryptography API writing/style Textual or rendering issue labels Nov 1, 2024
@athoelke athoelke added this to the Crypto API 1.3 milestone Nov 1, 2024
@athoelke athoelke self-assigned this Nov 1, 2024
Copy link
Copy Markdown
Contributor

@gilles-peskine-arm gilles-peskine-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks broadly ok to me. There are still a few inaccuracies but it's cosmetic.

* `psa_key_derivation_output_key()` and `psa_key_derivation_output_key_custom()` create a key from data generated by a pseudorandom derivation process. See :secref:`kdf`.
* `psa_key_agreement()` creates a key from the shared secret result of a key agreement process. See :secref:`key-agreement`.
* `psa_key_agreement()` creates a key from the shared secret result of a key-agreement process. See :secref:`key-agreement`.
* `psa_pake_get_shared_key()` creates a key from the shared secret result of a password-authenticated key exchange. See :secref:`pake`.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git grep -Eon 'key (agreement|derivation|generation) \w+' doc reports one “key derivation interface”.

Comment thread doc/crypto/api/ops/pake.rst Outdated
:numref:`fig-spake2p-reg` illustrates some example SPAKE2+ key derivation flows.
:numref:`fig-spake2p-reg` illustrates some example SPAKE2+ key-derivation flows.

The resulting SPAKE2+ key-pair must be protected at least as well as the password.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conversely this should be “key pair”. From git grep -Eon 'key-\w+ \w+' doc (I haven't combed the “key-foo and/or/with”).

We also seem to be inconsistent about keystore vs key-store.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will review key-pair/key pair, public-key/public key and key-store/keystore. For the latter I am inclined to go with "keystore".

@athoelke
Copy link
Copy Markdown
Contributor Author

athoelke commented Nov 4, 2024

Rebased to catch up with other merges. Tackled a few other noun expressions:

  • public key
  • private key
  • key pair
  • keystore

@athoelke athoelke merged commit 8b4025c into ARM-software:main Nov 20, 2024
@athoelke athoelke deleted the crypto-grammar branch November 20, 2024 16:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Crypto API Issue or PR related to the Cryptography API writing/style Textual or rendering issue

Projects

Development

Successfully merging this pull request may close these issues.

2 participants