More OCB friendliness

diff --git a/bin/bin/gpg-e-fast.sh b/bin/bin/gpg-e-fast.sh
index 580c8b5ded4b35c67caa4403f6bb11279346ac87..5d44e2898a76981e522a2ac503b719e435baa5ae 100755 (executable)
--- a/bin/bin/gpg-e-fast.sh
+++ b/bin/bin/gpg-e-fast.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-gpg --compress-level 0 --encrypt --cipher-algo AES-128 $@
+gpg --compress-level 0 --encrypt --force-aead --cipher-algo AES-128 $@

diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf
index 3f0d89e980d65249c59cafe569abafaadaf377b7..84b4a162ff09401106e21c4314458482c32192f6 100644 (file)
--- a/gnupg/.gnupg/gpg.conf
+++ b/gnupg/.gnupg/gpg.conf
@@ -11,11 +11,12 @@ photo-viewer sxiv %i
 trust-model tofu+pgp
 auto-key-locate dane wkd hkp://pool.sks-keyservers.net 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 SHA384 SHA256 SHA224 RIPEMD160 SHA1
 personal-compress-preferences ZLIB ZIP BZIP2 Uncompressed
-default-preference-list TWOFISH AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BLOWFISH IDEA 3DES SHA512 SHA384 SHA256 SHA224 RIPEMD160 SHA1 ZLIB ZIP BZIP2 Uncompressed
+default-preference-list OCB EAX TWOFISH AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BLOWFISH IDEA 3DES SHA512 SHA384 SHA256 SHA224 RIPEMD160 SHA1 ZLIB ZIP BZIP2 Uncompressed
 cert-digest-algo SHA512
 
 group myself=AE1A8109E49857EF