Update rsa to v0.3 & other dependencies (#142)

* Update rsa to v0.3 & other dependencies
This commit is contained in:
Shella Stephens
2020-06-15 16:40:33 -07:00
committed by GitHub
parent 15f9e265e6
commit 860c163eb9
5 changed files with 239 additions and 294 deletions
+2 -2
View File
@@ -44,7 +44,7 @@ use log::error;
use num_bigint::BigUint;
use p256::NistP256;
use p384::NistP384;
use rsa::{PublicKey, RSAPublicKey};
use rsa::{PublicKeyParts, RSAPublicKey};
use sha2::{Digest, Sha256};
use std::convert::TryFrom;
use std::fmt;
@@ -648,7 +648,7 @@ mod read_pki {
mod write_pki {
use cookie_factory::{SerializeFn, WriteContext};
use rsa::{BigUint, PublicKey, RSAPublicKey};
use rsa::{BigUint, PublicKeyParts, RSAPublicKey};
use std::io::Write;
use x509::der::write::{der_integer, der_sequence};
+2 -2
View File
@@ -42,7 +42,7 @@ use crate::{
TAG_ADMIN_SALT, TAG_PROTECTED, TAG_PROTECTED_MGM,
};
use des::{
block_cipher_trait::{generic_array::GenericArray, BlockCipher},
block_cipher::{generic_array::GenericArray, BlockCipher, NewBlockCipher},
TdesEde3,
};
#[cfg(feature = "untested")]
@@ -70,7 +70,7 @@ pub(crate) const DES_LEN_3DES: usize = DES_LEN_DES * 3;
/// Number of PBKDF2 iterations to use when deriving from a password
#[cfg(feature = "untested")]
const ITER_MGM_PBKDF2: usize = 10000;
const ITER_MGM_PBKDF2: u32 = 10000;
/// Management Key (MGM) key types (manual/derived/protected)
#[derive(Copy, Clone, Debug, Eq, PartialEq)]