From a4b17a9af86ab88cfe48e616284b56c1bdf019bd Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 13:02:15 +1300 Subject: Remove --batch option and wrapper for gpg(1) This was originally added to cut the decryption boilerplate, which no longer seems to be an issue; I think that --quiet may be correctly blocking it now. Even without this, it caused more problems than it solved when gpg(1) genuinely did need user interaction from me, for example for --update-trustdb. --- README.md | 1 - gnupg/gpg.conf.mi5 | 5 ----- sh/shrc.d/gpg.sh | 10 ---------- 3 files changed, 16 deletions(-) delete mode 100644 sh/shrc.d/gpg.sh diff --git a/README.md b/README.md index 3e602d65..e8b67350 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,6 @@ in `sh/shrc.d` to be loaded by any POSIX interactive shell. Those include: * `ed()` tries to get verbose error messages, a prompt, and a Readline environment for `ed(1)`. * `gdb()` silences startup messages from `gdb(1)`. -* `gpg()` quietens `gpg(1)` down for most commands. * `grep()` tries to apply color and other options good for interactive use if available. * `hgrep()` allows searching `$HISTFILE`. diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5 index 1617a979..74363441 100644 --- a/gnupg/gpg.conf.mi5 +++ b/gnupg/gpg.conf.mi5 @@ -1,11 +1,6 @@ # Retrieve certs automatically if possible auto-key-locate cert pka -# Prevent boilerplate about needing key decryption, which is handled by the -# agent; the gpg function in my Bash scripts overrides this for certain -# commands where it interferes -batch - # Use SHA512 as the hash when making key signatures cert-digest-algo SHA512 diff --git a/sh/shrc.d/gpg.sh b/sh/shrc.d/gpg.sh deleted file mode 100644 index 62d123ea..00000000 --- a/sh/shrc.d/gpg.sh +++ /dev/null @@ -1,10 +0,0 @@ -# Wrapper around gpg(1) to stop ``--batch'' breaking things -gpg() { - # shellcheck disable=SC2048 - case $* in - *--ed*|*--gen-k*|*--sign-k*) - set -- --no-batch "$@" - ;; - esac - command gpg "$@" -} -- cgit v1.2.3 From 78b3e38915bbca43c0ff66d1d20c87e08ad0a8cb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 13:52:30 +1300 Subject: Use only fingerprints for GnuPG keys The manual page for gpg(1) says this is the safest way to do it. --- Makefile | 2 +- gnupg/gpg.conf.mi5 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d6f025b9..f5e78396 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ NAME = 'Tom Ryder' EMAIL = tom@sanctum.geek.nz -KEY = 0xC14286EA77BB8872 +KEY = FA09C06E1B670CD0B2F5DE60C14286EA77BB8872 SENDMAIL = msmtp BINS = bin/ap \ diff --git a/gnupg/gpg.conf.mi5 b/gnupg/gpg.conf.mi5 index 74363441..c3f80b7e 100644 --- a/gnupg/gpg.conf.mi5 +++ b/gnupg/gpg.conf.mi5 @@ -13,8 +13,8 @@ default-recipient-self # Show complete dates and use proper column separation for --with-colon listing mode fixed-list-mode -# Use 16-character key IDs as the default 8-character key IDs can be forged -keyid-format 0xlong +# Use only fingerprints as key IDs +keyid-format none # Use a pool of servers which support HKPS (encrypted key retrieval) keyserver <% KEYSERVER %> -- cgit v1.2.3 From 15e103309111c13979484c4353e16566a5f2438d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 13:58:19 +1300 Subject: Update key fingerprint for finger(1) --- finger/pgpkey | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/finger/pgpkey b/finger/pgpkey index 6d2cbeec..b65b028d 100644 --- a/finger/pgpkey +++ b/finger/pgpkey @@ -1,5 +1,5 @@ -pub 4096R/0xC14286EA77BB8872 2013-03-12 [expires: 2018-01-02] - Key fingerprint = FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872 -uid [ultimate] Thomas Ryder (tyrmored, tejr) -sub 4096R/0x96C2CD91E67AC61D 2013-03-12 [expires: 2018-01-02] -sub 4096R/0xB5AF5F8925926609 2013-03-12 [expires: 2018-01-02] +pub rsa4096 2013-03-12 [SC] [expires: 2018-12-17] + FA09C06E1B670CD0B2F5DE60C14286EA77BB8872 +uid [ultimate] Thomas Ryder (tyrmored, tejr) +sub rsa4096 2013-03-12 [E] [expires: 2018-12-17] +sub rsa4096 2013-03-12 [S] [expires: 2018-12-17] -- cgit v1.2.3 From 0a0ac517dc7d65d22a602be95854956d780a3779 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 14:00:18 +1300 Subject: Bump version number to 0.22.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 2c516c7c..0ecefce1 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v0.21.0 -Thu Dec 28 04:07:24 UTC 2017 +tejr dotfiles v0.22.0 +Fri Dec 29 01:00:07 UTC 2017 -- cgit v1.2.3 From 5bf19171388612bb6db07e9a49e28b0f0a4eaa32 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Fri, 29 Dec 2017 14:00:41 +1300 Subject: Rebuild dotfiles(7) manual page --- man/man7/dotfiles.7df | 2 -- 1 file changed, 2 deletions(-) diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 90f7506a..b00f9a8b 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -305,8 +305,6 @@ Readline environment for \f[C]ed(1)\f[]. .IP \[bu] 2 \f[C]gdb()\f[] silences startup messages from \f[C]gdb(1)\f[]. .IP \[bu] 2 -\f[C]gpg()\f[] quietens \f[C]gpg(1)\f[] down for most commands. -.IP \[bu] 2 \f[C]grep()\f[] tries to apply color and other options good for interactive use if available. .IP \[bu] 2 -- cgit v1.2.3