From bbd63fbba42a682636484b6cacd33a2d88f6ea5e Mon Sep 17 00:00:00 2001 From: phayes Date: Mon, 18 Mar 2019 09:29:05 -0700 Subject: [PATCH] Switch to using for all crate level uses --- src/algorithms.rs | 4 ++-- src/internals.rs | 4 ++-- src/key.rs | 12 ++++++------ src/pkcs1v15.rs | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/algorithms.rs b/src/algorithms.rs index 352b6be..a02e884 100644 --- a/src/algorithms.rs +++ b/src/algorithms.rs @@ -3,8 +3,8 @@ use num_bigint::{BigUint, RandPrime}; use num_traits::{FromPrimitive, One, Zero}; use rand::Rng; -use errors::{Error, Result}; -use key::RSAPrivateKey; +use crate::errors::{Error, Result}; +use crate::key::RSAPrivateKey; /// Default exponent for RSA keys. const EXP: u64 = 65537; diff --git a/src/internals.rs b/src/internals.rs index 50bc5f2..785413b 100644 --- a/src/internals.rs +++ b/src/internals.rs @@ -1,5 +1,5 @@ -use errors::{Error, Result}; -use key::{PublicKey, RSAPrivateKey}; +use crate::errors::{Error, Result}; +use crate::key::{PublicKey, RSAPrivateKey}; use num_bigint::{BigInt, BigUint, ModInverse, RandBigInt, Sign::Plus}; use num_traits::{One, Signed, Zero}; use rand::Rng; diff --git a/src/key.rs b/src/key.rs index 26d8e0f..92c3f74 100644 --- a/src/key.rs +++ b/src/key.rs @@ -7,11 +7,11 @@ use rand::{Rng, ThreadRng}; #[cfg(feature = "serde1")] use serde::{Deserialize, Serialize}; -use algorithms::generate_multi_prime_key; -use errors::{Error, Result}; -use hash::Hash; -use padding::PaddingScheme; -use pkcs1v15; +use crate::algorithms::generate_multi_prime_key; +use crate::errors::{Error, Result}; +use crate::hash::Hash; +use crate::padding::PaddingScheme; +use crate::pkcs1v15; lazy_static! { static ref MIN_PUB_EXPONENT: BigUint = BigUint::from_u64(2).unwrap(); @@ -445,7 +445,7 @@ pub fn check_public(public_key: &impl PublicKey) -> Result<()> { #[cfg(test)] mod tests { use super::*; - use internals; + use crate::internals; use num_traits::{FromPrimitive, ToPrimitive}; use rand::{thread_rng, ThreadRng}; diff --git a/src/pkcs1v15.rs b/src/pkcs1v15.rs index 0056490..ab4668f 100644 --- a/src/pkcs1v15.rs +++ b/src/pkcs1v15.rs @@ -2,10 +2,10 @@ use num_bigint::BigUint; use rand::Rng; use subtle::{Choice, ConditionallySelectable, ConstantTimeEq}; -use errors::{Error, Result}; -use hash::Hash; -use internals; -use key::{self, PublicKey, RSAPrivateKey}; +use crate::errors::{Error, Result}; +use crate::hash::Hash; +use crate::internals; +use crate::key::{self, PublicKey, RSAPrivateKey}; // Encrypts the given message with RSA and the padding // scheme from PKCS#1 v1.5. The message must be no longer than the @@ -243,9 +243,9 @@ mod tests { use rand::thread_rng; use sha1::{Digest, Sha1}; - use hash::Hashes; - use key::RSAPublicKey; - use padding::PaddingScheme; + use crate::hash::Hashes; + use crate::key::RSAPublicKey; + use crate::padding::PaddingScheme; #[test] fn test_non_zero_bytes() {