diff --git a/book/source/diag/diag_library_draft.svg b/book/source/diag/diag_library_draft.svg
index fc09522..5b001a5 100644
--- a/book/source/diag/diag_library_draft.svg
+++ b/book/source/diag/diag_library_draft.svg
@@ -13,7 +13,12 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">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 98B3Secret-Key packetsecret key material101010110101011010101s2k_usage (encryption information)1010101101010110101011010101public key materialpk_algo1010101creation_time1010101version1010101Certificate packet listCertificate packet listCertifying self-signature for User IDCertifying self-signature for User IDSecret-Key packetsecret key material101010110101011010101s2k_usage (encryption information)1010101101010110101011010101public key materialpk_algo1010101creation_time1010101version1010101Public-Key packetPublic-Key packetDirect Key Signature packetsignatureby the primary key over primary key, subkey and signature metadata 1010101unhashed area1010101featuresissuer fingerprintkey flagspref hash algos1010101issuerpref sym algossig creation time 1010101hashed areahash_algo1010101pk_algo1010101version1010101Subkey binding signatureComponent KeyencryptionC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94- key creation timePrimary key creates a subkey binding signature to bind the subkey to the primary keyComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timeSubkey binding signature- signature creation time- key expiration time- key flags- issuer fingerprintSignature over:Primary keySubkeySignature metadata:Subkey binding signature for signing subkeysPrimary key creates a subkey binding signature to bind the subkey to the primary keyComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timeSubkey binding signature- signature creation time- key expiration time- key flags- issuer fingerprintSignature over:Primary keySubkeySignature metadata:- signature creation time- issuer fingerprintSignature over:Primary keySigning Subkey- Embedded signature:
Primary key bindingSigning key creates a primary binding signature to associate the primary key to the subkeyComponent KeyD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC99signing- key creation timeUser ID binding signatureComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timePrimary key creates a User ID binding signature to associate the User ID with the primary keyUser ID binding signature- signature creation time- key expiration time- primary User ID flag- algorithm preferences- key expiration time
(primary key)- key flags (primary key)Signature over:Primary keyUser IDSignature metadata:Types of signaturesSignature typeSignature over:Signature dataSignature metadataRaw signaturesOpenPGP signature packet- signature type- signature over signature data- additional metadata- raw cryptographic signatureTransferable secret key singularTransferable 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 98B3D07B 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 98B3Protecting secret key material Converting a passphrase with a passphraseinto a symmetric key(string-to-key) (string-to-key) S2K mechanismS2K mechanismcorrect horse battery staplecorrect horse battery staplePassphraseD07B 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 98B3Fingerprint of an OpenPGP
Fingerprint of an OpenPGP
component key component key C0A5 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 CA94Component Key Component Key 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 98B3D07B 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 CA94D07B 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 98B3Subkey binding signatureComponent KeyencryptionC0A5 8384 A438 E5A1 4F73 7124 26A4 D45D BAEE F4A3 9E6B 30B0 9D55 13F9 78AC CA94- key creation timePrimary key creates a subkey binding signature to bind the subkey to the primary keyComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timeSubkey binding signature- signature creation time- key expiration time- key flags- issuer fingerprintSignature over:Primary keySubkeySignature metadata:Subkey binding signature for signing subkeysPrimary key creates a subkey binding signature to bind the subkey to the primary keyComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timeSubkey binding signature- signature creation time- key expiration time- key flags- issuer fingerprintSignature over:Primary keySubkeySignature metadata:- signature creation time- issuer fingerprintSignature over:Primary keySigning Subkey- Embedded signature:
Primary key bindingSigning key creates a primary binding signature to associate the primary key to the subkeyComponent KeyD07B 24EC 91A1 4DD2 40AC 2D53 E6C8 A9E0 5494 9A41 222E A738 576E D19C AEA3 DC99signing- key creation timeUser ID binding signatureComponent Key (primary)AAA1 8CBB 2546 85C5 8358 3205 63FD 37B6 7F33 00F9 FB0E C457 378C D29F 1026 98B3certification- key creation timePrimary key creates a User ID binding signature to associate the User ID with the primary keyUser ID binding signature- signature creation time- key expiration time- primary User ID flag- algorithm preferences- key expiration time
(primary key)- key flags (primary key)Signature over:Primary keyUser IDSignature metadata:Public part of an Public part of an asymmetric keypairasymmetric keypairProtecting secret key material Converting a passphrase with a passphraseinto a symmetric keycorrect horse battery staplePassphrase