diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/Cargo.toml | 8 | ||||
| -rw-r--r-- | net/src/lib.rs | 7 | ||||
| -rw-r--r-- | net/tests/hkp.rs | 7 |
3 files changed, 10 insertions, 12 deletions
diff --git a/net/Cargo.toml b/net/Cargo.toml index 86a4404c..8428700c 100644 --- a/net/Cargo.toml +++ b/net/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "sequoia-net" description = "Network services for OpenPGP" -version = "0.15.0" +version = "0.17.0" authors = [ "Justus Winter <justus@sequoia-pgp.org>", "Kai Michaelis <kai@sequoia-pgp.org>", "Neal H. Walfield <neal@sequoia-pgp.org>", ] -documentation = "https://docs.sequoia-pgp.org/0.15.0/sequoia_net" +documentation = "https://docs.sequoia-pgp.org/0.17.0/sequoia_net" homepage = "https://sequoia-pgp.org/" repository = "https://gitlab.com/sequoia-pgp/sequoia" readme = "../README.md" @@ -21,8 +21,8 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -sequoia-openpgp = { path = "../openpgp", version = "0.15", default-features = false } -sequoia-core = { path = "../core", version = "0.15" } +sequoia-openpgp = { path = "../openpgp", version = "0.17", default-features = false } +sequoia-core = { path = "../core", version = "0.17" } anyhow = "1" futures = "0.1" diff --git a/net/src/lib.rs b/net/src/lib.rs index 5f194550..b339daf9 100644 --- a/net/src/lib.rs +++ b/net/src/lib.rs @@ -27,7 +27,7 @@ //! let mut core = Core::new().unwrap(); //! let ctx = Context::new()?; //! let mut ks = KeyServer::keys_openpgp_org(&ctx)?; -//! let keyid = KeyID::from_hex("31855247603831FD").unwrap(); +//! let keyid = "31855247603831FD".parse().unwrap(); //! println!("{:?}", core.run(ks.get(&keyid))); //! Ok(()) //! # } @@ -151,7 +151,7 @@ impl KeyServer { _ => unreachable!(), }.unwrap()).parse()?; - Ok(KeyServer{client: client, uri: uri}) + Ok(KeyServer{client, uri}) } /// Retrieves the key with the given `keyid`. @@ -214,8 +214,7 @@ impl KeyServer { Ok(u) => u, }; - let mut w = match Writer::new(Vec::new(), - Kind::PublicKey, &[]) { + let mut w = match Writer::new(Vec::new(), Kind::PublicKey) { Ok(v) => v, Err(e) => return Box::new(future::err(e.into())), }; diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs index 0a2121f0..e095213d 100644 --- a/net/tests/hkp.rs +++ b/net/tests/hkp.rs @@ -26,7 +26,6 @@ extern crate sequoia_net; use crate::openpgp::armor::Reader; use crate::openpgp::Cert; -use crate::openpgp::{Fingerprint, KeyID}; use crate::openpgp::parse::Parse; use sequoia_core::{Context, NetworkPolicy}; use sequoia_net::KeyServer; @@ -98,7 +97,7 @@ fn service(req: Request<Body>) None)).unwrap(); assert_eq!( key.fingerprint(), - Fingerprint::from_hex(FP) + FP.parse() .unwrap()); }, _ => panic!("Bad post: {}:{}", key, value), @@ -155,11 +154,11 @@ fn get() { let mut keyserver = KeyServer::new(&ctx, &format!("hkp://{}", addr)).unwrap(); - let keyid = KeyID::from_hex(ID).unwrap(); + let keyid = ID.parse().unwrap(); let key = core.run(keyserver.get(&keyid)).unwrap(); assert_eq!(key.fingerprint(), - Fingerprint::from_hex(FP).unwrap()); + FP.parse().unwrap()); } #[test] |