Changed tests and benches with new API

yogcrypt · Aug 12, 2018 · ce451f5 · ce451f5
1 parent 8fba180
commit ce451f5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/benches/yogcrypt_benchmarks.rs b/benches/yogcrypt_benchmarks.rs
@@ -30,7 +30,7 @@ mod sm2_benches {
                     let q = get_pub_key(d_a);
                     (d_a, msg, q)
                 },
-                |(d_a, msg, q)| sm2_gen_sign(&msg, d_a, q, 4),
+                |(d_a, msg, q)| sm2_gen_sign(&msg, d_a, q),
             )
         });
     }
@@ -45,10 +45,10 @@ mod sm2_benches {
 
                     let q = get_pub_key(d_a);
 
-                    (msg, q, sm2_gen_sign(&msg, d_a, q, 4))
+                    (msg, q, sm2_gen_sign(&msg, d_a, q))
                 },
                 |(msg, q, signature)| {
-                    let t = sm2_ver_sign(&msg, q, 4, signature.0, signature.1);
+                    let t = sm2_ver_sign(&msg, q,  &signature);
                     assert!(t);
                 },
             )
@@ -69,13 +69,9 @@ mod sm3_benches {
     fn bench(c: &mut Criterion) {
         c.bench_function("sm3::hash", move |b| {
             b.iter(|| {
-                let msg: [u32; 16] = [
-                    0x61626364, 0x61626364, 0x61626364, 0x61626364, 0x61626364, 0x61626364,
-                    0x61626364, 0x61626364, 0x61626364, 0x61626364, 0x61626364, 0x61626364,
-                    0x61626364, 0x61626364, 0x61626364, 0x61626364,
-                ];
+                let msg= b"abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd";
 
-                sm3_enc(&msg, 512)
+                sm3_enc(msg)
             });
         });
     }
@@ -92,8 +88,7 @@ mod sm4_benches {
 
         c.bench_function("sm4::enc", move |b| {
             b.iter(|| {
-                let r = get_sm4_r_k(&m);
-                sm4_enc(&r, &p_txt);
+                sm4_enc(&m, &p_txt);
             });
         });
     }
@@ -105,11 +100,10 @@ mod sm4_benches {
         c.bench_function("sm4::dec", move |b| {
             b.iter_with_setup(
                 || {
-                    let r = get_sm4_r_k(&m);
-                    (r, sm4_enc(&r, &p_txt))
+                    sm4_enc(&m, &p_txt)
                 },
-                |(r, c_txt)| {
-                    let p_txt2 = sm4_dec(&r, &c_txt);
+                |c_txt| {
+                    let p_txt2 = sm4_dec(&m, &c_txt);
                     assert_eq!(p_txt, p_txt2);
                 },
             )

diff --git a/src/sm2/mod.rs b/src/sm2/mod.rs
@@ -274,7 +274,7 @@ mod tests {
 
             let mut m = sm2_gen_sign(&msg, d_a, q);
 
-            let t = sm2_ver_sign(&msg, q, m);
+            let t = sm2_ver_sign(&msg, q, &m);
             assert!(t);
         }
     }