Create remaining RSA contructors

rustls · Oct 4, 2023 · 8182fbf · 8182fbf
1 parent 83867a1
commit 8182fbf
Showing 1 changed file with 26 additions and 23 deletions.
diff --git a/src/key_pair.rs b/src/key_pair.rs
@@ -105,8 +105,6 @@ impl KeyPair {
 		pkcs8: &[u8],
 		alg: &'static SignatureAlgorithm,
 	) -> Result<Self, Error> {
-		let serialized_der = pkcs8.to_vec();
-
 		if alg == &PKCS_ED25519 {
 			return Ok(Self::pkcs_ed25519(pkcs8)?);
 		}
@@ -120,31 +118,13 @@ impl KeyPair {
 			return Ok(Self::pkcs_rsa_sha256(pkcs8)?);
 		}
 		if alg == &PKCS_RSA_SHA384 {
-			return Ok(KeyPair {
-				kind: KeyPairKind::Rsa(
-					RsaKeyPair::from_pkcs8(pkcs8)?,
-					&signature::RSA_PKCS1_SHA384,
-				),
-				alg,
-				serialized_der,
-			});
+			return Ok(Self::pkcs_rsa_sha384(pkcs8)?);
 		}
 		if alg == &PKCS_RSA_SHA512 {
-			return Ok(KeyPair {
-				kind: KeyPairKind::Rsa(
-					RsaKeyPair::from_pkcs8(pkcs8)?,
-					&signature::RSA_PKCS1_SHA512,
-				),
-				alg,
-				serialized_der,
-			});
+			return Ok(Self::pkcs_rsa_sha512(pkcs8)?);
 		}
 		if alg == &PKCS_RSA_PSS_SHA256 {
-			return Ok(KeyPair {
-				kind: KeyPairKind::Rsa(RsaKeyPair::from_pkcs8(pkcs8)?, &signature::RSA_PSS_SHA256),
-				alg,
-				serialized_der,
-			});
+			return Ok(Self::pkcs_rsa_pss_sha256(pkcs8)?);
 		}
 
 		panic!("Unknown SignatureAlgorithm specified!")
@@ -207,6 +187,29 @@ impl KeyPair {
 			serialized_der: pkcs8.to_vec(),
 		})
 	}
+
+	fn pkcs_rsa_pss_sha256(pkcs8: &[u8]) -> Result<KeyPair, Error> {
+		Ok(KeyPair {
+			kind: KeyPairKind::Rsa(RsaKeyPair::from_pkcs8(pkcs8)?, &signature::RSA_PSS_SHA256),
+			alg: &PKCS_RSA_PSS_SHA256,
+			serialized_der: pkcs8.to_vec(),
+		})
+	}
+
+	fn pkcs_rsa_sha384(pkcs8: &[u8]) -> Result<KeyPair, Error> {
+		Ok(KeyPair {
+			kind: KeyPairKind::Rsa(RsaKeyPair::from_pkcs8(pkcs8)?, &signature::RSA_PKCS1_SHA384),
+			alg: &PKCS_RSA_SHA384,
+			serialized_der: pkcs8.to_vec(),
+		})
+	}
+	fn pkcs_rsa_sha512(pkcs8: &[u8]) -> Result<KeyPair, Error> {
+		Ok(KeyPair {
+			kind: KeyPairKind::Rsa(RsaKeyPair::from_pkcs8(pkcs8)?, &signature::RSA_PKCS1_SHA512),
+			alg: &PKCS_RSA_SHA512,
+			serialized_der: pkcs8.to_vec(),
+		})
+	}
 }
 
 /// A private key that is not directly accessible, but can be used to sign messages