diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-08-19 17:34:10 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-08-20 10:07:29 +0200 |
commit | 4ce96162f089e62d0d27ab305c227e0823439c10 (patch) | |
tree | 0441f93e8f76299a8d2b2c5db155df049c4c2f83 /net | |
parent | 7555cfeafb28fccd93aac9441cc18f985036cfc7 (diff) |
net: Drop SKS pool in favor of keys.openpgp.org.
Diffstat (limited to 'net')
-rw-r--r-- | net/src/lib.rs | 16 | ||||
-rw-r--r-- | net/src/sks-keyservers.netCA.der | bin | 1423 -> 0 bytes |
2 files changed, 6 insertions, 10 deletions
diff --git a/net/src/lib.rs b/net/src/lib.rs index ad023d67..e37e6ece 100644 --- a/net/src/lib.rs +++ b/net/src/lib.rs @@ -26,7 +26,7 @@ //! # fn f() -> Result<()> { //! let mut core = Core::new().unwrap(); //! let ctx = Context::new()?; -//! let mut ks = KeyServer::sks_pool(&ctx)?; +//! let mut ks = KeyServer::keys_openpgp_org(&ctx)?; //! let keyid = KeyID::from_hex("31855247603831FD").unwrap(); //! println!("{:?}", core.run(ks.get(&keyid))); //! Ok(()) @@ -127,16 +127,12 @@ impl KeyServer { Self::make(ctx, client, uri) } - /// Returns a handle for the SKS keyserver pool. + /// Returns a handle for keys.openpgp.org. /// - /// The pool `hkps://hkps.pool.sks-keyservers.net` provides HKP - /// services over https. It is authenticated using a certificate - /// included in this library. It is a good default choice. - pub fn sks_pool(ctx: &Context) -> Result<Self> { - let uri = "hkps://hkps.pool.sks-keyservers.net"; - let cert = Certificate::from_der( - include_bytes!("sks-keyservers.netCA.der")).unwrap(); - Self::with_cert(ctx, uri, cert) + /// The server at `hkps://keys.openpgp.org` distributes updates + /// for OpenPGP certificates. It is a good default choice. + pub fn keys_openpgp_org(ctx: &Context) -> Result<Self> { + Self::new(ctx, "hkps://keys.openpgp.org") } /// Common code for the above functions. diff --git a/net/src/sks-keyservers.netCA.der b/net/src/sks-keyservers.netCA.der Binary files differdeleted file mode 100644 index 80ca132b..00000000 --- a/net/src/sks-keyservers.netCA.der +++ /dev/null |