instant-labs
/
instant-acme
mirror of https://github.com/instant-labs/instant-acme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump base64 dependency to 0.21

This commit is contained in:
Dirkjan Ochtman 2023-01-09 10:58:14 +01:00
parent 72bfbe9af7
commit a438e48f02
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -12,7 +12,7 @@ categories = ["web-programming", "api-bindings"]
rust-version = "1.60.0" rust-version = "1.60.0"
[dependencies] [dependencies]
base64 = "0.13.0" base64 = "0.21.0"
hyper = { version = "0.14.18", features = ["client", "http1", "http2"] } hyper = { version = "0.14.18", features = ["client", "http1", "http2"] }
hyper-rustls = { version = "0.23.0", default-features = false, features = ["http1", "http2", "native-tokio", "tls12"] } hyper-rustls = { version = "0.23.0", default-features = false, features = ["http1", "http2", "native-tokio", "tls12"] }
ring = { version = "0.16.20", features = ["std"] } ring = { version = "0.16.20", features = ["std"] }

22
src/lib.rs
View File

@ -7,7 +7,7 @@ use std::borrow::Cow;
use std::fmt; use std::fmt;
use std::sync::Arc; use std::sync::Arc;
use base64::URL_SAFE_NO_PAD; use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD};
use hyper::client::HttpConnector; use hyper::client::HttpConnector;
use hyper::header::{CONTENT_TYPE, LOCATION}; use hyper::header::{CONTENT_TYPE, LOCATION};
use hyper::{Body, Method, Request, Response}; use hyper::{Body, Method, Request, Response};
@ -230,10 +230,7 @@ struct AccountInner {
impl AccountInner { impl AccountInner {
fn from_credentials(credentials: AccountCredentials<'_>) -> Result<Self, Error> { fn from_credentials(credentials: AccountCredentials<'_>) -> Result<Self, Error> {
Ok(Self { Ok(Self {
key: Key::from_pkcs8_der(base64::decode_config( key: Key::from_pkcs8_der(BASE64_URL_SAFE_NO_PAD.decode(&credentials.key_pkcs8)?)?,
&credentials.key_pkcs8,
URL_SAFE_NO_PAD,
)?)?,
client: Client { client: Client {
client: client(), client: client(),
urls: credentials.urls.into_owned(), urls: credentials.urls.into_owned(),
@ -264,7 +261,7 @@ impl AccountInner {
fn credentials(&self) -> AccountCredentials<'_> { fn credentials(&self) -> AccountCredentials<'_> {
AccountCredentials { AccountCredentials {
id: Cow::Borrowed(&self.id), id: Cow::Borrowed(&self.id),
key_pkcs8: base64::encode_config(&self.key.pkcs8_der, URL_SAFE_NO_PAD), key_pkcs8: BASE64_URL_SAFE_NO_PAD.encode(&self.key.pkcs8_der),
urls: Cow::Borrowed(&self.client.urls), urls: Cow::Borrowed(&self.client.urls),
} }
} }
@ -345,7 +342,7 @@ impl Key {
let rng = SystemRandom::new(); let rng = SystemRandom::new();
let pkcs8 = EcdsaKeyPair::generate_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, &rng)?; let pkcs8 = EcdsaKeyPair::generate_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, &rng)?;
let key = EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, pkcs8.as_ref())?; let key = EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, pkcs8.as_ref())?;
let thumb = base64::encode_config(Jwk::thumb_sha256(&key)?, URL_SAFE_NO_PAD); let thumb = BASE64_URL_SAFE_NO_PAD.encode(Jwk::thumb_sha256(&key)?);
Ok(Self { Ok(Self {
rng, rng,
@ -358,7 +355,7 @@ impl Key {
fn from_pkcs8_der(pkcs8_der: Vec<u8>) -> Result<Self, Error> { fn from_pkcs8_der(pkcs8_der: Vec<u8>) -> Result<Self, Error> {
let key = EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, &pkcs8_der)?; let key = EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, &pkcs8_der)?;
let thumb = base64::encode_config(Jwk::thumb_sha256(&key)?, URL_SAFE_NO_PAD); let thumb = BASE64_URL_SAFE_NO_PAD.encode(Jwk::thumb_sha256(&key)?);
Ok(Self { Ok(Self {
rng: SystemRandom::new(), rng: SystemRandom::new(),
@ -385,7 +382,7 @@ impl Key {
Ok(Body::from(serde_json::to_vec(&JoseJson { Ok(Body::from(serde_json::to_vec(&JoseJson {
protected, protected,
payload, payload,
signature: base64::encode_config(signature.as_ref(), URL_SAFE_NO_PAD), signature: BASE64_URL_SAFE_NO_PAD.encode(signature.as_ref()),
})?)) })?))
} }
} }
@ -452,7 +449,7 @@ impl KeyAuthorization {
/// ///
/// This can be used for DNS-01 challenge responses. /// This can be used for DNS-01 challenge responses.
pub fn dns_value(&self) -> String { pub fn dns_value(&self) -> String {
base64::encode_config(self.digest(), URL_SAFE_NO_PAD) BASE64_URL_SAFE_NO_PAD.encode(self.digest())
} }
} }
@ -469,10 +466,7 @@ fn nonce_from_response(rsp: &Response<Body>) -> Option<String> {
} }
fn base64(data: &impl Serialize) -> Result<String, serde_json::Error> { fn base64(data: &impl Serialize) -> Result<String, serde_json::Error> {
Ok(base64::encode_config( Ok(BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_vec(data)?))
serde_json::to_vec(data)?,
URL_SAFE_NO_PAD,
))
} }
fn client() -> hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>> { fn client() -> hyper::Client<hyper_rustls::HttpsConnector<HttpConnector>> {

8
src/types.rs
View File

@ -1,7 +1,7 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::fmt; use std::fmt;
use base64::URL_SAFE_NO_PAD; use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD};
use hyper::{Body, Response}; use hyper::{Body, Response};
use ring::digest::{digest, Digest, SHA256}; use ring::digest::{digest, Digest, SHA256};
use ring::signature::{EcdsaKeyPair, KeyPair}; use ring::signature::{EcdsaKeyPair, KeyPair};
@ -108,7 +108,7 @@ pub(crate) struct FinalizeRequest {
impl FinalizeRequest { impl FinalizeRequest {
pub(crate) fn new(csr_der: &[u8]) -> Self { pub(crate) fn new(csr_der: &[u8]) -> Self {
Self { Self {
csr: base64::encode_config(csr_der, URL_SAFE_NO_PAD), csr: BASE64_URL_SAFE_NO_PAD.encode(csr_der),
} }
} }
} }
@ -154,8 +154,8 @@ impl Jwk {
crv: "P-256", crv: "P-256",
kty: "EC", kty: "EC",
r#use: "sig", r#use: "sig",
x: base64::encode_config(x, URL_SAFE_NO_PAD), x: BASE64_URL_SAFE_NO_PAD.encode(x),
y: base64::encode_config(y, URL_SAFE_NO_PAD), y: BASE64_URL_SAFE_NO_PAD.encode(y),
} }
} }