diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-02-06 16:15:34 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-02-06 16:20:30 +0100 |
| commit | 5655371fc46b669cee17f83be095c97cc816f4fb (patch) | |
| tree | 59ab9ad20c0b8881b543a5de1ac4de76a40dac29 | |
| parent | 4777c88b9db0b5fe7db061bc24c56ed797c9e48a (diff) | |
openpgp: Use CertBuilder::general_purpose in tests.
| -rw-r--r-- | openpgp/src/cert/mod.rs | 8 | ||||
| -rw-r--r-- | openpgp/src/serialize/cert_armored.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index 4dc126ef..1b84e5cb 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -1881,7 +1881,7 @@ mod test { fn set_expiry() { let p = &P::new(); - let (cert, _) = CertBuilder::autocrypt(None, Some("Test")) + let (cert, _) = CertBuilder::general_purpose(None, Some("Test")) .generate().unwrap(); assert_eq!(cert.clone().into_packet_pile().children().count(), 1 // primary key @@ -2105,7 +2105,7 @@ mod test { fn revoke() { let p = &P::new(); - let (cert, _) = CertBuilder::autocrypt(None, Some("Test")) + let (cert, _) = CertBuilder::general_purpose(None, Some("Test")) .generate().unwrap(); assert_eq!(RevocationStatus::NotAsFarAsWeKnow, cert.revoked(p, None)); @@ -2129,7 +2129,7 @@ mod test { // Have other revoke cert. - let (other, _) = CertBuilder::autocrypt(None, Some("Test 2")) + let (other, _) = CertBuilder::general_purpose(None, Some("Test 2")) .generate().unwrap(); let mut keypair = other.primary_key().key().clone().mark_parts_secret() @@ -2555,7 +2555,7 @@ mod test { // subkeys with and without a private key are merged. #[test] fn public_private_merge() { - let (tsk, _) = CertBuilder::autocrypt(None, Some("foo@example.com")) + let (tsk, _) = CertBuilder::general_purpose(None, Some("foo@example.com")) .generate().unwrap(); // tsk is now a cert, but it still has its private bits. assert!(tsk.primary.key().secret().is_some()); diff --git a/openpgp/src/serialize/cert_armored.rs b/openpgp/src/serialize/cert_armored.rs index 861393c4..013ce629 100644 --- a/openpgp/src/serialize/cert_armored.rs +++ b/openpgp/src/serialize/cert_armored.rs @@ -275,7 +275,7 @@ mod tests { let userid5: String = userid5.into_iter().collect(); // Create a Cert with the userids. - let (cert, _) = CertBuilder::autocrypt(None, Some(&userid1[..])) + let (cert, _) = CertBuilder::general_purpose(None, Some(&userid1[..])) .add_userid(&userid2[..]) .add_userid(&userid3[..]) .add_userid(&userid4[..]) |