Checkpoint: Signing seems to work, but there's a lot of cruft and cross-checks.

Cargo.toml

@@ -17,6 +17,7 @@ digest      = "^0.8.0"
 hmac        = "^0.7.0"
 num         = "^0.2.0"
 rand        = "^0.6.5"
+rust-crypto = { path = "../rust-crypto/" }
 sha-1       = "^0.8.1"
 sha2        = "^0.8.0"
 simple_asn1 = "^0.2.0"

src/ed25519/mod.rs

@@ -7,8 +7,15 @@ use rand::Rng;
 use sha2::Sha512;
 use self::fe::*;
 use self::point::*;
+#[cfg(test)]
+use testing::run_test;
+#[cfg(test)]
+use crypto::ed25519;
+#[cfg(test)]
+use std::collections::HashMap;
 
 pub struct ED25519KeyPair {
+    seed:    [u8; 32],
     private: [u8; 32],
     prefix:  [u8; 32],
     public:  [u8; 32]
@@ -18,6 +25,7 @@ impl ED25519KeyPair {
     fn blank() -> ED25519KeyPair
     {
         ED25519KeyPair {
+            seed:    [0; 32],
             private: [0; 32],
             prefix:  [0; 32],
             public:  [0; 32]
@@ -27,17 +35,29 @@ impl ED25519KeyPair {
     pub fn generate<G: Rng>(rng: &mut G) -> ED25519KeyPair
     {
         let mut result = ED25519KeyPair::blank();
+        rng.fill(&mut result.private);
+        curve25519_scalar_mask(&mut result.private);
+        x25519_public_from_private(&mut result.public, &result.private);
+        result
+    }
 
-        let mut seed: [u8; 32] = [0; 32];
+    #[cfg(test)]
-        rng.fill(&mut seed);
+    fn from_test_data(privbytes: &[u8], pubbytes: &[u8]) -> ED25519KeyPair
-        let mut hashed = Sha512::digest(&seed);
+    {
-        let (private, prefix) = hashed.split_at_mut(32);
+        let mut result = ED25519KeyPair::blank();
-        assert_eq!(private.len(), 32);
+        result.seed.copy_from_slice(privbytes);
-        assert_eq!(prefix.len(), 32);
+        println!("privbytes: {:?}", privbytes);
-        result.prefix.copy_from_slice(&prefix);
+        let mut expanded = Sha512::digest(privbytes);
-        curve25519_scalar_mask(private);
+        println!("expanded: {:?}", expanded);
-        result.private.copy_from_slice(&private);
+        let (private, prefix) = expanded.split_at_mut(32);
-        x25519_public_from_private(&mut result.public, &private);
+        result.private.copy_from_slice(private);
+        result.prefix.copy_from_slice(prefix);
+        curve25519_scalar_mask(&mut result.private);
+        println!("private: {:?}", result.private);
+        let mut a = Point::new();
+        x25519_ge_scalarmult_base(&mut a, &result.private);
+        into_encoded_point(&mut result.public, &a.x, &a.y, &a.z);
+        assert_eq!(&result.public, pubbytes);
         result
     }
 
@@ -50,11 +70,18 @@ impl ED25519KeyPair {
         ctx.input(&self.prefix);
         ctx.input(&msg);
         let nonce = digest_scalar(ctx.result().as_slice());
+        println!("ME:nonce: {:?}", nonce);
         let mut r = Point::new();
         x25519_ge_scalarmult_base(&mut r, &nonce);
+        println!("ME:r.x: {:?}", r.x);
+        println!("ME:r.y: {:?}", r.y);
+        println!("ME:r.z: {:?}", r.z);
+        println!("ME:r.t: {:?}", r.t);
         into_encoded_point(&mut signature_r, &r.x, &r.y, &r.z);
+        println!("ME:signature_r: {:?}", signature_r);
         let hram_digest = eddsa_digest(&signature_r, &self.public, &msg);
         let hram = digest_scalar(&hram_digest);
+        println!("ME:hram: {:?}", hram);
         x25519_sc_muladd(&mut signature_s, &hram, &self.private, &nonce);
         let mut result = Vec::with_capacity(64);
         result.extend_from_slice(&signature_r);
@@ -134,156 +161,48 @@ fn invert_vartime(v: &mut Point)
     }
 }
 
-// use cryptonum::signed::{I256};
+#[cfg(test)]
-// use cryptonum::unsigned::{BarrettU256,CryptoNum,Decoder,ModExp,U256,U512};
+fn run_signing_testcase(case: HashMap<String,(bool,Vec<u8>)>)
-// use digest::Digest;
+{
-// use rand::Rng;
+    let (negr, rbytes) = case.get("r").unwrap();
-// use rand::distributions::Standard;
+    let (negu, ubytes) = case.get("u").unwrap();
-// use sha2::Sha512;
+    let (negm, mbytes) = case.get("m").unwrap();
-// use super::KeyPair;
+    let (negs, sbytes) = case.get("s").unwrap();
-// 
+
-// struct Field {
+    assert!(!negr && !negu && !negm && !negs);
-//     x: U256,
+    println!("r:  {:?}", rbytes);
-//     p: U256,
+    println!("u:  {:?}", ubytes);
-//     pu: BarrettU256
+    let (cpriv, cpub) = ed25519::keypair(rbytes);
-// }
+    println!("cr: {:?}", cpriv.to_vec());
-// 
+    println!("cu: {:?}", cpub.to_vec());
-// impl Field {
+    let keypair = ED25519KeyPair::from_test_data(rbytes, ubytes);
-//     fn unsafe_new(&self, v: U256) -> Field
+    println!("pr: {:?}", keypair.private);
-//     {
+    println!("pu: {:?}", keypair.public);
-//         Field{ x: v, p: self.p.clone(), pu: self.pu.clone() }
+    assert_eq!(ubytes, &keypair.public.to_vec());
-//     }
+    let mut privpub = Vec::new();
-// 
+    privpub.append(&mut rbytes.clone());
-//     fn new(&self, v: U256) -> Field
+    privpub.append(&mut ubytes.clone());
-//     {
+    let sig2 = ed25519::signature(&mbytes, &privpub);
-//         let v2 = self.pu.reduce(&U512::from(v));
+    println!("sig2: {:?}", sig2.to_vec());
-//         Field{ x: v2, p: self.p.clone(), pu: self.pu.clone() }
+    let sig = keypair.sign(&mbytes);
-//     }
+    assert_eq!(sig.len(), sbytes.len());
-// 
+    println!("sig:  {:?}", sbytes);
-//     fn init(x: U256, p: U256) -> Field
+    println!("sig': {:?}", sig);
-//     {
+    assert!(sig.iter().eq(sbytes.iter()));
-//         let pu = BarrettU256::new(p.clone());
+    assert!(keypair.verify(&mbytes, &sig));
-//         Field{ x, p, pu }
+    println!("DONE");
-//     }
+}
-// 
+
-//     fn add(&self, y: &Field) -> Field
+#[cfg(test)]
-//     {
+#[test]
-//         assert_eq!(self.p, y.p);
+fn rfc8072() {
-//         assert_eq!(self.pu, y.pu);
+    let fname = "testdata/ed25519/rfc8032.test";
-//         let v = U512::from(&self.x + &y.x);
+    run_test(fname.to_string(), 4, run_signing_testcase);
-//         Field { x: self.pu.reduce(&v), p: self.p.clone(), pu: self.pu.clone() }
+}
-//     }
+
-// 
+//#[cfg(test)]
-//     fn sub(&self, y: &Field) -> Field
+//#[test]
-//     {
+//fn signing() {
-//         assert_eq!(self.p, y.p);
+//    let fname = "testdata/ed25519/sign.test";
-//         assert_eq!(self.pu, y.pu);
+//    run_test(fname.to_string(), 4, run_signing_testcase);
-//         let mut ix = I256::from(&self.x);
-//         let iy = I256::from(&y.x);
-//         ix -= iy;
-//         if ix.is_negative() {
-//             let mut rx = I256::from(&self.p);
-//             rx += ix;
-//             self.new(U256::from(rx))
-//         } else {
-//             self.new(U256::from(ix))
-//         }
-//     }
-// 
-//     fn neg(&self) -> Field
-//     {
-//         let mut rx = self.p.clone();
-//         rx -= &self.x;
-//         self.new(rx)
-//     }
-// 
-//     fn mul(&self, y: &Field) -> Field
-//     {
-//         let v = &self.x * &y.x;
-//         self.unsafe_new(self.pu.reduce(&v))
-//     }
-// 
-//     fn inv(&self) -> Field
-//     {
-//         let mut pm2 = self.p.clone();
-//         pm2 -= U256::from(2u8);
-//         let res = self.x.modexp(&pm2, &self.pu);
-//         self.unsafe_new(res)
-//     }
-// 
-//     fn div(&self, y: &Field) -> Field
-//     {
-//         self.mul(&y.inv())
-//     }
-// 
-//     fn sqrt(&self) -> Field
-//     {
-//         panic!("field sqrt")
-//     }
-// 
-//     fn is_zero(&self) -> bool
-//     {
-//         self.x.is_zero()
-//     }
-// 
-//     fn eq(&self, y: &Field) -> bool
-//     {
-//         self.x == y.x
-//     }
-// 
-//     fn neq(&self, y: &Field) -> bool
-//     {
-//         self.x != y.x
-//     }
-// 
-//     fn sign(&self) -> Field
-//     {
-//         let mut vx = I256::from(&self.x);
-//         vx %= I256::from(2u64);
-//         self.unsafe_new(U256::from(vx))
-//     }
-// }
-// 
-// pub struct ED25519Public {
-// }
-// 
-// pub struct ED25519Private {
-//     key: U256
-// }
-// 
-// pub struct ED25519Pair {
-//     public: ED25519Public,
-//     private: ED25519Private
-// }
-// 
-// impl KeyPair for ED25519Pair {
-//     type Public = ED25519Public;
-//     type Private = ED25519Private;
-// 
-//     fn new(pu: ED25519Public, pr: ED25519Private) -> ED25519Pair
-//     {
-//         ED25519Pair{ public: pu, private: pr }
-//     }
-// }
-// 
-// impl ED25519Pair {
-//     pub fn generate<G: Rng>(g: &mut G) -> ED25519Pair
-//     {
-//         let bytes: Vec<u8> = g.sample_iter(&Standard).take(256 / 8).collect();
-//         let key = U256::from_bytes(&bytes);
-//         let private = ED25519Private{ key };
-//         let mut hash = Sha512::digest(&bytes);
-//         assert_eq!(hash.len(), 64);
-//         let (scalar, prefix) = hash.split_at_mut(32);
-//         assert_eq!(scalar.len(), 32);
-//         assert_eq!(prefix.len(), 32);
-//         //
-//         scalar[0]  &= 0b11111000u8;
-//         scalar[31] &= 0b01111111u8;
-//         scalar[31] |= 0b01000000u8;
-//         //
-//         
-//         let public = ED25519Public{};
-//         ED25519Pair{ public, private }
-//     }
 //}

src/lib.rs

@@ -24,6 +24,8 @@ extern crate sha1;
 extern crate sha2;
 #[macro_use]
 extern crate simple_asn1;
+#[cfg(test)]
+extern crate crypto;
 
 /// The `rsa` module provides bare-bones support for RSA signing, verification,
 /// encryption, decryption, and key generation.

src/testing.rs

@@ -23,11 +23,11 @@ fn next_value_set(line: &str) -> (String, bool, Vec<u8>)
     while let Some(c1) = nibble_iter.next() {
         match nibble_iter.next() {
             None => {
-                val.push( c1.to_digit(16).unwrap() as u8 );
+                val.push( c1.to_digit(16).expect(&format!("Unexpected character: |{}|", c1)) as u8 );
             }
             Some(c2) => {
-                let b1 = c1.to_digit(16).unwrap() as u8;
+                let b1 = c1.to_digit(16).expect(&format!("Unexpected character: |{}|", c1)) as u8;
-                let b2 = c2.to_digit(16).unwrap() as u8;
+                let b2 = c2.to_digit(16).expect(&format!("Unexpected character: |{}|", c2)) as u8;
                 val.push( (b2 << 4) | b1 );
             }
         }

test-generator/ED25519.hs

@@ -3,8 +3,11 @@ module ED25519(ed25519Tasks)
  where
 
 import Control.Monad(unless)
+import Crypto.Error(CryptoFailable(CryptoPassed))
 import "crypto-api" Crypto.Random(SystemRandom)
 import "cryptonite" Crypto.Random(getRandomBytes,withDRG)
+import Crypto.PubKey.Ed25519
+import Data.ByteArray(convert)
 import Data.ByteString(ByteString,pack,useAsCString)
 import qualified Data.ByteString as BS
 import Data.Int(Int32)
@@ -29,7 +32,8 @@ ed25519Tasks = [ loadTests, byteTests, addsubTests, mulTests,
                   pow22523Tests, fbvTests, conversionTests,
                   ptDoubleTests, maddsubTests, ptAddSubTests,
                   scalarMultBaseTests, slideTests, scalarMultTests,
-                  reduceTests, muladdTests, pubPrivTests ]
+                  reduceTests, muladdTests, pubPrivTests,
+                  signTest ]
 
 loadTests :: Task
 loadTests = Task {
@@ -496,6 +500,26 @@ pubPrivTests = Task {
            let res = Map.fromList [("a", showBin a), ("b", showBin b)]
            return (res, toNumber a, (memory0, drg1))
 
+signTest :: Task
+signTest = Task {
+    taskName = "ed25519 signing tests",
+    taskFile = "../testdata/ed25519/sign.test",
+    taskTest = go,
+    taskCount = cTEST_COUNT
+  }
+ where
+  go (memory0, drg0) =
+    let (priv, drg1) = withDRG drg0 generateSecretKey
+        (msg, drg2) = withDRG drg1 $ getRandomBytes =<< ((fromIntegral . BS.head) `fmap` getRandomBytes 1)
+        pub = toPublic priv
+        privBytes = convert priv
+        pubBytes = convert pub
+        sig = convert (sign priv pub msg)
+        res = Map.fromList [("u", showBin pubBytes), ("r", showBin privBytes),
+                            ("m", showBin msg), ("s", showBin sig)]
+    in return (res, toNumber privBytes, (memory0, drg2))
+
+
 data PackedBytes = PB [Word8]
  deriving (Eq)
 

testdata/ed25519/rfc8032.test

@@ -0,0 +1,20 @@
+r: 9d61b19deffd5a60ba844af492ec2cc44449c5697b326919703bac031cae7f60
+u: d75a980182b10ab7d54bfed3c964073a0ee172f3daa62325af021a68f707511a
+m: 
+s: e5564300c360ac729086e2cc806e828a84877f1eb8e5d974d873e065224901555fb8821590a33bacc61e39701cf9b46bd25bf5f0595bbe24655141438e7a100b
+r: 4ccd089b28ff96da9db6c346ec114e0f5b8a319f35aba624da8cf6ed4fb8a6fb
+u: 3d4017c3e843895a92b70aa74d1b7ebc9c982ccf2ec4968cc0cd55f12af4660c
+m: 72
+s: 92a009a9f0d4cab8720e820b5f642540a2b27b5416503f8fb3762223ebdb69da085ac1e43e15996e458f3613d0f11d8c387b2eaeb4302aeeb00d291612bb0c00
+r: c5aa8df43f9f837bedb7442f31dcb7b166d38535076f094b85ce3a2e0b4458f7
+u: fc51cd8e6218a1a38da47ed00230f0580816ed13ba3303ac5deb911548908025
+m: af82
+s: 6291d657deec24024827e69c3abe01a30ce548a284743a445e3680d7db5ac3ac18ff9b538d16f290ae67f760984dc6594a7c15e9716ed28dc027beceea1ec40a
+r: f5e5767cf153319517630f226876b86c8160cc583bc013744c6bf255f5cc0ee5
+u: 278117fc144c72340f67d0f2316e8386ceffbf2b2428c9c51fef7c597f1d426e
+m: 08b8b2b733424243760fe426a4b54908632110a66c2f6591eabd3345e3e4eb98fa6e264bf09efe12ee50f8f54e9f77b1e355f6c50544e23fb1433ddf73be84d879de7c0046dc4996d9e773f4bc9efe5738829adb26c81b37c93a1b270b20329d658675fc6ea534e0810a4432826bf58c941efb65d57a338bbd2e26640f89ffbc1a858efcb8550ee3a5e1998bd177e93a7363c344fe6b199ee5d02e82d522c4feba15452f80288a821a579116ec6dad2b3b310da903401aa62100ab5d1a36553e06203b33890cc9b832f79ef80560ccb9a39ce767967ed628c6ad573cb116dbefefd75499da96bd68a8a97b928a8bbc103b6621fcde2beca1231d206be6cd9ec7aff6f6c94fcd7204ed3455c68c83f4a41da4af2b74ef5c53f1d8ac70bdcb7ed185ce81bd84359d44254d95629e9855a94a7c1958d1f8ada5d0532ed8a5aa3fb2d17ba70eb6248e594e1a2297acbbb39d502f1a8c6eb6f1ce22b3de1a1f40cc24554119a831a9aad6079cad88425de6bde1a9187ebb6092cf67bf2b13fd65f27088d78b7e883c8759d2c4f5c65adb7553878ad575f9fad878e80a0c9ba63bcbcc2732e69485bbc9c90bfbd62481d9089beccf80cfe2df16a2cf65bd92dd597b0707e0917af48bbb75fed413d238f5555a7a569d80c3414a8d0859dc65a46128bab27af87a71314f318c782b23ebfe808b82b0ce26401d2e22f04d83d1255dc51addd3b75a2b1ae0784504df543af8969be3ea7082ff7fc9888c144da2af58429ec96031dbcad3dad9af0dcbaaaf268cb8fcffead94f3c7ca495e056a9b47acdb751fb73e666c6c655ade8297297d07ad1ba5e43f1bca32301651339e22904cc8c42f58c30c04aafdb038dda0847dd988dcda6f3bfd15c4b4c4525004aa06eeff8ca61783aacec57fb3d1f92b0fe2fd1a85f6724517b65e614ad6808d6f6ee34dff7310fdc82aebfd904b01e1dc54b2927094b2db68d6f903b68401adebf5a7e08d78ff4ef5d63653a65040cf9bfd4aca7984a74d37145986780fc0b16ac451649de6188a7dbdf191f64b5fc5e2ab47b57f7f7276cd419c17a3ca8e1b939ae49e488acba6b965610b5480109c8b17b80e1b7b750dfc7598d5d5011fd2dcc5600a32ef5b52a1ecc820e308aa342721aac0943bf6686b64b2579376504ccc493d97e6aed3fb0f9cd71a43dd497f01f17c0e2cb3797aa2a2f256656168e6c496afc5fb93246f6b1116398a346f1a641f3b041e989f7914f90cc2c7fff357876e506b50d334ba77c225bc307ba537152f3f1610e4eafe595f6d9d90d11faa933a15ef1369546868a7f3a45a96768d40fd9d03412c091c6315cf4fde7cb68606937380db2eaaa707b4c4185c32eddcdd306705e4dc1ffc872eeee475a64dfac86aba41c0618983f8741c5ef68d3a101e8a3b8cac60c905c15fc910840b94c00a0b9d0
+s: 0aab4c900501b3e24d7cdf4663326a3a87df5e4843b2cbdb67cbf6e460fec350aa5371b1508f9f4528ecea23c436d94b5e8fcd4f681e30a6ac00a9704a188a03
+r: 833fe62409237b9d62ec77587520911e9a759cec1d19755b7da901b96dca3d42
+u: ec172b93ad5e563bf4932c70e1245034c35467ef2efd4d64ebf819683467e2bf
+m: ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f
+s: dc2a4459e7369633a52b1bf277839a00201009a3efbf3ecb69bea2186c26b58909351fc9ac90b3ecfdfbc7c66431e0303dca179c138ac17ad9bef1177331a704