From 80388db5e7b0e85b649235cc204aefdf92ce6e60 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 13 Mar 2020 19:25:17 +0200 Subject: [PATCH] gpg.conf: replace local-user with default-key --- .mikaela/gpg.conf | 9 ++++++--- gpg/gpg.conf | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.mikaela/gpg.conf b/.mikaela/gpg.conf index 692e3c01..fa0d1f13 100644 --- a/.mikaela/gpg.conf +++ b/.mikaela/gpg.conf @@ -23,15 +23,18 @@ # Use my key by default, trusted-key puts it to ultimate trust even if the # private key is not present and default-recepient-self is not enough for # gpg --encrypt -r -# local-user/encrypt-to take name according to `man gpg` -local-user mikaela@mikaela.info +# default-key/encrypt-to take name according to `man gpg` +# NOTE! default-key is used instead of local-user as the latter cannot be +# overridden with flags (causing WTOP test to be signed with personal and +# WTOP keys) +default-key mikaela@mikaela.info # if auto-key-lookup is used, this tells the recepient which WKD to check? sender mikaela@mikaela.info # Has to be LONG key instead of fingerprint https://dev.gnupg.org/T4855 trusted-key 0x99392F62BAE30723 encrypt-to mikaela@mikaela.info # WTOP (see comments above) -#local-user +#default-key #trusted-key #encrypt-to diff --git a/gpg/gpg.conf b/gpg/gpg.conf index cdfe1e96..fcf5d256 100644 --- a/gpg/gpg.conf +++ b/gpg/gpg.conf @@ -23,15 +23,18 @@ # Use my key by default, trusted-key puts it to ultimate trust even if the # private key is not present and default-recepient-self is not enough for # gpg --encrypt -r -# local-user/encrypt-to take name according to `man gpg` -#local-user mikaela@mikaela.info # MIKAELA_GREP # MIKAELA_GREP_GPG +# default-key/encrypt-to take name according to `man gpg` +# NOTE! default-key is used instead of local-user as the latter cannot be +# overridden with flags (causing WTOP test to be signed with personal and +# WTOP keys) +#default-key mikaela@mikaela.info # MIKAELA_GREP # MIKAELA_GREP_GPG # if auto-key-lookup is used, this tells the recepient which WKD to check? #sender mikaela@mikaela.info # MIKAELA_GREP # MIKAELA_GREP_GPG # Has to be LONG key instead of fingerprint https://dev.gnupg.org/T4855 #trusted-key 0x99392F62BAE30723 # MIKAELA_GREP # MIKAELA_GREP_GPG #encrypt-to mikaela@mikaela.info # MIKAELA_GREP # MIKAELA_GREP_GPG # WTOP (see comments above) -#local-user # MIKAELA_GREP # MIKAELA_GREP_GPG +#default-key # MIKAELA_GREP # MIKAELA_GREP_GPG #trusted-key # MIKAELA_GREP # MIKAELA_GREP_GPG #encrypt-to # MIKAELA_GREP # MIKAELA_GREP_GPG