From 002cf1f083972349adf6c4cee9c5ebbe5691a0e3 Mon Sep 17 00:00:00 2001 From: Justin Smith Date: Thu, 23 Jan 2025 12:21:17 -0500 Subject: [PATCH] Fix spelling --- aws-lc-rs/src/agreement.rs | 12 ++++++------ aws-lc-rs/src/ec/key_pair.rs | 2 +- aws-lc-rs/src/ec/signature.rs | 2 +- aws-lc-rs/src/ed25519.rs | 14 +++++++------- aws-lc-rs/src/evp_pkey.rs | 4 ++-- aws-lc-rs/src/rsa/encoding.rs | 2 +- aws-lc-rs/src/rsa/encryption.rs | 4 ++-- aws-lc-rs/src/rsa/key.rs | 12 ++++++------ 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/aws-lc-rs/src/agreement.rs b/aws-lc-rs/src/agreement.rs index cd55f8c2874..fd6810d53fb 100644 --- a/aws-lc-rs/src/agreement.rs +++ b/aws-lc-rs/src/agreement.rs @@ -53,11 +53,6 @@ mod ephemeral; pub use ephemeral::{agree_ephemeral, EphemeralPrivateKey}; -use crate::ec::evp_key_generate; -use crate::error::{KeyRejected, Unspecified}; -use crate::fips::indicator_check; -use crate::ptr::{ConstPointer, LcPtr}; -use crate::{ec, hex}; use crate::aws_lc::{ EVP_PKEY_CTX_new_id, EVP_PKEY_derive, EVP_PKEY_derive_init, EVP_PKEY_derive_set_peer, EVP_PKEY_get0_EC_KEY, EVP_PKEY_get_raw_private_key, EVP_PKEY_get_raw_public_key, @@ -65,6 +60,11 @@ use crate::aws_lc::{ EVP_PKEY_new_raw_public_key, NID_X9_62_prime256v1, NID_secp384r1, NID_secp521r1, EVP_PKEY, EVP_PKEY_X25519, NID_X25519, }; +use crate::ec::evp_key_generate; +use crate::error::{KeyRejected, Unspecified}; +use crate::fips::indicator_check; +use crate::ptr::{ConstPointer, LcPtr}; +use crate::{ec, hex}; use crate::buffer::Buffer; use crate::encoding::{ @@ -601,7 +601,7 @@ impl AsDer> for PublicKey { | KeyInner::ECDH_P384(evp_pkey) | KeyInner::ECDH_P521(evp_pkey) | KeyInner::X25519(evp_pkey) => { - let der = evp_pkey.marshall_rfc5280_public_key()?; + let der = evp_pkey.marshal_rfc5280_public_key()?; Ok(PublicKeyX509Der::from(Buffer::new(der))) } } diff --git a/aws-lc-rs/src/ec/key_pair.rs b/aws-lc-rs/src/ec/key_pair.rs index 4f5449cf59f..bcd7197c98c 100644 --- a/aws-lc-rs/src/ec/key_pair.rs +++ b/aws-lc-rs/src/ec/key_pair.rs @@ -130,7 +130,7 @@ impl EcdsaKeyPair { /// pub fn to_pkcs8v1(&self) -> Result { Ok(Document::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V1)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V1)?, )) } diff --git a/aws-lc-rs/src/ec/signature.rs b/aws-lc-rs/src/ec/signature.rs index fe5d88fd065..2b39add5453 100644 --- a/aws-lc-rs/src/ec/signature.rs +++ b/aws-lc-rs/src/ec/signature.rs @@ -123,7 +123,7 @@ impl AsDer> for PublicKey { /// # Errors /// Returns an error if the public key fails to marshal to X.509. fn as_der(&self) -> Result, Unspecified> { - let der = self.evp_pkey.marshall_rfc5280_public_key()?; + let der = self.evp_pkey.marshal_rfc5280_public_key()?; Ok(PublicKeyX509Der::new(der)) } } diff --git a/aws-lc-rs/src/ed25519.rs b/aws-lc-rs/src/ed25519.rs index c598fd398d7..02859cc8d22 100644 --- a/aws-lc-rs/src/ed25519.rs +++ b/aws-lc-rs/src/ed25519.rs @@ -194,7 +194,7 @@ impl AsDer> for PublicKey { // 2:d=1 hl=2 l= 5 cons: SEQUENCE // 4:d=2 hl=2 l= 3 prim: OBJECT :ED25519 // 9:d=1 hl=2 l= 33 prim: BIT STRING - let der = self.evp_pkey.marshall_rfc5280_public_key()?; + let der = self.evp_pkey.marshal_rfc5280_public_key()?; Ok(PublicKeyX509Der::from(Buffer::new(der))) } } @@ -279,7 +279,7 @@ impl Ed25519KeyPair { pub fn generate_pkcs8(_rng: &dyn SecureRandom) -> Result { let evp_pkey = generate_key()?; Ok(Document::new( - evp_pkey.marshall_rfc5208_private_key(Version::V2)?, + evp_pkey.marshal_rfc5208_private_key(Version::V2)?, )) } @@ -290,7 +290,7 @@ impl Ed25519KeyPair { /// pub fn to_pkcs8(&self) -> Result { Ok(Document::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V2)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V2)?, )) } @@ -311,7 +311,7 @@ impl Ed25519KeyPair { pub fn generate_pkcs8v1(_rng: &dyn SecureRandom) -> Result { let evp_pkey = generate_key()?; Ok(Document::new( - evp_pkey.marshall_rfc5208_private_key(Version::V1)?, + evp_pkey.marshal_rfc5208_private_key(Version::V1)?, )) } @@ -322,7 +322,7 @@ impl Ed25519KeyPair { /// pub fn to_pkcs8v1(&self) -> Result { Ok(Document::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V1)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V1)?, )) } @@ -536,7 +536,7 @@ impl AsDer> for Ed25519KeyPair { /// `error::Unspecified` on internal error. fn as_der(&self) -> Result, crate::error::Unspecified> { Ok(Pkcs8V1Der::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V1)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V1)?, )) } } @@ -548,7 +548,7 @@ impl AsDer> for Ed25519KeyPair { /// `error::Unspecified` on internal error. fn as_der(&self) -> Result, crate::error::Unspecified> { Ok(Pkcs8V2Der::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V2)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V2)?, )) } } diff --git a/aws-lc-rs/src/evp_pkey.rs b/aws-lc-rs/src/evp_pkey.rs index 153bd852fb6..4e8de52f688 100644 --- a/aws-lc-rs/src/evp_pkey.rs +++ b/aws-lc-rs/src/evp_pkey.rs @@ -78,7 +78,7 @@ impl LcPtr { } } - pub(crate) fn marshall_rfc5280_public_key(&self) -> Result, Unspecified> { + pub(crate) fn marshal_rfc5280_public_key(&self) -> Result, Unspecified> { let key_size_bytes: usize = unsafe { EVP_PKEY_bits(*self.as_const()) / 8 }.try_into()?; // Data shows that the SubjectPublicKeyInfo is roughly 356% to 375% increase in size compared to the RSA key // size in bytes for keys ranging from 2048-bit to 4096-bit. So size the initial capacity to be roughly @@ -104,7 +104,7 @@ impl LcPtr { .ok_or(KeyRejected::wrong_algorithm()) } - pub(crate) fn marshall_rfc5208_private_key( + pub(crate) fn marshal_rfc5208_private_key( &self, version: Version, ) -> Result, Unspecified> { diff --git a/aws-lc-rs/src/rsa/encoding.rs b/aws-lc-rs/src/rsa/encoding.rs index 0bfbdf19043..8be3d0926c0 100644 --- a/aws-lc-rs/src/rsa/encoding.rs +++ b/aws-lc-rs/src/rsa/encoding.rs @@ -94,7 +94,7 @@ pub(in crate::rsa) mod rfc5280 { pub(in crate::rsa) fn encode_public_key_der( key: &LcPtr, ) -> Result, Unspecified> { - let der = key.marshall_rfc5280_public_key()?; + let der = key.marshal_rfc5280_public_key()?; Ok(PublicKeyX509Der::from(Buffer::new(der))) } diff --git a/aws-lc-rs/src/rsa/encryption.rs b/aws-lc-rs/src/rsa/encryption.rs index 2effc2c4d11..f90b602d4d5 100644 --- a/aws-lc-rs/src/rsa/encryption.rs +++ b/aws-lc-rs/src/rsa/encryption.rs @@ -9,13 +9,13 @@ use super::{ key::{generate_rsa_key, is_rsa_key, key_size_bits, key_size_bytes}, KeySize, }; +use crate::aws_lc::{EVP_PKEY, EVP_PKEY_RSA}; use crate::pkcs8::Version; use crate::{ encoding::{AsDer, Pkcs8V1Der, PublicKeyX509Der}, error::{KeyRejected, Unspecified}, ptr::LcPtr, }; -use crate::aws_lc::{EVP_PKEY, EVP_PKEY_RSA}; use core::fmt::Debug; /// RSA Encryption Algorithm Identifier @@ -134,7 +134,7 @@ impl Debug for PrivateDecryptingKey { impl AsDer> for PrivateDecryptingKey { fn as_der(&self) -> Result, Unspecified> { Ok(Pkcs8V1Der::new( - self.0.marshall_rfc5208_private_key(Version::V1)?, + self.0.marshal_rfc5208_private_key(Version::V1)?, )) } } diff --git a/aws-lc-rs/src/rsa/key.rs b/aws-lc-rs/src/rsa/key.rs index 4907a4a9b3d..b350a69ff90 100644 --- a/aws-lc-rs/src/rsa/key.rs +++ b/aws-lc-rs/src/rsa/key.rs @@ -8,6 +8,11 @@ use super::{ signature::{compute_rsa_signature, RsaEncoding, RsaPadding}, RsaParameters, }; +use crate::aws_lc::{ + EVP_DigestSignInit, EVP_PKEY_assign_RSA, EVP_PKEY_bits, EVP_PKEY_new, EVP_PKEY_size, + RSA_generate_key_ex, RSA_generate_key_fips, RSA_new, RSA_set0_key, RSA_size, BIGNUM, EVP_PKEY, + EVP_PKEY_CTX, EVP_PKEY_RSA, +}; #[cfg(feature = "ring-io")] use crate::io; #[cfg(feature = "ring-io")] @@ -25,11 +30,6 @@ use crate::{ }; #[cfg(feature = "fips")] use aws_lc::RSA_check_fips; -use crate::aws_lc::{ - EVP_DigestSignInit, EVP_PKEY_assign_RSA, EVP_PKEY_bits, EVP_PKEY_new, EVP_PKEY_size, - RSA_generate_key_ex, RSA_generate_key_fips, RSA_new, RSA_set0_key, RSA_size, BIGNUM, EVP_PKEY, - EVP_PKEY_CTX, EVP_PKEY_RSA, -}; #[cfg(feature = "ring-io")] use aws_lc::{RSA_get0_e, RSA_get0_n}; use core::{ @@ -289,7 +289,7 @@ impl crate::signature::KeyPair for KeyPair { impl AsDer> for KeyPair { fn as_der(&self) -> Result, Unspecified> { Ok(Pkcs8V1Der::new( - self.evp_pkey.marshall_rfc5208_private_key(Version::V1)?, + self.evp_pkey.marshal_rfc5208_private_key(Version::V1)?, )) } }