diff --git a/aws-lc-rs/src/rsa/encoding.rs b/aws-lc-rs/src/rsa/encoding.rs
index 548142ab11a..bd638ab8f63 100644
--- a/aws-lc-rs/src/rsa/encoding.rs
+++ b/aws-lc-rs/src/rsa/encoding.rs
@@ -55,7 +55,7 @@ pub(in crate::rsa) mod rfc8017 {
         ptr::{DetachableLcPtr, LcPtr},
     };
     use aws_lc::{
-        EVP_PKEY_assign_RSA, EVP_PKEY_new, RSA_parse_private_key, RSA_parse_public_key,
+        EVP_PKEY_assign_RSA, EVP_PKEY_new, RSA_parse_private_key, RSA_public_key_from_bytes,
         RSA_public_key_to_bytes, EVP_PKEY,
     };
     use std::ptr::null_mut;
@@ -84,9 +84,9 @@ pub(in crate::rsa) mod rfc8017 {
     pub(in crate::rsa) fn decode_public_key_der(
         public_key: &[u8],
     ) -> Result<LcPtr<EVP_PKEY>, KeyRejected> {
-        let mut cbs = unsafe { cbs::build_CBS(public_key) };
-
-        let rsa = DetachableLcPtr::new(unsafe { RSA_parse_public_key(&mut cbs) })?;
+        let rsa = DetachableLcPtr::new(unsafe {
+            RSA_public_key_from_bytes(public_key.as_ptr(), public_key.len())
+        })?;
 
         let pkey = LcPtr::new(unsafe { EVP_PKEY_new() })?;
 
@@ -130,14 +130,19 @@ pub(in crate::rsa) mod rfc5280 {
         encoding::PublicKeyX509Der,
         error::{KeyRejected, Unspecified},
         ptr::LcPtr,
-        rsa::key::is_rsa_key,
+        rsa::key::{is_rsa_key, key_size_bytes},
     };
     use aws_lc::{EVP_marshal_public_key, EVP_parse_public_key, EVP_PKEY};
 
     pub(in crate::rsa) fn encode_public_key_der(
         key: &LcPtr<EVP_PKEY>,
     ) -> Result<PublicKeyX509Der<'static>, Unspecified> {
-        let mut der = LcCBB::new(1024);
+        // Data shows that the SubjectPublicKeyInfo is roughly 356% to 375% increase in size comapred to the RSA key
+        // size in bytes for keys ranging from 2048-bit to 4096-bit. So size the initial capacity to be roughly
+        // 400% as a consernative estimate to avoid needing to reallocate for any key in that range.
+        let key_size_bytes = key_size_bytes(key);
+
+        let mut der = LcCBB::new(key_size_bytes + (key_size_bytes * 4));
 
         if 1 != unsafe { EVP_marshal_public_key(der.as_mut_ptr(), **key) } {
             return Err(Unspecified);
diff --git a/aws-lc-rs/src/rsa/encryption.rs b/aws-lc-rs/src/rsa/encryption.rs
index adae9107705..2b276129faa 100644
--- a/aws-lc-rs/src/rsa/encryption.rs
+++ b/aws-lc-rs/src/rsa/encryption.rs
@@ -121,7 +121,13 @@ impl PrivateDecryptingKey {
         }
     }
 
-    /// Generate a new RSA private key for use with asymmetrical encryption.
+    /// Generate a new RSA private key pair for use with asymmetrical encryption.
+    ///
+    /// Supports the following key sizes:
+    /// * `KeySize::Rsa2048`
+    /// * `KeySize::Rsa3072`
+    /// * `KeySize::Rsa4096`
+    /// * `KeySize::Rsa8192`
     ///
     /// # Errors
     /// * `Unspecified` for any error that occurs during the generation of the RSA keypair.
@@ -130,12 +136,12 @@ impl PrivateDecryptingKey {
         Self::new(key)
     }
 
-    /// Generate a RSA `KeyPair` of the specified key-strength.
+    /// Generate a new RSA private key pair for use with asymmetrical encryption.
     ///
     /// Supports the following key sizes:
-    /// * `EncryptionKeySize::Rsa2048`
-    /// * `EncryptionKeySize::Rsa3072`
-    /// * `EncryptionKeySize::Rsa4096`
+    /// * `KeySize::Rsa2048`
+    /// * `KeySize::Rsa3072`
+    /// * `KeySize::Rsa4096`
     ///
     /// # Errors
     /// * `Unspecified`: Any key generation failure.
diff --git a/aws-lc-rs/tests/rsa_test.rs b/aws-lc-rs/tests/rsa_test.rs
index 24b12fa727d..075c5c61577 100644
--- a/aws-lc-rs/tests/rsa_test.rs
+++ b/aws-lc-rs/tests/rsa_test.rs
@@ -59,7 +59,6 @@ fn test_signature_rsa_pkcs1_sign() {
     let rng = rand::SystemRandom::new();
     test::run(
         test_file!("data/rsa_pkcs1_sign_tests.txt"),
-        // test_file!("data/debug.txt"),
         |section, test_case| {
             assert_eq!(section, "");
             let digest_name = test_case.consume_string("Digest");