v0.31.2

src/tls/certificates.rs

@@ -80,8 +80,8 @@ fn generate_locked(directory: &Path, name: &str, hosts: Vec<String>) -> Result<(
             }
         })
         .collect::<Result<Vec<_>>>()?;
-    let rcgen::CertifiedKey { cert, key_pair } = rcgen::generate_simple_self_signed(hosts)?;
-    let key = Zeroizing::new(key_pair.serialize_pem());
+    let rcgen::CertifiedKey { cert, signing_key } = rcgen::generate_simple_self_signed(hosts)?;
+    let key = Zeroizing::new(signing_key.serialize_pem());
     store_pair(directory, name, cert.pem().as_bytes(), key.as_bytes())
 }
 pub fn initialize_default(directory: &Path) -> Result<()> {

src/tls/tests.rs

@@ -77,7 +77,7 @@ mod tests {
             dir.path(),
             "shared-cert",
             generated.cert.pem().as_bytes(),
-            generated.key_pair.serialize_pem().as_bytes(),
+            generated.signing_key.serialize_pem().as_bytes(),
         )
         .unwrap();
         assert!(cert_file.starts_with("external-shared-cert-"));
@@ -100,7 +100,7 @@ mod tests {
         let generated =
             rcgen::generate_simple_self_signed(vec!["reconcile.example.test".into()]).unwrap();
         let certificate = generated.cert.pem();
-        let key = generated.key_pair.serialize_pem();
+        let key = generated.signing_key.serialize_pem();
         let (cert_file, key_file, _) = stage_external_pair(
             dir.path(),
             "reconcile-cert",
@@ -281,7 +281,7 @@ mod tests {
         let b = rcgen::generate_simple_self_signed(vec!["b.localhost".into()]).unwrap();
         assert!(parse_pair(
             a.cert.pem().as_bytes(),
-            b.key_pair.serialize_pem().as_bytes()
+            b.signing_key.serialize_pem().as_bytes()
         )
         .is_err());
         let dir = tempfile::tempdir().unwrap();
@@ -338,7 +338,7 @@ mod tests {
         assert!(upload(
             dir.path(),
             pair.cert.pem().as_bytes(),
-            pair.key_pair.serialize_pem().as_bytes(),
+            pair.signing_key.serialize_pem().as_bytes(),
             hosts,
         )
         .is_ok());
@@ -353,7 +353,7 @@ mod tests {
         ])
         .unwrap();
         let pem = pair.cert.pem();
-        let key = pair.key_pair.serialize_pem();
+        let key = pair.signing_key.serialize_pem();
         assert!(upload(
             dir.path(),
             pem.as_bytes(),

src/tls/tests/acme.rs

@@ -10,7 +10,7 @@ mod acme_tests {
             dir.path(),
             "acme-fixture",
             cert.cert.pem().as_bytes(),
-            cert.key_pair.serialize_pem().as_bytes(),
+            cert.signing_key.serialize_pem().as_bytes(),
         )
         .unwrap();
         let requested = vec!["example.org".into(), "*.example.org".into()];
@@ -62,7 +62,7 @@ mod acme_tests {
             dir.path(),
             "acme-many",
             cert.cert.pem().as_bytes(),
-            cert.key_pair.serialize_pem().as_bytes(),
+            cert.signing_key.serialize_pem().as_bytes(),
         )
         .unwrap();
         assert!(validate_acme(

src/tls/tests/external_paths.rs

@@ -15,7 +15,7 @@ fn external_absolute_paths_follow_certbot_style_symlinks_on_each_reload() {
 
     let first = rcgen::generate_simple_self_signed(vec!["example.test".into()]).unwrap();
     fs::write(archive.join("fullchain1.pem"), first.cert.pem()).unwrap();
-    fs::write(archive.join("privkey1.pem"), first.key_pair.serialize_pem()).unwrap();
+    fs::write(archive.join("privkey1.pem"), first.signing_key.serialize_pem()).unwrap();
     fs::set_permissions(archive.join("privkey1.pem"), fs::Permissions::from_mode(0o650)).unwrap();
     symlink("../../archive/example.test/fullchain1.pem", live.join("fullchain.pem")).unwrap();
     symlink("../../archive/example.test/privkey1.pem", live.join("privkey.pem")).unwrap();
@@ -47,7 +47,7 @@ fn external_absolute_paths_follow_certbot_style_symlinks_on_each_reload() {
     ])
     .unwrap();
     fs::write(archive.join("fullchain2.pem"), second.cert.pem()).unwrap();
-    fs::write(archive.join("privkey2.pem"), second.key_pair.serialize_pem()).unwrap();
+    fs::write(archive.join("privkey2.pem"), second.signing_key.serialize_pem()).unwrap();
     fs::set_permissions(archive.join("privkey2.pem"), fs::Permissions::from_mode(0o640)).unwrap();
     fs::remove_file(live.join("fullchain.pem")).unwrap();
     fs::remove_file(live.join("privkey.pem")).unwrap();