From 4ce96162f089e62d0d27ab305c227e0823439c10 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 19 Aug 2019 17:34:10 +0200 Subject: net: Drop SKS pool in favor of keys.openpgp.org. --- net/src/lib.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'net/src/lib.rs') 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 { - 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::new(ctx, "hkps://keys.openpgp.org") } /// Common code for the above functions. -- cgit v1.2.3