Bump p256 to v0.5; p384 to v0.4; MSRV 1.44+

2020-10-17 13:32:05 -07:00
parent 08220032db
commit cbe60413cb
6 changed files with 80 additions and 19 deletions
@@ -39,7 +39,7 @@ use crate::{
    Buffer,
 };
 use chrono::{DateTime, Utc};
-use elliptic_curve::weierstrass::PublicKey as EcPublicKey;
+use elliptic_curve::sec1::EncodedPoint as EcPublicKey;
 use log::error;
 use num_bigint::BigUint;
 use p256::NistP256;
@@ -208,10 +208,10 @@ impl PublicKeyInfo {
                match read_pki::ec_parameters(&subject_pki.algorithm.parameters)? {
                    AlgorithmId::EccP256 => EcPublicKey::from_bytes(key_bytes)
                        .map(PublicKeyInfo::EcP256)
-                        .ok_or(Error::InvalidObject),
+                        .map_err(|_| Error::InvalidObject),
                    AlgorithmId::EccP384 => EcPublicKey::from_bytes(key_bytes)
                        .map(PublicKeyInfo::EcP384)
-                        .ok_or(Error::InvalidObject),
+                        .map_err(|_| Error::InvalidObject),
                    _ => Err(Error::AlgorithmError),
                }
            }