diff --git a/Terminology.md b/Terminology.md index 950dbdd..780ca16 100644 --- a/Terminology.md +++ b/Terminology.md @@ -3,13 +3,13 @@ Since PGPainless is based on Bouncycastle, it follows some of the terminology in ## Keys, KeyRings, KeyRingCollections What is considered a KeyRing in GnuPG (a collection of keys) is called a KeyRingCollection in Bouncycastle/PGPainless. -Similarly a Key in GnuPG is called a KeyRing in BC/PGPainless. This is due to the fact, that an OpenPGP key can actually consist of more than one key (master - subkey structures). A Key in BC/PGPainless is either a master key or a sub key. +Similarly a Key in GnuPG is called a KeyRing in BC/PGPainless. This is due to the fact, that an OpenPGP key can actually consist of more than one key (primary - subkey structures). A Key in BC/PGPainless is either a primary key or a sub key. | PGPainless Term | GnuPG Term | Description | |-------------------|----------------|--------------------------------------------------------------------------| | KeyRingCollection | KeyRing/KeyBox | Collection of OpenPGP keys (either of a single user or of multiple users | -| KeyRing | Key | Master key which might have sub keys | -| Key | | Single key which might be a master key or a sub key | +| KeyRing | Key | Primary key which might have sub keys | +| Key | | Single key which might be a primary key or a sub key | ## Public, Secret, Private @@ -21,7 +21,7 @@ A PGPSecretKey names a private key which might be encrypted with a password. Fro | PGPPrivateKey | Decrypted OpenPGP private key | | PGPSecretKey | (Possibly) password protected OpenPGP private key | | PGPPublicKey | OpenPGP public key | -| PGPSecretKeyRing | (Possibly) password protected private master key with sub keys | -| PGPPublicKeyRing | OpenPGP public master key with public sub keys | +| PGPSecretKeyRing | (Possibly) password protected private primary key with sub keys | +| PGPPublicKeyRing | OpenPGP public primary key with public sub keys | | PGPSecretKeyRingCollection | Collection of PGPSecretKeyRings | | PGPPublicKeyRingCollection | Collection of PGPPublicKeyRings | \ No newline at end of file