Browse Source

Update the base64 dependency

pull/88/head
Rodolphe Bréard 2 years ago
parent
commit
fb002c5a04
  1. 2
      acme_common/Cargo.toml
  2. 11
      acme_common/src/lib.rs

2
acme_common/Cargo.toml

@ -20,7 +20,7 @@ openssl_vendored = ["crypto_openssl", "openssl/vendored", "openssl-sys/vendored"
[dependencies] [dependencies]
attohttpc = { version = "0.24", default-features = false } attohttpc = { version = "0.24", default-features = false }
base64 = "0.20"
base64 = "0.21"
daemonize = "0.4" daemonize = "0.4"
env_logger = "0.10" env_logger = "0.10"
glob = "0.3" glob = "0.3"

11
acme_common/src/lib.rs

@ -1,3 +1,4 @@
use base64::Engine;
use daemonize::Daemonize; use daemonize::Daemonize;
use std::fs::File; use std::fs::File;
use std::io::prelude::*; use std::io::prelude::*;
@ -9,12 +10,6 @@ pub mod logs;
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
const URL_SAFE_NO_PAD: base64::engine::fast_portable::FastPortable =
base64::engine::fast_portable::FastPortable::from(
&base64::alphabet::URL_SAFE,
base64::engine::fast_portable::NO_PAD,
);
macro_rules! exit_match { macro_rules! exit_match {
($e: expr) => { ($e: expr) => {
match $e { match $e {
@ -45,11 +40,11 @@ pub fn to_idna(domain_name: &str) -> Result<String, error::Error> {
} }
pub fn b64_encode<T: ?Sized + AsRef<[u8]>>(input: &T) -> String { pub fn b64_encode<T: ?Sized + AsRef<[u8]>>(input: &T) -> String {
base64::encode_engine(input, &URL_SAFE_NO_PAD)
base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(input)
} }
pub fn b64_decode<T: ?Sized + AsRef<[u8]>>(input: &T) -> Result<Vec<u8>, error::Error> { pub fn b64_decode<T: ?Sized + AsRef<[u8]>>(input: &T) -> Result<Vec<u8>, error::Error> {
let res = base64::decode_engine(input, &URL_SAFE_NO_PAD)?;
let res = base64::engine::general_purpose::URL_SAFE_NO_PAD.decode(input)?;
Ok(res) Ok(res)
} }

Loading…
Cancel
Save