Update dependencies (#315)

* Update rsa dependency to 0.5

* Update pbkdf dependency to 0.9

* Update x509-parser dependency to 0.11

* Update crypto-bigint subdepdendency to 0.2.6
This commit is contained in:
Benno Rice
2021-09-11 03:44:59 +10:00
committed by GitHub
parent 3905104b52
commit 54ce90d51d
5 changed files with 48 additions and 54 deletions
+7 -7
View File
@@ -45,7 +45,7 @@ use log::error;
use num_bigint_dig::BigUint;
use p256::NistP256;
use p384::NistP384;
use rsa::{PublicKeyParts, RSAPublicKey};
use rsa::{PublicKeyParts, RsaPublicKey};
use sha2::{Digest, Sha256};
use std::convert::TryFrom;
use std::fmt;
@@ -172,7 +172,7 @@ pub enum PublicKeyInfo {
algorithm: AlgorithmId,
/// Public key
pubkey: RSAPublicKey,
pubkey: RsaPublicKey,
},
/// EC P-256 keys
@@ -594,7 +594,7 @@ mod read_pki {
*,
};
use nom::{combinator, IResult};
use rsa::{BigUint, RSAPublicKey};
use rsa::{BigUint, RsaPublicKey};
use super::{OID_NIST_P256, OID_NIST_P384};
use crate::{piv::AlgorithmId, Error, Result};
@@ -606,7 +606,7 @@ mod read_pki {
/// publicExponent INTEGER -- e
/// }
/// ```
pub(super) fn rsa_pubkey(encoded: &[u8]) -> Result<RSAPublicKey> {
pub(super) fn rsa_pubkey(encoded: &[u8]) -> Result<RsaPublicKey> {
fn parse_rsa_pubkey(i: &[u8]) -> IResult<&[u8], DerObject<'_>, BerError> {
parse_der_sequence_defined!(i, parse_der_integer >> parse_der_integer)
}
@@ -634,7 +634,7 @@ mod read_pki {
_ => return Err(Error::InvalidObject),
};
RSAPublicKey::new(n, e).map_err(|_| Error::InvalidObject)
RsaPublicKey::new(n, e).map_err(|_| Error::InvalidObject)
}
/// From [RFC 5480](https://tools.ietf.org/html/rfc5480#section-2.1.1):
@@ -658,7 +658,7 @@ mod read_pki {
mod write_pki {
use cookie_factory::{SerializeFn, WriteContext};
use rsa::{BigUint, PublicKeyParts, RSAPublicKey};
use rsa::{BigUint, PublicKeyParts, RsaPublicKey};
use std::io::Write;
use x509::der::write::{der_integer, der_sequence};
@@ -675,7 +675,7 @@ mod write_pki {
/// }
/// ```
pub(super) fn rsa_pubkey<'a, W: Write + 'a>(
pubkey: &'a RSAPublicKey,
pubkey: &'a RsaPublicKey,
) -> impl SerializeFn<W> + 'a {
der_sequence((
der_integer_biguint(pubkey.n()),
+2 -2
View File
@@ -54,7 +54,7 @@ use crate::{
};
use elliptic_curve::sec1::EncodedPoint as EcPublicKey;
use log::{debug, error, warn};
use rsa::{BigUint, RSAPublicKey};
use rsa::{BigUint, RsaPublicKey};
use std::{convert::TryFrom, str::FromStr};
#[cfg(feature = "untested")]
@@ -624,7 +624,7 @@ pub fn generate(
Ok(PublicKeyInfo::Rsa {
algorithm,
pubkey: RSAPublicKey::new(
pubkey: RsaPublicKey::new(
BigUint::from_bytes_be(&modulus),
BigUint::from_bytes_be(&exp),
)