diff options
fix: old email is no longer relevant and should be avoided
| -rw-r--r-- | src/routes/canaries/fallback-keys.ts | 3 | ||||
| -rw-r--r-- | src/routes/canaries/keystore.ts | 21 | ||||
| -rw-r--r-- | static/keys/memdmp/primary.pgp | 1 |
3 files changed, 11 insertions, 14 deletions
diff --git a/src/routes/canaries/fallback-keys.ts b/src/routes/canaries/fallback-keys.ts index fa3d7a7..27c5a00 100644 --- a/src/routes/canaries/fallback-keys.ts +++ b/src/routes/canaries/fallback-keys.ts @@ -1,6 +1,5 @@ export const fallbackKeys = new Map<string, string>().set('B546778F06BBCC8EC167DB3CD919706487B8B6DE', `-----BEGIN PGP PUBLIC KEY BLOCK----- Comment: User ID: memdmp <memdmp@estrogen.zone> -Comment: a.k.a.: memdmp <memdmp@memeware.net> Comment: Valid from: 11 Sep 2024 08:29:03 Comment: Type: 255-bit EdDSA (secret key available) Comment: Usage: Signing, Encryption, Certifying User IDs @@ -31,4 +30,4 @@ fAMBCAeIeAQYFgoAIAIbDBYhBLVGd48Gu8yOwWfbPNkZcGSHuLbeBQJm4Tp2AAoJ ENkZcGSHuLbeE9QA/1USt07TSOzMm47ffajCC+rDQEiGvpu19dP8khPsUUUcAPwI C8p0np2525hjuerND23TEiYK9EoRSprm8S7UdcwzCg== =DPPI ------END PGP PUBLIC KEY BLOCK-----`)
\ No newline at end of file +-----END PGP PUBLIC KEY BLOCK-----`) diff --git a/src/routes/canaries/keystore.ts b/src/routes/canaries/keystore.ts index 90185f5..0180399 100644 --- a/src/routes/canaries/keystore.ts +++ b/src/routes/canaries/keystore.ts @@ -6,14 +6,14 @@ const will_debug = true; const debug = dev && will_debug ? (z: any, ...a: any[]) => - console.debug( - ...[ - ...(typeof z === 'string' - ? [`[keystore] ${z}`] - : ['[keystore]', z]), - ...a, - ], - ) + console.debug( + ...[ + ...(typeof z === 'string' + ? [`[keystore] ${z}`] + : ['[keystore]', z]), + ...a, + ], + ) : () => void 0; const _validateSignature = async (message: string, id: string) => { id = id.toUpperCase(); @@ -110,7 +110,7 @@ const pushKey = async ({ if ( expect_fingerprint && parsedKey.getFingerprint().toUpperCase() !== - expect_fingerprint.toUpperCase() + expect_fingerprint.toUpperCase() ) throw new Error( `Key ${parsedKey.getFingerprint()} is not ${expect_fingerprint}`, @@ -139,7 +139,6 @@ export const initKeystore = (async () => { ids: ['memdmp'], expect_user_ids: [ 'memdmp <memdmp@estrogen.zone>', - 'memdmp <memdmp@memeware.net>', ], expect_fingerprint: 'B546778F06BBCC8EC167DB3CD919706487B8B6DE', is_url: true, @@ -178,7 +177,7 @@ ZQ4KTbprMz8J4AD/bG33f9Kqg3AqehEyU2TldJs9U9Oni5AXGSGfKLJhmQc= =945T -----END PGP SIGNATURE----- `, - signed_by: 'memdmp <memdmp@memeware.net>', + signed_by: 'memdmp <memdmp@estrogen.zone>', ids: ['canary-sigkey-signing'], expect_fingerprint: '55D3582CAE78601990A8CA1DBFD0F9E61CB7D84E', }); diff --git a/static/keys/memdmp/primary.pgp b/static/keys/memdmp/primary.pgp index 8479dcf..115adeb 100644 --- a/static/keys/memdmp/primary.pgp +++ b/static/keys/memdmp/primary.pgp @@ -1,6 +1,5 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- Comment: User ID: memdmp <memdmp@estrogen.zone> -Comment: a.k.a.: memdmp <memdmp@memeware.net> Comment: Valid from: 11 Sep 2024 08:29:03 Comment: Type: 255-bit EdDSA (secret key available) Comment: Usage: Signing, Encryption, Certifying User IDs |