diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf deleted file mode 100644 index 242711e..0000000 --- a/gnupg/gpg.conf +++ /dev/null @@ -1,15 +0,0 @@ -personal-cipher-preferences AES256 TWOFISH CAMELLIA256 CAMELLIA192 AES192 CAMELLIA128 AES -personal-digest-preferences SHA512 SHA384 SHA256 SHA224 RIPEMD160 -personal-compress-preferences BZIP2 ZLIB ZIP Uncompressed -digest-algo SHA512 -cipher-algo TWOFISH -cert-digest-algo SHA512 -s2k-cipher-algo TWOFISH -s2k-digest-algo SHA512 -default-preference-list AES256 TWOFISH CAMELLIA256 CAMELLIA192 AES192 CAMELLIA128 AES SHA512 SHA384 SHA256 SHA224 RIPEMD160 BZIP2 ZLIB ZIP Uncompressed -disable-cipher-algo IDEA 3DES CAST5 -disable-pubkey-algo DSA ECDH ECDSA -ask-cert-level -default-key 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE -hidden-encrypt-to 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE -keyserver hkp://subset.pool.sks-keyservers.net diff --git a/gnupg/ownertrust b/gnupg/ownertrust index bc03cd8..584e97a 100644 --- a/gnupg/ownertrust +++ b/gnupg/ownertrust @@ -1,3 +1,2 @@ +DC43171B6BE93978D09AD8B2C601EE21773E7C8F:6: 6D1EC2269BC0B5459C8BA920CFDAB41F8292CEEE:6: -0CC6AC541C7ADC733C641610636703577395312F:6: -632E2A4DBFE3F3435A2F21BF94296EF2EC9BE683:6: diff --git a/gnupg/scdaemon.conf b/gnupg/scdaemon.conf deleted file mode 100644 index eb818dd..0000000 --- a/gnupg/scdaemon.conf +++ /dev/null @@ -1 +0,0 @@ -disable-ccid diff --git a/setup.sh b/setup.sh index a620907..eed8154 100755 --- a/setup.sh +++ b/setup.sh @@ -36,7 +36,7 @@ if have fossil; then gpg="false" fi - gpg_key="EC9BE683" + gpg_key="DC43171B6BE93978D09AD8B2C601EE21773E7C8F" if $gpg --list-secret-keys $gpg_key >/dev/null 2>&1; then fossil set --global pgp-command \ "$gpg -u $gpg_key --clearsign -o" @@ -50,8 +50,6 @@ have git && link_file git .config/git ../ if have gpg || have gpg2; then mkdir -p $HOME/.local/share/gnupg chmod 700 $HOME/.local/share/gnupg - link_file gnupg/gpg.conf .local/share/gnupg/gpg.conf ../../../ - link_file gnupg/scdaemon.conf .local/share/gnupg/scdaemon.conf ../../../ if have gpg2; then gpg="gpg2" else