Skip to content

Commit 2a21329

Browse files
audunhallandcpu
authored andcommitted
Revert "refactor: Generalize csr/crl signed_by to take &impl AsRef issuer"
This reverts commit 5a0e2bf.
1 parent 9025af3 commit 2a21329

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

rcgen/src/certificate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl CertificateParams {
158158
pub fn signed_by(
159159
self,
160160
public_key: &impl PublicKeyData,
161-
issuer: &impl AsRef<CertificateParams>,
161+
issuer: &impl AsRef<Self>,
162162
issuer_key: &KeyPair,
163163
) -> Result<Certificate, Error> {
164164
let issuer = Issuer {

rcgen/src/crl.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use yasna::Tag;
99
use crate::ENCODE_CONFIG;
1010
use crate::{
1111
oid, write_distinguished_name, write_dt_utc_or_generalized,
12-
write_x509_authority_key_identifier, write_x509_extension, CertificateParams, Error, Issuer,
12+
write_x509_authority_key_identifier, write_x509_extension, Certificate, Error, Issuer,
1313
KeyIdMethod, KeyPair, KeyUsagePurpose, SerialNumber,
1414
};
1515

@@ -190,17 +190,17 @@ impl CertificateRevocationListParams {
190190
/// Including a signature from the issuing certificate authority's key.
191191
pub fn signed_by(
192192
self,
193-
issuer: &impl AsRef<CertificateParams>,
193+
issuer: &Certificate,
194194
issuer_key: &KeyPair,
195195
) -> Result<CertificateRevocationList, Error> {
196196
if self.next_update.le(&self.this_update) {
197197
return Err(Error::InvalidCrlNextUpdate);
198198
}
199199

200200
let issuer = Issuer {
201-
distinguished_name: &issuer.as_ref().distinguished_name,
202-
key_identifier_method: &issuer.as_ref().key_identifier_method,
203-
key_usages: &issuer.as_ref().key_usages,
201+
distinguished_name: &issuer.params.distinguished_name,
202+
key_identifier_method: &issuer.params.key_identifier_method,
203+
key_usages: &issuer.params.key_usages,
204204
key_pair: issuer_key,
205205
};
206206

rcgen/src/csr.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ impl CertificateSigningRequestParams {
194194
///
195195
/// The returned certificate will have its issuer field set to the subject of the provided
196196
/// `issuer`, and the authority key identifier extension will be populated using the subject
197-
/// public key of `issuer` (typically either a [`CertificateParams`] or
198-
/// [`Certificate`]). It will be signed by `issuer_key`.
197+
/// public key of `issuer`. It will be signed by `issuer_key`.
199198
///
200199
/// Note that no validation of the `issuer` certificate is performed. Rcgen will not require
201200
/// the certificate to be a CA certificate, or have key usage extensions that allow signing.
@@ -204,13 +203,13 @@ impl CertificateSigningRequestParams {
204203
/// [`Certificate::pem`].
205204
pub fn signed_by(
206205
self,
207-
issuer: &impl AsRef<CertificateParams>,
206+
issuer: &Certificate,
208207
issuer_key: &KeyPair,
209208
) -> Result<Certificate, Error> {
210209
let issuer = Issuer {
211-
distinguished_name: &issuer.as_ref().distinguished_name,
212-
key_identifier_method: &issuer.as_ref().key_identifier_method,
213-
key_usages: &issuer.as_ref().key_usages,
210+
distinguished_name: &issuer.params.distinguished_name,
211+
key_identifier_method: &issuer.params.key_identifier_method,
212+
key_usages: &issuer.params.key_usages,
214213
key_pair: issuer_key,
215214
};
216215

0 commit comments

Comments
 (0)