From 06b86f88a23216c1b4d76ae5053bc1e716fef672 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Fri, 24 Apr 2015 23:14:06 +0300 Subject: [PATCH] gpg: disable hkps deprecated option in Arch and Iannot do anything better at the moment. --- .mikaela/gpg.conf | 6 +++--- gpg/gpg.conf | 6 +++--- gpg/sks-keyservers.netCA.pem | 32 -------------------------------- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 gpg/sks-keyservers.netCA.pem diff --git a/.mikaela/gpg.conf b/.mikaela/gpg.conf index 8e92ae1a..8aeaa59a 100644 --- a/.mikaela/gpg.conf +++ b/.mikaela/gpg.conf @@ -21,8 +21,8 @@ # See the man page for a list of options. # This is one of the most used keyservers as far as I know. -keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options ca-cert-file=~/.gnupg/sks-keyservers.netCA.pem auto-key-retrieve no-include-revoked verbose no-honor-keyserver-url +keyserver hkp://hkp.pool.sks-keyservers.net +keyserver-options auto-key-retrieve no-include-revoked verbose no-honor-keyserver-url #import-clean # Try to automatically find keys from keyserver if key for email address isn't found, but we are encrypting to email address. @@ -55,7 +55,7 @@ personal-compress-preferences BZIP2,ZLIB,ZIP # Default preferences default-preference-list AES256,AES192,AES,CAST5,3DES SHA512,SHA384,SHA256,SHA224,RIPEMD160,SHA1,MD5 BZIP2,ZLIB,ZIP -default-keyserver-url hkps://hkps.pool.sks-keyservers.net +default-keyserver-url hkp://hkp.pool.sks-keyservers.net # Forcing preferred settings even if it's against OpenPGP standards cert-digest-algo SHA512 diff --git a/gpg/gpg.conf b/gpg/gpg.conf index 071d201c..3cda63e6 100644 --- a/gpg/gpg.conf +++ b/gpg/gpg.conf @@ -21,8 +21,8 @@ # See the man page for a list of options. # This is one of the most used keyservers as far as I know. -keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options ca-cert-file=~/.gnupg/sks-keyservers.netCA.pem auto-key-retrieve no-include-revoked verbose no-honor-keyserver-url +keyserver hkp://hkp.pool.sks-keyservers.net +keyserver-options auto-key-retrieve no-include-revoked verbose no-honor-keyserver-url #import-clean # Try to automatically find keys from keyserver if key for email address isn't found, but we are encrypting to email address. @@ -55,7 +55,7 @@ personal-compress-preferences BZIP2,ZLIB,ZIP # Default preferences default-preference-list AES256,AES192,AES,CAST5,3DES SHA512,SHA384,SHA256,SHA224,RIPEMD160,SHA1,MD5 BZIP2,ZLIB,ZIP -default-keyserver-url hkps://hkps.pool.sks-keyservers.net +default-keyserver-url hkp://hkp.pool.sks-keyservers.net # Forcing preferred settings even if it's against OpenPGP standards cert-digest-algo SHA512 diff --git a/gpg/sks-keyservers.netCA.pem b/gpg/sks-keyservers.netCA.pem deleted file mode 100644 index 24a2ad2e..00000000 --- a/gpg/sks-keyservers.netCA.pem +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFizCCA3OgAwIBAgIJAK9zyLTPn4CPMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV -BAYTAk5PMQ0wCwYDVQQIDARPc2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5u -ZXQgQ0ExHjAcBgNVBAMMFXNrcy1rZXlzZXJ2ZXJzLm5ldCBDQTAeFw0xMjEwMDkw -MDMzMzdaFw0yMjEwMDcwMDMzMzdaMFwxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARP -c2xvMR4wHAYDVQQKDBVza3Mta2V5c2VydmVycy5uZXQgQ0ExHjAcBgNVBAMMFXNr -cy1rZXlzZXJ2ZXJzLm5ldCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC -ggIBANdsWy4PXWNUCkS3L//nrd0GqN3dVwoBGZ6w94Tw2jPDPifegwxQozFXkG6I -6A4TK1CJLXPvfz0UP0aBYyPmTNadDinaB9T4jIwd4rnxl+59GiEmqkN3IfPsv5Jj -MkKUmJnvOT0DEVlEaO1UZIwx5WpfprB3mR81/qm4XkAgmYrmgnLXd/pJDAMk7y1F -45b5zWofiD5l677lplcIPRbFhpJ6kDTODXh/XEdtF71EAeaOdEGOvyGDmCO0GWqS -FDkMMPTlieLA/0rgFTcz4xwUYj/cD5e0ZBuSkYsYFAU3hd1cGfBue0cPZaQH2HYx -Qk4zXD8S3F4690fRhr+tki5gyG6JDR67aKp3BIGLqm7f45WkX1hYp+YXywmEziM4 -aSbGYhx8hoFGfq9UcfPEvp2aoc8u5sdqjDslhyUzM1v3m3ZGbhwEOnVjljY6JJLx -MxagxnZZSAY424ZZ3t71E/Mn27dm2w+xFRuoy8JEjv1d+BT3eChM5KaNwrj0IO/y -u8kFIgWYA1vZ/15qMT+tyJTfyrNVV/7Df7TNeWyNqjJ5rBmt0M6NpHG7CrUSkBy9 -p8JhimgjP5r0FlEkgg+lyD+V79H98gQfVgP3pbJICz0SpBQf2F/2tyS4rLm+49rP -fcOajiXEuyhpcmzgusAj/1FjrtlynH1r9mnNaX4e+rLWzvU5AgMBAAGjUDBOMB0G -A1UdDgQWBBTkwyoJFGfYTVISTpM8E+igjdq28zAfBgNVHSMEGDAWgBTkwyoJFGfY -TVISTpM8E+igjdq28zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAR -OXnYwu3g1ZjHyley3fZI5aLPsaE17cOImVTehC8DcIphm2HOMR/hYTTL+V0G4P+u -gH+6xeRLKSHMHZTtSBIa6GDL03434y9CBuwGvAFCMU2GV8w92/Z7apkAhdLToZA/ -X/iWP2jeaVJhxgEcH8uPrnSlqoPBcKC9PrgUzQYfSZJkLmB+3jEa3HKruy1abJP5 -gAdQvwvcPpvYRnIzUc9fZODsVmlHVFBCl2dlu/iHh2h4GmL4Da2rRkUMlbVTdioB -UYIvMycdOkpH5wJftzw7cpjsudGas0PARDXCFfGyKhwBRFY7Xp7lbjtU5Rz0Gc04 -lPrhDf0pFE98Aw4jJRpFeWMjpXUEaG1cq7D641RpgcMfPFvOHY47rvDTS7XJOaUT -BwRjmDt896s6vMDcaG/uXJbQjuzmmx3W2Idyh3s5SI0GTHb0IwMKYb4eBUIpQOnB -cE77VnCYqKvN1NVYAqhWjXbY7XasZvszCRcOG+W3FqNaHOK/n/0ueb0uijdLan+U -f4p1bjbAox8eAOQS/8a3bzkJzdyBNUKGx1BIK2IBL9bn/HravSDOiNRSnZ/R3l9G -ZauX0tu7IIDlRCILXSyeazu0aj/vdT3YFQXPcvt5Fkf5wiNTo53f72/jYEJd6qph -WrpoKqrwGwTpRUCMhYIUt65hsTxCiJJ5nKe39h46sg== ------END CERTIFICATE-----