From f71608de6eee12f34352bc2a4e1d27a33cad74b2 Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <igor@sequoia-pgp.org>
Date: Mon, 15 Jun 2020 03:42:25 +0200
Subject: openpgp: Don't rely on Nettle in select tests

---
 openpgp/src/packet/pkesk.rs         | 42 +++++++++++--------------------------
 openpgp/src/packet/signature/mod.rs | 21 ++++---------------
 2 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs
index 81c0f9ae..3b29d960 100644
--- a/openpgp/src/packet/pkesk.rs
+++ b/openpgp/src/packet/pkesk.rs
@@ -358,46 +358,28 @@ mod tests {
     fn decrypt_with_short_cv25519_secret_key() {
         use super::PKESK3;
         use crate::crypto::SessionKey;
-        use crate::crypto::mpi::{self, MPI};
-        use crate::PublicKeyAlgorithm;
-        use crate::SymmetricAlgorithm;
-        use crate::HashAlgorithm;
-        use crate::types::Curve;
-        use crate::packet::key;
-        use crate::packet::key::Key4;
-        use nettle::curve25519;
+        use crate::{HashAlgorithm, SymmetricAlgorithm};
+        use crate::packet::key::{Key4, UnspecifiedRole};
 
         // 20 byte sec key
-        let mut sec = [
+        let secret_key = [
             0x0,0x0,
             0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
             0x1,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,
             0x1,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x0,0x0
         ];
-        let mut pnt = [0x40u8; curve25519::CURVE25519_SIZE + 1];
-        curve25519::mul_g(&mut pnt[1..], &sec[..]).unwrap();
-        sec.reverse();
-
-        let public_mpis = mpi::PublicKey::ECDH {
-            curve: Curve::Cv25519,
-            q: MPI::new(&pnt[..]),
-            hash: HashAlgorithm::SHA256,
-            sym: SymmetricAlgorithm::AES256,
-        };
-        let private_mpis = mpi::SecretKeyMaterial::ECDH {
-            scalar: MPI::new(&sec[..]).into(),
-        };
-        let key: key::UnspecifiedPublic
-            = Key4::new(std::time::SystemTime::now(),
-                        PublicKeyAlgorithm::ECDH,
-                        public_mpis)
-                .unwrap().into();
-        let key = key.add_secret(private_mpis.into()).0;
+
+        let key: Key<_, UnspecifiedRole> = Key4::import_secret_cv25519(
+            &secret_key,
+            HashAlgorithm::SHA256,
+            SymmetricAlgorithm::AES256,
+            None,
+        ).unwrap().into();
+
         let sess_key = SessionKey::new(32);
         let pkesk = PKESK3::for_recipient(SymmetricAlgorithm::AES256, &sess_key,
                                           &key).unwrap();
-        let mut keypair =
-            key.parts_into_secret().unwrap().into_keypair().unwrap();
+        let mut keypair = key.into_keypair().unwrap();
         pkesk.decrypt(&mut keypair, None).unwrap();
     }
 }
diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs
index 74be7900..ccb03935 100644
--- a/openpgp/src/packet/signature/mod.rs
+++ b/openpgp/src/packet/signature/mod.rs
@@ -1281,7 +1281,6 @@ mod test {
     use crate::KeyID;
     use crate::cert::prelude::*;
     use crate::crypto;
-    use crate::crypto::mpi::MPI;
     use crate::parse::Parse;
     use crate::packet::Key;
     use crate::packet::key::Key4;
@@ -1507,28 +1506,16 @@ mod test {
     #[test]
     fn sign_with_short_ed25519_secret_key() {
         // 20 byte sec key
-        let sec = [
+        let secret_key = [
             0x0,0x0,
             0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
             0x1,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,
             0x1,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2,0x2
         ];
-        let mut pnt = [0x40u8; nettle::ed25519::ED25519_KEY_SIZE + 1];
-        nettle::ed25519::public_key(&mut pnt[1..], &sec[..]).unwrap();
 
-        let public_mpis = mpi::PublicKey::EdDSA {
-            curve: Curve::Ed25519,
-            q: MPI::new(&pnt[..]),
-        };
-        let private_mpis = mpi::SecretKeyMaterial::EdDSA {
-            scalar: MPI::new(&sec[..]).into(),
-        };
-        let key : key::SecretKey
-            = Key4::with_secret(std::time::SystemTime::now(),
-                                PublicKeyAlgorithm::EdDSA,
-                                public_mpis, private_mpis.into())
-            .unwrap()
-            .into();
+        let key: key::SecretKey = Key4::import_secret_ed25519(&secret_key, None)
+            .unwrap().into();
+
         let mut pair = key.into_keypair().unwrap();
         let msg = b"Hello, World";
         let mut hash = HashAlgorithm::SHA256.context().unwrap();
-- 
cgit v1.2.3