This commit is contained in:
OKAMURA, Yasunobu 2021-01-03 19:47:32 +09:00
parent 8b10ce8a91
commit 2e633283aa
3 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
[package] [package]
name = "jsonwebkey-cli" name = "jsonwebkey-cli"
version = "0.1.1" version = "0.1.2"
authors = ["Okamura Yasunobu <okamura@informationsea.info>"] authors = ["Okamura Yasunobu <okamura@informationsea.info>"]
edition = "2018" edition = "2018"
license = "Apache-2.0" license = "Apache-2.0"
@ -14,5 +14,5 @@ categories = ["authentication"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
jsonwebkey-convert = {version = "0.2", path = "../jsonwebkey-convert"} jsonwebkey-convert = {version = "0.3", path = "../jsonwebkey-convert"}
clap = "2" clap = "2"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "jsonwebkey-convert" name = "jsonwebkey-convert"
version = "0.2.0" version = "0.3.0"
authors = ["Okamura Yasunobu <okamura@informationsea.info>"] authors = ["Okamura Yasunobu <okamura@informationsea.info>"]
edition = "2018" edition = "2018"
license = "Apache-2.0" license = "Apache-2.0"

View file

@ -48,7 +48,7 @@ pub enum JWKConvertError {
#[error(transparent)] #[error(transparent)]
ANS1EncodeError(#[from] simple_asn1::ASN1EncodeErr), ANS1EncodeError(#[from] simple_asn1::ASN1EncodeErr),
#[error(transparent)] #[error(transparent)]
PEMParseErrror(#[from] pem::PemError), PEMParseError(#[from] pem::PemError),
#[error(transparent)] #[error(transparent)]
Base64UrlError(#[from] base64_url::base64::DecodeError), Base64UrlError(#[from] base64_url::base64::DecodeError),
#[error(transparent)] #[error(transparent)]
@ -252,7 +252,7 @@ pub fn load_der(data: &[u8]) -> Result<RSAPubKey, JWKConvertError> {
/// Load an RSA public key from PEM format /// Load an RSA public key from PEM format
pub fn load_pem(data: &[u8]) -> Result<RSAPubKey, JWKConvertError> { pub fn load_pem(data: &[u8]) -> Result<RSAPubKey, JWKConvertError> {
let data = pem::parse(data).map_err(JWKConvertError::PEMParseErrror)?; let data = pem::parse(data)?;
load_der(&data.contents) load_der(&data.contents)
} }