diff --git a/book/source/04-certificates.md b/book/source/04-certificates.md index f8c6c5e..eb3ae14 100644 --- a/book/source/04-certificates.md +++ b/book/source/04-certificates.md @@ -48,7 +48,7 @@ An OpenPGP certificate (or "OpenPGP key") is a collection of an arbitrary number This documentation collectively refers to component keys and identity components as "the components of a certificate." -```{figure} diag/OpenPGP_Certificate.png +```{figure} diag/Components_of_an_OpenPGP_Certificate.svg :name: fig-openpgp-certificate :alt: Depicts a box with white background and the title "OpenPGP certificate". In the box several other boxes and accompanying texts, representing component keys and User IDs, are shown. There are three component keys boxes with a green frame, each with a dotted lower-left section, that shows the text "key creation time" and the green public key symbol in the lower right area. All three have a title, a unique fingerprint below the box and a unique capability keyword, perpendicular to the box on the right side. The top-most component key box has a light-green background, with the title "Component Key (primary)" and capability keyword "certification". The second-to-top component key box has a white background, with the title "Component Key" and capability keyword "encryption". The lowest component key box has a white background, with the title "Component Key" and capability keyword "signing". There are two User ID boxes, each with a black frame, open to top left and lower right corner. Both boxes have a user icon on the top left side, the title "User ID" on the top right side and a User ID string at the bottom. The top box has "Alice Adams " and the lower box has "Alice" as User ID string. @@ -120,7 +120,7 @@ Modern OpenPGP certificates typically include several subkeys in addition to the While subkeys have the same structural attributes as the primary key, they fulfill different roles. Subkeys are cryptographically linked with the primary key, a relationship further discussed in {numref}`binding_subkeys`. -```{figure} diag/Subkeys.png +```{figure} diag/Binding_Subkeys.png :name: fig-subkeys :alt: Diagram depicting three component keys. The primary key is positioned at the top, designated for certification. Below it, connected by arrows, are two subkeys labeled as "for encryption" and "for signing," respectively. @@ -136,7 +136,7 @@ Identity components in an OpenPGP certificate are used by the certificate holder OpenPGP certificates can contain multiple [User IDs](https://www.ietf.org/archive/id/draft-ietf-openpgp-crypto-refresh-10.html#name-user-id-packet-tag-13). Each User ID associates the certificate with an identity. -```{figure} diag/user_ids.png +```{figure} diag/Binding_a_UserID.png :name: fig-user-ids :alt: Depicts a diagram with white background and the title "User IDs". Inside, a public primary component key for certification and a User ID is shown. A green arrow points from component key to User ID and is annotated with a signature. diff --git a/book/source/diag/Binding_Subkeys.png b/book/source/diag/Binding_Subkeys.png new file mode 100644 index 0000000..a798631 Binary files /dev/null and b/book/source/diag/Binding_Subkeys.png differ diff --git a/book/source/diag/Binding_a_UserID.png b/book/source/diag/Binding_a_UserID.png new file mode 100644 index 0000000..2e9b815 Binary files /dev/null and b/book/source/diag/Binding_a_UserID.png differ diff --git a/book/source/diag/Components_of_an_OpenPGP_Certificate.png b/book/source/diag/Components_of_an_OpenPGP_Certificate.png new file mode 100644 index 0000000..02e6af5 Binary files /dev/null and b/book/source/diag/Components_of_an_OpenPGP_Certificate.png differ diff --git a/book/source/diag/Components_of_an_OpenPGP_Certificate.svg b/book/source/diag/Components_of_an_OpenPGP_Certificate.svg new file mode 100644 index 0000000..3bc7d20 --- /dev/null +++ b/book/source/diag/Components_of_an_OpenPGP_Certificate.svg @@ -0,0 +1,380 @@ + + diff --git a/book/source/diag/OpenPGP_Certificate.png b/book/source/diag/OpenPGP_Certificate.png index 94fa47a..4b9f63d 100644 Binary files a/book/source/diag/OpenPGP_Certificate.png and b/book/source/diag/OpenPGP_Certificate.png differ diff --git a/book/source/diag/OpenPGP_Certificate.svg b/book/source/diag/OpenPGP_Certificate.svg deleted file mode 100644 index af0bd64..0000000 --- a/book/source/diag/OpenPGP_Certificate.svg +++ /dev/null @@ -1,594 +0,0 @@ - -OpenPGP CertificateComponent KeyD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC99signing- key creation timeComponent KeyencryptionC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94- key creation timeComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation time diff --git a/book/source/diag/Primary_key_metadata.png b/book/source/diag/Primary_key_metadata.png new file mode 100644 index 0000000..dae4409 Binary files /dev/null and b/book/source/diag/Primary_key_metadata.png differ diff --git a/book/source/diag/Subkeys.png b/book/source/diag/Subkeys.png deleted file mode 100644 index da95d2d..0000000 Binary files a/book/source/diag/Subkeys.png and /dev/null differ diff --git a/book/source/diag/Subkeys.svg b/book/source/diag/Subkeys.svg deleted file mode 100644 index cf318ce..0000000 --- a/book/source/diag/Subkeys.svg +++ /dev/null @@ -1,561 +0,0 @@ - -Subkeys- key creation timeComponent Key AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certificationComponent Key- key creation timeD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC99- key creation timeComponent KeyC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94authentisigningComponent Key- key creation timeD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC99signing- key creation timeComponent KeyC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94encryptionOpenPGP subkeysOpenPGP primary key diff --git a/book/source/diag/symmetric_key.png b/book/source/diag/symmetric_key.png index 42dc447..b8138f9 100644 Binary files a/book/source/diag/symmetric_key.png and b/book/source/diag/symmetric_key.png differ diff --git a/book/source/diag/symmetric_key.svg b/book/source/diag/symmetric_key.svg deleted file mode 100644 index 8d556c9..0000000 --- a/book/source/diag/symmetric_key.svg +++ /dev/null @@ -1,194 +0,0 @@ - -Symmetric key diff --git a/book/source/diag/user_ids.png b/book/source/diag/user_ids.png deleted file mode 100644 index 1acf91b..0000000 Binary files a/book/source/diag/user_ids.png and /dev/null differ diff --git a/book/source/diag/user_ids.svg b/book/source/diag/user_ids.svg deleted file mode 100644 index 8845160..0000000 --- a/book/source/diag/user_ids.svg +++ /dev/null @@ -1,499 +0,0 @@ - -C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94FingerprintPrimary key creates a "subkey binding signature" to bind the subkey to the primary key- key creation timeComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certificationUser IDs