From 48637133915326986c0c790453b0c298cb493969 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Thu, 17 Jun 2021 00:32:58 +0200
Subject: [PATCH] wip

---
 bundles/opendkim/metadata.py         | 14 ++++++++------
 data/dkim/mail2.sublimity.de.privkey |  2 +-
 data/dkim/mail2.sublimity.de.pubkey  | 29 +---------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/bundles/opendkim/metadata.py b/bundles/opendkim/metadata.py
index 0cc7c86..bb7a184 100644
--- a/bundles/opendkim/metadata.py
+++ b/bundles/opendkim/metadata.py
@@ -45,18 +45,20 @@ def keys(metadata):
                 )
             with open(privkey_path, 'w') as file:
                 file.write(
-                    key.private_bytes(
-                        crypto_serialization.Encoding.PEM,
-                        crypto_serialization.PrivateFormat.PKCS8,
-                        crypto_serialization.NoEncryption()
-                    ).decode()
+                    repo.vault.encrypt(
+                        key.private_bytes(
+                            crypto_serialization.Encoding.PEM,
+                            crypto_serialization.PrivateFormat.PKCS8,
+                            crypto_serialization.NoEncryption()
+                        ).decode(),
+                    )
                 )
                 
         with open(pubkey_path, 'r') as pubkey:
             with open(privkey_path, 'r') as privkey:
                 keys[domain] = {
                     'public': pubkey.read(),
-                    'private': privkey.read(),
+                    'private': repo.vault.decrypt(privkey.read()),
                 }
 
     return {
diff --git a/data/dkim/mail2.sublimity.de.privkey b/data/dkim/mail2.sublimity.de.privkey
index 79ab4ab..202f588 100644
--- a/data/dkim/mail2.sublimity.de.privkey
+++ b/data/dkim/mail2.sublimity.de.privkey
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1DDDUIj7qX9NovO8SbuzaL+cc4JInAVb2DXTHEZh7o9guW/n2drpLEUA6fS6d8yBWXvbijyp4X3+9qP0R2j64QMNFaK3crnXo0Og8ko2in2Tz9NeICN8wJtzLw8lTifCxarwPxHWbKsJLkZlZJS78+BSn4dDSjedNjnH/ah9ST0fVL/yi6NmQ8be5jZK1pXVgaED6RcjkdgXUI2DkfV5yM9lSx3LjhPj6iJWQ0ixMpKJEnBMfrOlcKDPmfJBiNkUyx4MJOBMhzy50oBPacYXVZoC1FsACT2TVkUQ52USW4jyxBozyyR3rIYeaGQkU33DYOgSQ6gF3sozW7HnIriHj
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpRC10airxCKFHYt6tsJNn1WvknzSX9HMYBwSawYroAS+Q6jt3ihdvES47zzpx3obeGSZgf1Wtnje+5B82LoMWWaGWTPJcagYkzZ14EzeM3qMQVplbO6aC2YrrHwpxN51NUSxaTATd8O+UVa8YqtILeIf07JZEP7LNGHsokvZMTvxpfQs7JpcHcrEU4gWDAr8fWOKX+pzyPCnDtSpIvUQzd+onclm8AZn4ArN4dJ8SswZ0MPPcJnu1eBLVqgCu3h+vde9chADekgLEycvYFSQdSqiNd3W0U+slY+4zwl2alxHvi6OqJsNEgRxKoSbaSQs/8S3skebgmDxAHDQY7PBP
\ No newline at end of file
diff --git a/data/dkim/mail2.sublimity.de.pubkey b/data/dkim/mail2.sublimity.de.pubkey
index 3283281..09d503d 100644
--- a/data/dkim/mail2.sublimity.de.pubkey
+++ b/data/dkim/mail2.sublimity.de.pubkey
@@ -1,28 +1 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1DDDUIj7qX9No
-vO8SbuzaL+cc4JInAVb2DXTHEZh7o9guW/n2drpLEUA6fS6d8yBWXvbijyp4X3+9
-qP0R2j64QMNFaK3crnXo0Og8ko2in2Tz9NeICN8wJtzLw8lTifCxarwPxHWbKsJL
-kZlZJS78+BSn4dDSjedNjnH/ah9ST0fVL/yi6NmQ8be5jZK1pXVgaED6RcjkdgXU
-I2DkfV5yM9lSx3LjhPj6iJWQ0ixMpKJEnBMfrOlcKDPmfJBiNkUyx4MJOBMhzy50
-oBPacYXVZoC1FsACT2TVkUQ52USW4jyxBozyyR3rIYeaGQkU33DYOgSQ6gF3sozW
-7HnIriHjAgMBAAECggEBAJ5RS72lOLlBFKCpXrIS2AGwE/yXkJaVQFMnzy9o/ptX
-2monufzBNAUCz9SVtRcgDO4aWvAhW3UppY3XYX2kCGadE2T1tdudn7P4Qqz9Ruen
-VONT/smRYII96aQx0DLCE/1BJbTwChunF4J3js56io1h7sYj3LTSrCqQ3rUIOt2A
-xkGtXdRRCSGXpv+FiFlxEMhbDcfXuDTgO02Aj16Eb5VeZeDOCS90jLxXoeCyMVZF
-Y9A+fpG+BCdUxlw6+fkqAQQEAv77IqhZHFfK6eTHzccTY7J2CxuVFOMEwTo3I4xu
-a4oLa9cXXA75p86u5dNKS7y8Vdow/HLtnujVJcGvPAkCgYEA7PZRmMFNRlqshGtx
-Dv77fxaeiKoFg7Izw6V/j/OoRKdKWow8BStIAr6CjoFnWVzimF337xffglnfOJjJ
-G7UG4sEPeNRe2soNuJJIOF6TRKtppSw7GQBs6fdtXfNXq1JVqao4c7fUb0/rVhXM
-1U4Idn+ipXh+JE/+fKGjucYr5s0CgYEAw5fbub4+NBxoQ4mXfMou0sqeCVUHTWG2
-4w7wKZaYXebrm2USAsJkkMaUZjJ6geu2SkEdWpyhs7pyaPyMGt3ZTMm9wxZQ3uE5
-fZA5lxz2oOfxNEJSEgC+qCmsrsuV+Urmvt0foYequbyRck8tYc710pANqzFshtAG
-SKtNaTUjS28CgYB9hc2beWoRxp50VuXA59kZbUX1Zvsc1B0Pmm+ENbIBDA0bAgYZ
-RuASdBB8pJe2grmVtNFNWfwP9MOGG4kMoExReatUekr04ut5xiNzmMWyLor77/4u
-NEd9eI/6oJjkK+0svvrAcbSacl9bbpjetUNOYjYqKTXIzockRguQsSU4UQKBgQCA
-KkIQtFiOTQ8FMmPRoaqM9bgY5V6jliQBJQi6N7Qf0/EPImtq43aCZ51WWj1sZMhO
-X9ycQ4ax/rp5kQM9l6GMb6Wo8DaN1YeWf6s9Gf2B8npbhBnDMjm8d5Jv93eOo0YQ
-S1Uuw3dbvfSQstFKBhOOplZOl1RGAooblCRljCxUgQKBgBItURsxoH8tgnVHsYu5
-gdnJHo3CEd0pnX2a4wn5/Rnh5vm6j7zLEpwuEGUq2OBC8ccCiSeNZIJnKI6oXnv0
-tdLuDvaaO3E13VcA/EBS6bgdHtC9tR1OWPLxrlTP6lPywLqBoIcrSuAun/hJNE+G
-5b/xXoOLw9KNkcbqXBHOhiwg
------END PRIVATE KEY-----
+encrypt$gAAAAABgynvAWS1BYWxdSUMn822S3V99KrqGOxkMRu5GR_dcTZWA4n39-FLx_Zq5XqYKBH5jZIdgmCM5CVLdwDI2LAr93KVY9mcvgZ2T0oZq9ka3167YjXqZS7tkFL87__zdnG_p2ohJAJRdx-g0Nh788j_xYKiNssiemtg8OO4iJ2cQq15QJrQ3IgjY1Mb4VTMSRgnKm1ggxyFXVoLE66Ggi4EvPOITWVAXCc1HZI3iv0zyIyy1UaZ9cPNMGXvR6NYKpFIqNZp0w4QMzjv7cW9XM5Ym58DlP0PN-rZZfO6g7AdXZxGxUIU4HA4eGYEsm-G4bV9devBUD58979J2tutgANAkFS3ukT0DQWTPhHbCb6SZgABZ2L3aHTfhzKXzHoWwS-1I5TNUJtOumrf94OFbDc7ejLm1dj7GWcmtYDRmpzy7ZbcSJJ5SGhtP9HF9vIlc8nYgkYNhKQvKYZ9Lqt6ADE5DB6L1GkffXn7b57RiZHXn55pSM3OFET_jhUEfMi8eRejFCZqFVY3NSHA5IuyE6wU7d9NFXS_aPtOnQjwmqNWSb5ZCf2Wg2OcFyHl10Y061sLDkke-daEw_XVfL711fekuS8rNp3GGtgi73aMKu3v5N1whWULWlVziLUg4wLVRdsKReRU0JNU_K_sR7bX1i8dSDybBcjvep8L6oUvvT1cgHaxk6_GTlZcP4YIbATfI9hGL_RKwn7qIFrOdS9Q4GnC0zNAadfMv23QhqbHU06uV7apFvMGWzfc-GIDz69tFWdiXiBqQZqmXOLRg4QIoVP3VN6-LAdvgjCZRjGC_2M51C85d1WvKFF1Ylh9a72AHsQvLST9aDL2D0D7jRGPxh4LAtE3vJY5K3FQtZKUDhlhIgcszdIsXbRn9xCPxcrdNIefOVITJwEokNB8au_LY0nmQni5TrtwsOgeTlBty-1U4YvBqGmgHFzAZ7PUPQSHVEzwYmkvzZFjijQrK-0r3ygemaCvJBYjORL3_PSyhV1SiehCt2Ht2ipq_nPcsg8C_44zgzCBeAm708_w0uVq139y49BBaz_IPjiWGYm_-Wl87dvk1GL8logbcO5gy-Bw-eMDOmFP_KVvLcbXOLH2hmzZMGO2wUF23eFtgb31myxEI_WffdmLfufuwRibHHKRqqD8BDNqfrP2xGvlbN6o88HU0Gss_q2M_yVXPU3JZLKE4pEQ3Mrgnc1ktBJ6MrKWko9Dfc2Tphr0zLvr046h0EsBd-GTe6i96zkVZkSYGLMYJb9JwLExHR-fnz2yeF1ZBg3_M485xbs4enOvC32jBDm5JORwHD5_hhcimO4iAeecJ7QPKHGohvjn_W6bP1OOLK7v9NepzPI092kBZSdrLpaZMciGSw9B0p_cgMgyUyt8XW6vYwHF8A6WW3ZeC7PTQOrNj1Yd08eJTIhZ1y3QyHE8VI_R753A80PJRueZigzTL6l3Fs_uU1lf-AqlJpUwoQeWVl3XS9K0Qzp64Eq_VxxJT-9hH4l-nbqTlgNKZCjJfO21Rrfm-XnvjelAQQxw-aN3YGslxV8kVV2fdX-3Nk5xAs-ESNsrxCop2dcwxMoiUj5I2cusZcjabsu4qkJeCd703LKoOij3U_c4FeHavFwjWk6lqfuI3Wro5kI6n8-Tg8gieWOVq1iL9ox73uu7SHT9ptlGtPNFNgrHaxVNeAWVaQS9dQ2zuY9ne5iqBCJ7ITMYLj18pmuC9s9LbMeCujrxkUK5iHge9n6QsWpr5jm28K6E16N1t-daGZJjo2DNy1FPfRAhg67RBF5ThEmTGQt_GMo7E-Kdc7UEnxYcPjqwKuTSTro3EmNrQEiSG2jz-DZ8nwZ3Oh19jmRl7LHv2P6mTO-HWbR58ZVlsU8peNExQuwqbE-hqn_icSEW7Eotpjqwpbwdhgo1SPbs0v4-2m3g2hSVxOTTNzxCTSbGk3dIkHI_w81Jcy4peIR2FAR-_Ouc053cFMY_13utiPq7L3i799r8V8G2lVyqBbnwcj4_M5Yows3GQUxmCerK2oUNs1tj2fV-Ytb4j7tz6tViH0KlC31ZF8obUjFnHaYnoYh6pXCG-iA84UnMB9Hb4poMzamK_f2adDJgwb5WWD79olHnmR7ckTeVVAOSmGZ_Y85uZ2AYvaq_6hBlczlCughVNvbSjFp6xAFvU8xUJBYR93Uu-upv5FLb5QBHBUTfifocG9BRrB7tlPHPLROQbzEpNqL-Tdo1OVjwMAaoJH-_5IddbpelfANkH2n5ICwU0_6KWLa43eBwa_2Om0ySe_dVTZavkQ5XrD6HQdGiM87OOUKE_EEhICYJ86_bHGMhilxXClAmngP50s-29c_uPi0Oz2Dzun98=
\ No newline at end of file