From 556b9cb6719c6593d208ee9c1c188a07fe6244e6 Mon Sep 17 00:00:00 2001 From: BlackHoleFox Date: Tue, 9 Jun 2020 18:42:56 -0500 Subject: [PATCH] Remove dependency on regular num-bigint --- Cargo.lock | 2 -- Cargo.toml | 3 +-- src/certificate.rs | 3 ++- src/key.rs | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1ad037..e9739ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,7 +424,6 @@ dependencies = [ "autocfg 1.0.0", "num-integer", "num-traits", - "rand 0.5.6", ] [[package]] @@ -1063,7 +1062,6 @@ dependencies = [ "lazy_static", "log", "nom", - "num-bigint", "num-bigint-dig", "num-integer", "num-traits", diff --git a/Cargo.toml b/Cargo.toml index ae2d756..e60c7e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,7 @@ getrandom = "0.1" hmac = "0.7" log = "0.4" nom = "5" -num-bigint_rsa = { version = "0.6", features = ["rand"], package = "num-bigint-dig" } -num-bigint = { version = "0.2", features = ["rand"] } +num-bigint = { version = "0.6", features = ["rand"], package = "num-bigint-dig" } num-traits = "0.2" num-integer = "0.1" pbkdf2 = "0.3" diff --git a/src/certificate.rs b/src/certificate.rs index 4f07f4e..da1d08e 100644 --- a/src/certificate.rs +++ b/src/certificate.rs @@ -476,7 +476,8 @@ impl Certificate { _ => return Err(Error::InvalidObject), }; - let serial = parsed_cert.tbs_certificate.serial.into(); + let serial = Serial::try_from(parsed_cert.tbs_certificate.serial.to_bytes_be().as_slice()) + .map_err(|_| Error::InvalidObject)?; let issuer = parsed_cert.tbs_certificate.issuer.to_string(); let subject = parsed_cert.tbs_certificate.subject.to_string(); let subject_pki = PublicKeyInfo::parse(&parsed_cert.tbs_certificate.subject_pki)?; diff --git a/src/key.rs b/src/key.rs index e38e1f9..d3ab85b 100644 --- a/src/key.rs +++ b/src/key.rs @@ -59,7 +59,7 @@ use crate::{ use elliptic_curve::weierstrass::PublicKey as EcPublicKey; use log::{error, warn}; #[cfg(feature = "untested")] -use num_bigint_rsa::traits::ModInverse; +use num_bigint::traits::ModInverse; #[cfg(feature = "untested")] use num_integer::Integer; #[cfg(feature = "untested")]