New main PGP key

diff --git a/bin/bin/mk-wkd-keys.sh b/bin/bin/mk-wkd-keys.sh
index c45a232e6d7ea5a05e17e0eef77ec1001339a34e..b09508e7dcd8ca5c8a9c6dee16fe1da061d5927c 100755 (executable)
--- a/bin/bin/mk-wkd-keys.sh
+++ b/bin/bin/mk-wkd-keys.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -ex
 
-keyid=$1
-email=$2
+email=$1
+shift
 
 hsh=`gpg-wks-client --print-wkd-hash $email | cut -d " " -f1`
-gpg --export $keyid > $hsh
-gpg --armor --export $keyid > $hsh.asc
+gpg --export $@ > $hsh
+gpg --armor --export $@ > $hsh.asc

diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf
index 435e27d06636023661f95db8edaccaf2cfe04bda..d63a67cf77d8902557b5ba826fab3e1cf0eff60f 100644 (file)
--- a/gnupg/.gnupg/gpg.conf
+++ b/gnupg/.gnupg/gpg.conf
@@ -4,7 +4,7 @@ keyserver keys.gnupg.net
 no-secmem-warning
 no-greeting
 no-emit-version
-default-key AE1A8109E49857EF
+default-key 12AD32689C660D426967FD75CB8205632107AD8A
 keyid-format 0xlong
 photo-viewer sxiv %i
 
@@ -13,10 +13,11 @@ auto-key-locate nodefault dane wkd local
 
 aead-algo OCB
 personal-aead-preferences OCB EAX
-personal-cipher-preferences TWOFISH AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BLOWFISH IDEA 3DES
-personal-digest-preferences SHA512 SHA256 RIPEMD160
+personal-cipher-preferences AES256 TWOFISH CAMELLIA256 AES
+personal-digest-preferences SHA512
 personal-compress-preferences ZLIB ZIP Uncompressed
-default-preference-list OCB EAX TWOFISH AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BLOWFISH IDEA 3DES SHA512 SHA256 RIPEMD160 ZLIB ZIP Uncompressed
+default-preference-list OCB EAX AES256 TWOFISH CAMELLIA256 AES SHA512 ZLIB ZIP Uncompressed
 cert-digest-algo SHA512
 
-group myself=AE1A8109E49857EF
+group myself=12AD32689C660D426967FD75CB8205632107AD8A
+group myold=CF60E89A59231E76E2636422AE1A8109E49857EF

diff --git a/mutt/.signature b/mutt/.signature
index 1fdbb4342657c3bef9ba062ff49281beaf347119..89dde6b89a7c09ceb1f53cbae61cdc249c9cff43 100644 (file)
--- a/mutt/.signature
+++ b/mutt/.signature
@@ -1,2 +1,2 @@
 Sergey Matveev (http://www.stargrave.org/)
-OpenPGP: CF60 E89A 5923 1E76 E263  6422 AE1A 8109 E498 57EF
+OpenPGP: 12AD 3268 9C66 0D42 6967  FD75 CB82 0563 2107 AD8A