Skip to content

Commit

Permalink
fix(server): fix build against workspace asn1
Browse files Browse the repository at this point in the history
Signed-off-by: Marc-André Lureau <[email protected]>
  • Loading branch information
elmarco authored and CBenoit committed Nov 26, 2024
1 parent d6810cc commit 812ba3a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion picky-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish = false

[dependencies]
picky = { version = "7.0.0-rc.8", default-features = false, features = ["x509", "jose", "pkcs7", "ssh", "time_conversion" ], path = "../picky" }
picky-asn1 = { version = "0.7", path = "../picky-asn1" }
picky-asn1 = { version = "0.9", path = "../picky-asn1" }
mongodm = { version = "0.8", features = ["tokio-runtime"] }
clap = { version = "2.33", features = ["yaml"] }
saphir = { version = "2.8", features = ["macro"] }
Expand Down
2 changes: 1 addition & 1 deletion picky-server/src/picky_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ impl Picky {
pub fn parse_pk_from_magic_der(der: &[u8]) -> Result<PrivateKey, PickyError> {
match PrivateKey::from_pkcs8(&der) {
Ok(pk) => Ok(pk),
Err(pkcs8_err) => PrivateKey::from_rsa_der(der)
Err(pkcs8_err) => PrivateKey::from_pkcs1(der)
.map_err(|rsa_der_err| PickyError::PrivateKeyParsing { pkcs8_err, rsa_der_err }),
}
}
Expand Down

0 comments on commit 812ba3a

Please sign in to comment.