Deduplicate SignableCertificateParams construction

Author: djc

rcgen/src/certificate.rs

@@ -144,13 +144,10 @@ impl CertificateParams {
 	) -> Result<Certificate, Error> {
 		let issuer = Issuer::new(&issuer, issuer_key);
 		Ok(Certificate {
-			der: SignableCertificateParams {
-				params: self,
-				pub_key: public_key,
-				issuer: &issuer,
-			}
-			.signed(issuer.key_pair)?
-			.into(),
+			der: self
+				.signable(public_key, &issuer)
+				.signed(issuer.key_pair)?
+				.into(),
 		})
 	}
 
@@ -161,13 +158,10 @@ impl CertificateParams {
 	pub fn self_signed(&self, key_pair: &impl SigningKey) -> Result<Certificate, Error> {
 		let issuer = Issuer::new(self, key_pair);
 		Ok(Certificate {
-			der: SignableCertificateParams {
-				params: self,
-				pub_key: &*key_pair,
-				issuer: &issuer,
-			}
-			.signed(issuer.key_pair)?
-			.into(),
+			der: self
+				.signable(&*key_pair, &issuer)
+				.signed(issuer.key_pair)?
+				.into(),
 		})
 	}
 
@@ -178,6 +172,18 @@ impl CertificateParams {
 			.derive(&key.subject_public_key_info())
 	}
 
+	pub(crate) fn signable<'a, P, S>(
+		&'a self,
+		pub_key: &'a P,
+		issuer: &'a Issuer<'a, S>,
+	) -> SignableCertificateParams<'a, P, S> {
+		SignableCertificateParams {
+			params: self,
+			pub_key,
+			issuer,
+		}
+	}
+
 	/// Parses an existing ca certificate from the ASCII PEM format.
 	///
 	/// See [`from_ca_cert_der`](Self::from_ca_cert_der) for more details.

rcgen/src/csr.rs

@@ -8,9 +8,9 @@ use yasna::{models::ObjectIdentifier, DERWriter, Tag};
 #[cfg(feature = "pem")]
 use crate::ENCODE_CONFIG;
 use crate::{
-	certificate::SignableCertificateParams, key_pair::serialize_public_key_der, oid,
-	write_distinguished_name, write_x509_extension, Attribute, Certificate, CertificateParams,
-	Error, IsCa, Issuer, PublicKeyData, SignatureAlgorithm, SigningKey, ToDer,
+	key_pair::serialize_public_key_der, oid, write_distinguished_name, write_x509_extension,
+	Attribute, Certificate, CertificateParams, Error, IsCa, Issuer, PublicKeyData,
+	SignatureAlgorithm, SigningKey, ToDer,
 };
 #[cfg(feature = "x509-parser")]
 use crate::{DistinguishedName, SanType};
@@ -345,13 +345,11 @@ impl CertificateSigningRequestParams {
 	) -> Result<Certificate, Error> {
 		let issuer = Issuer::new(issuer, issuer_key);
 		Ok(Certificate {
-			der: SignableCertificateParams {
-				params: &self.params,
-				pub_key: &self.public_key,
-				issuer: &issuer,
-			}
-			.signed(issuer.key_pair)?
-			.into(),
+			der: self
+				.params
+				.signable(&self.public_key, &issuer)
+				.signed(issuer.key_pair)?
+				.into(),
 		})
 	}
 }