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_Subkeys.svg b/book/source/diag/Binding_Subkeys.svg
new file mode 100644
index 0000000..a874757
--- /dev/null
+++ b/book/source/diag/Binding_Subkeys.svg
@@ -0,0 +1,779 @@
+
+
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/user_ids.svg b/book/source/diag/Binding_a_UserID.svg
similarity index 91%
rename from book/source/diag/user_ids.svg
rename to book/source/diag/Binding_a_UserID.svg
index b1ba910..f882e6b 100644
--- a/book/source/diag/user_ids.svg
+++ b/book/source/diag/Binding_a_UserID.svg
@@ -44,23 +44,7 @@
apply_no_radius="true"
apply_with_radius="true"
only_selected="false"
- hide_knots="false" />User IDsBinding a User ID
+ sodipodi:nodetypes="csc" />
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
index af0bd64..02dde5f 100644
--- a/book/source/diag/OpenPGP_Certificate.svg
+++ b/book/source/diag/OpenPGP_Certificate.svg
@@ -1,15 +1,16 @@
OpenPGP CertificateOpenPGP CertificateComponent Keysigning- key creation timeComponent KeyencryptionC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94- key creation timeDr. Alice Adams<adam@work.example>- key creation timeComponent Key (primary)Component Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation time
+ id="tspan13">AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification
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/Primary_key_metadata.svg b/book/source/diag/Primary_key_metadata.svg
new file mode 100644
index 0000000..cb4ba78
--- /dev/null
+++ b/book/source/diag/Primary_key_metadata.svg
@@ -0,0 +1,433 @@
+
+
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 @@
-
-
diff --git a/book/source/diag/diag_library_draft.svg b/book/source/diag/diag_library_draft.svg
index 98a5202..3736371 100644
--- a/book/source/diag/diag_library_draft.svg
+++ b/book/source/diag/diag_library_draft.svg
@@ -1424,8 +1424,8 @@
refY="0"
orient="auto-start-reverse"
inkscape:stockid="Triangle arrow"
- markerWidth="1"
- markerHeight="1"
+ markerWidth="0.001"
+ markerHeight="7.001"
viewBox="0 0 1 1"
inkscape:isstock="true"
inkscape:collect="always"
@@ -1651,7 +1651,7 @@
id="path-effect53"
is_visible="true"
lpeversion="1"
- nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+ nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
radius="0"
unit="px"
method="auto"
@@ -3633,8 +3633,7 @@
height="412.66037"
x="-734.22205"
y="-978.89728"
- transform="scale(1,-1)"
- d="M -734.22205,-978.89728 H 1741.3385 v 412.66037 H -734.22205 Z" />AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Certificate packet listCertificate packet listCertifying self-signature for User IDCertifying self-signature for User IDSecret-Key packetSecret-Key packet10101011010101Public Key Material1010101Public-Key packetPublic-Key packetPublic Key Material1010101Signature packet
Signature packet
Direct Key Signature (type ID 0x1F) Direct Key Signature (type ID 0x1F) by the primary key over primary key, by the primary key over primary key, subkey and signature metadata subkey and signature metadata 10101011010101Subkey binding signatureSubkey binding signatureC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94Primary key creates a Primary key creates a subkey subkey binding signaturebinding signature to bind the to bind the subkey to the primary keysubkey to the primary keyAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Subkey binding Subkey binding signaturesignature- signature creation time- signature creation time- key expiration time- key expiration time- key flags- key flags- issuer fingerprint- issuer fingerprintPrimary keyPrimary keySubkeySubkeySignature metadata:Signature metadata:Subkey binding signature for Subkey binding signature for signing subkeyssigning subkeysPrimary key creates a Primary key creates a subkey subkey binding signaturebinding signature to bind the to bind the subkey to the primary keysubkey to the primary keyAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Subkey binding Subkey binding signaturesignature- signature creation time- signature creation time- key expiration time- key expiration time- key flags- key flags- issuer fingerprint- issuer fingerprintPrimary keyPrimary keySubkeySubkeySignature metadata:Signature metadata:- signature creation time- signature creation time- issuer fingerprint- issuer fingerprintPrimary keyPrimary keySigning SubkeySigning Subkey- Embedded signature:
- Embedded signature:
Primary key binding Primary key bindingSigning key creates a Signing key creates a primaryprimary binding signaturebinding signature to associate to associate the primary keythe primary key to the subkey to the subkeyD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC995494 9A41 222E A738 576E D19C AEA3 DC99User ID binding signatureUser ID binding signatureAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Primary key creates a Primary key creates a User ID User ID binding signaturebinding signature to associate to associate the User ID with the primary keythe User ID with the primary keyUser ID binding User ID binding signaturesignature- signature creation time- signature creation time- key expiration time- key expiration time- primary User ID flag- primary User ID flag- algorithm preferences- algorithm preferences- key expiration time
- key expiration time
(primary key) (primary key)- key flags (primary key)- key flags (primary key)Primary keyPrimary keyUser IDUser IDSignature metadata:Signature metadata:Signature typeSignature typeSignature over:Signature dataSignature dataSignature metadataSignature metadataOpenPGP OpenPGP signature signature packetpacket- signature type- signature type- signature over input data- signature over input data- additional metadata- additional metadata- cryptographic signature- cryptographic signatureMeanings of Meanings of signature in signature in OpenPGPOpenPGPSignature creationCreating a signatureAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3A cryptographic signature is calculated A cryptographic signature is calculated over the hash digest, using the private over the hash digest, using the private key material of the signer.key material of the signer.Signing Signing mechanismmechanismhash digesthash digestA hash digest is calculated from the A hash digest is calculated from the input data packets and the signature input data packets and the signature metadata.metadata.Signature typeSignature typeInput data packetsInput data packetsSignature metadataSignature metadata- ...- ...This cryptographic signature is then This cryptographic signature is then stored in the signature packet.stored in the signature packet.Input Data packetsHash mechanismHash mechanismSignature verificationVerifying a signatureAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3The cryptographic signature is The cryptographic signature is verified against the hash digest, verified against the hash digest, using the public key of the signer.using the public key of the signer.Signature Signature verificationverification mechanismmechanismhash digesthash digestA hash digest is calculated from the A hash digest is calculated from the input data packets and the signature input data packets and the signature metadata.metadata.Signature typeSignature typeInput data packetsInput data packetsSignature metadataSignature metadata- ...- ...Input Data packetsHash mechanismHash mechanismTransferable secret keyD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC995494 9A41 222E A738 576E D19C AEA3 DC99C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Dr. Alice Adams<adam@work.example>D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC995494 9A41 222E A738 576E D19C AEA3 DC99C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Dr. Alice Adams<adam@work.example>Converting a passphrase Converting a passphrase into a symmetric keyinto a symmetric key(string-to-key) (string-to-key) S2K mechanismS2K mechanismcorrect horse battery staplecorrect horse battery stapleOpenPGP CertificateComponents of an OpenPGP CertificateD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 D07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC995494 9A41 222E A738 576E D19C AEA3 DC99C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3Dr. Alice Adams<adam@work.example>Fingerprint of an OpenPGP
Fingerprint of an OpenPGP
component key component key - key creation timeC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D C0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94Subkeys- 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 CA94encryptionBinding SubkeysOpenPGP subkeysOpenPGP primary keyOpenPGP subkeysComponent 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 timeAAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B37F33 00F9 FB0E C457 378C D29F 1026 98B3User IDsBinding a User IDPrimary key metadata- key creation timeComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certificationDirect key signatureOpenPGP 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 timeDr. Alice Adams<adam@work.example>- key creation timeComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certificationPublic part of an Public part of an asymmetric keypairasymmetric keypairPublic 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
index 8d556c9..52b04de 100644
--- a/book/source/diag/symmetric_key.svg
+++ b/book/source/diag/symmetric_key.svg
@@ -1,41 +1,19 @@
+ transform="rotate(90,-588.51045,155.10639)" />
diff --git a/book/source/diag/types_of_signatures.png b/book/source/diag/types_of_signatures.png
deleted file mode 100644
index 8eef40d..0000000
Binary files a/book/source/diag/types_of_signatures.png and /dev/null differ
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