summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Curran <shane@evervault.com>2021-03-04 13:29:56 +0000
committerShane Curran <shane@evervault.com>2021-03-04 13:29:56 +0000
commitb82dd107f94746e89b0f64bc386ef09483f28c85 (patch)
tree7c0800d6c710f09c7cd0a0b5b36089d2327d0d42
parent2bb6fb1ffdc2828cac6a4e2562b4b2977470b617 (diff)
downloadrust-openssl-b82dd107f94746e89b0f64bc386ef09483f28c85.zip
Fix broken tests
-rw-r--r--openssl/src/cms.rs21
1 files changed, 16 insertions, 5 deletions
diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs
index 970e1536..1777aa00 100644
--- a/openssl/src/cms.rs
+++ b/openssl/src/cms.rs
@@ -289,12 +289,21 @@ mod test {
let encrypted_der = encrypt.to_der().expect("failed to create der from cms");
let decrypt =
CmsContentInfo::from_der(&encrypted_der).expect("failed read cms from der");
- let decrypt = decrypt
- .decrypt(&priv_cert.pkey, Some(&priv_cert.cert))
+
+ let decrypt_with_cert_check = decrypt
+ .decrypt(&priv_cert.pkey, &priv_cert.cert)
.expect("failed to decrypt cms");
- let decrypt =
- String::from_utf8(decrypt).expect("failed to create string from cms content");
- assert_eq!(input, decrypt);
+ let decrypt_with_cert_check =
+ String::from_utf8(decrypt_with_cert_check).expect("failed to create string from cms content");
+
+ let decrypt_without_cert_check = decrypt
+ .decrypt_without_cert_check(&priv_cert.pkey)
+ .expect("failed to decrypt cms");
+ let decrypt_without_cert_check = String::from_utf8(decrypt_without_cert_check)
+ .expect("failed to create string from cms content");
+
+ assert_eq!(input, decrypt_with_cert_check);
+ assert_eq!(input, decrypt_without_cert_check);
}
// decrypt cms message using private key cert (PEM)
@@ -302,11 +311,13 @@ mod test {
let encrypted_pem = encrypt.to_pem().expect("failed to create pem from cms");
let decrypt =
CmsContentInfo::from_pem(&encrypted_pem).expect("failed read cms from pem");
+
let decrypt_with_cert_check = decrypt
.decrypt(&priv_cert.pkey, &priv_cert.cert)
.expect("failed to decrypt cms");
let decrypt_with_cert_check = String::from_utf8(decrypt_with_cert_check)
.expect("failed to create string from cms content");
+
let decrypt_without_cert_check = decrypt
.decrypt_without_cert_check(&priv_cert.pkey)
.expect("failed to decrypt cms");