aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-12-29 13:59:28 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-12-29 13:59:28 +1300
commitd496d7de9b51eef2195d286e758b247c724c9e06 (patch)
treefdec3c78a3a9c8ac3f7e8e919ed2ec58af8a1a1e
parent3f8e8f74a0808eea59a9648f66e476d58d09b622 (diff)
parent15e103309111c13979484c4353e16566a5f2438d (diff)
downloaddotfiles-d496d7de9b51eef2195d286e758b247c724c9e06.tar.gz
dotfiles-d496d7de9b51eef2195d286e758b247c724c9e06.zip
Merge branch 'feature/gpg-fp-only' into develop
* feature/gpg-fp-only: Update key fingerprint for finger(1) Use only fingerprints for GnuPG keys
-rw-r--r--Makefile2
-rw-r--r--finger/pgpkey10
-rw-r--r--gnupg/gpg.conf.mi54
3 files changed, 8 insertions, 8 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/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) <tom@sanctum.geek.nz>
-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) <tom@sanctum.geek.nz>
+sub rsa4096 2013-03-12 [E] [expires: 2018-12-17]
+sub rsa4096 2013-03-12 [S] [expires: 2018-12-17]
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 %>