You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@milagro.apache.org by km...@apache.org on 2020/03/31 08:54:27 UTC
[incubator-milagro-crypto-rust] 12/31: Fix tests and benchmarks
This is an automated email from the ASF dual-hosted git repository.
kmccusker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-milagro-crypto-rust.git
commit 570e3d3c45de6cb38c31f6d528bde96ac6747ce8
Author: Kirk Baird <ba...@outlook.com>
AuthorDate: Fri Dec 13 15:58:15 2019 +1100
Fix tests and benchmarks
Signed-off-by: Kirk Baird <ba...@outlook.com>
---
BenchtestALL | Bin 0 -> 5723448 bytes
BenchtestALL.rs | 73 +++++++++++++++++++++++++++-----------------------------
TestALL | Bin 0 -> 6209648 bytes
TestALL.rs | 6 ++---
TestBLS | Bin 0 -> 4990944 bytes
readme.md | 2 +-
6 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/BenchtestALL b/BenchtestALL
new file mode 100755
index 0000000..0323393
Binary files /dev/null and b/BenchtestALL differ
diff --git a/BenchtestALL.rs b/BenchtestALL.rs
index ff8fb92..1bc4629 100644
--- a/BenchtestALL.rs
+++ b/BenchtestALL.rs
@@ -19,9 +19,6 @@ under the License.
#![allow(non_snake_case)]
extern crate amcl;
-//use std::str;
-//use std::io;
-
use amcl::arch;
use amcl::rand::RAND;
use amcl::types::{CurveType, CurvePairingType, ModType};
@@ -40,26 +37,26 @@ fn ed25519(mut rng: &mut RAND) {
let mut fail = false;
println!("\nTesting/Timing ed25519 ECC");
- if ecp::CURVETYPE == CurveType::WEIERSTRASS {
+ if ecp::CURVETYPE == CurveType::Weierstrass {
println!("Weierstrass parameterization");
}
- if ecp::CURVETYPE == CurveType::EDWARDS {
+ if ecp::CURVETYPE == CurveType::Edwards {
println!("Edwards parameterization");
}
- if ecp::CURVETYPE == CurveType::MONTGOMERY {
+ if ecp::CURVETYPE == CurveType::Montgomery {
println!("Montgomery parameterization");
}
- if fp::MODTYPE == ModType::PSEUDO_MERSENNE {
+ if fp::MODTYPE == ModType::PseudoMersenne {
println!("Pseudo-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::MONTGOMERY_FRIENDLY {
+ if fp::MODTYPE == ModType::MontgomeryFriendly {
println!("Montgomery friendly Modulus");
}
- if fp::MODTYPE == ModType::GENERALISED_MERSENNE {
+ if fp::MODTYPE == ModType::GeneralisedMersenne {
println!("Generalised-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::NOT_SPECIAL {
+ if fp::MODTYPE == ModType::NotSpecial {
println!("Not special Modulus");
}
@@ -68,8 +65,8 @@ fn ed25519(mut rng: &mut RAND) {
let G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let P = G.mul(&mut r);
if !P.is_infinity() {
@@ -103,26 +100,26 @@ fn nist256(mut rng: &mut RAND) {
let mut fail = false;
println!("\nTesting/Timing nist256 ECC");
- if ecp::CURVETYPE == CurveType::WEIERSTRASS {
+ if ecp::CURVETYPE == CurveType::Weierstrass {
println!("Weierstrass parameterization");
}
- if ecp::CURVETYPE == CurveType::EDWARDS {
+ if ecp::CURVETYPE == CurveType::Edwards {
println!("Edwards parameterization");
}
- if ecp::CURVETYPE == CurveType::MONTGOMERY {
+ if ecp::CURVETYPE == CurveType::Montgomery {
println!("Montgomery parameterization");
}
- if fp::MODTYPE == ModType::PSEUDO_MERSENNE {
+ if fp::MODTYPE == ModType::PseudoMersenne {
println!("Pseudo-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::MONTGOMERY_FRIENDLY {
+ if fp::MODTYPE == ModType::MontgomeryFriendly {
println!("Montgomery friendly Modulus");
}
- if fp::MODTYPE == ModType::GENERALISED_MERSENNE {
+ if fp::MODTYPE == ModType::GeneralisedMersenne {
println!("Generalised-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::NOT_SPECIAL {
+ if fp::MODTYPE == ModType::NotSpecial {
println!("Not special Modulus");
}
@@ -131,8 +128,8 @@ fn nist256(mut rng: &mut RAND) {
let G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let P = G.mul(&mut r);
if !P.is_infinity() {
@@ -166,26 +163,26 @@ fn goldilocks(mut rng: &mut RAND) {
let mut fail = false;
println!("\nTesting/Timing goldilocks ECC");
- if ecp::CURVETYPE == CurveType::WEIERSTRASS {
+ if ecp::CURVETYPE == CurveType::Weierstrass {
println!("Weierstrass parameterization");
}
- if ecp::CURVETYPE == CurveType::EDWARDS {
+ if ecp::CURVETYPE == CurveType::Edwards {
println!("Edwards parameterization");
}
- if ecp::CURVETYPE == CurveType::MONTGOMERY {
+ if ecp::CURVETYPE == CurveType::Montgomery {
println!("Montgomery parameterization");
}
- if fp::MODTYPE == ModType::PSEUDO_MERSENNE {
+ if fp::MODTYPE == ModType::PseudoMersenne {
println!("Pseudo-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::MONTGOMERY_FRIENDLY {
+ if fp::MODTYPE == ModType::MontgomeryFriendly {
println!("Montgomery friendly Modulus");
}
- if fp::MODTYPE == ModType::GENERALISED_MERSENNE {
+ if fp::MODTYPE == ModType::GeneralisedMersenne {
println!("Generalised-Mersenne Modulus");
}
- if fp::MODTYPE == ModType::NOT_SPECIAL {
+ if fp::MODTYPE == ModType::NotSpecial {
println!("Not special Modulus");
}
@@ -194,8 +191,8 @@ fn goldilocks(mut rng: &mut RAND) {
let G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let P = G.mul(&mut r);
if !P.is_infinity() {
@@ -243,8 +240,8 @@ fn bn254(mut rng: &mut RAND) {
let mut G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let mut P = pair::g1mul(&mut G, &mut r);
@@ -403,8 +400,8 @@ fn bls383(mut rng: &mut RAND) {
let mut G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let mut P = pair::g1mul(&mut G, &mut r);
@@ -563,8 +560,8 @@ fn bls24(mut rng: &mut RAND) {
let mut G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let mut P = pair192::g1mul(&mut G, &mut r);
@@ -723,8 +720,8 @@ fn bls48(mut rng: &mut RAND) {
let mut G = ecp::ECP::generator();
- let mut r = big::BIG::new_ints(&rom::CURVE_ORDER);
- let mut s = big::BIG::randomnum(&r, &mut rng);
+ let mut r = big::Big::new_ints(&rom::CURVE_ORDER);
+ let mut s = big::Big::randomnum(&r, &mut rng);
let mut P = pair256::g1mul(&mut G, &mut r);
diff --git a/TestALL b/TestALL
new file mode 100755
index 0000000..36a1426
Binary files /dev/null and b/TestALL differ
diff --git a/TestALL.rs b/TestALL.rs
index 2dbf276..9c3e1d0 100644
--- a/TestALL.rs
+++ b/TestALL.rs
@@ -122,7 +122,7 @@ fn ecdh_ed25519(mut rng: &mut RAND) {
print!("Servers DH Key= 0x");
printbinary(&key);
- if ecp::CURVETYPE != CurveType::MONTGOMERY {
+ if ecp::CURVETYPE != CurveType::Montgomery {
for i in 0..17 {
m[i] = i as u8
}
@@ -273,7 +273,7 @@ fn ecdh_nist256(mut rng: &mut RAND) {
print!("Servers DH Key= 0x");
printbinary(&key);
- if ecp::CURVETYPE != CurveType::MONTGOMERY {
+ if ecp::CURVETYPE != CurveType::Montgomery {
for i in 0..17 {
m[i] = i as u8
}
@@ -424,7 +424,7 @@ fn ecdh_goldilocks(mut rng: &mut RAND) {
print!("Servers DH Key= 0x");
printbinary(&key);
- if ecp::CURVETYPE != CurveType::MONTGOMERY {
+ if ecp::CURVETYPE != CurveType::Montgomery {
for i in 0..17 {
m[i] = i as u8
}
diff --git a/TestBLS b/TestBLS
new file mode 100755
index 0000000..b248889
Binary files /dev/null and b/TestBLS differ
diff --git a/readme.md b/readme.md
index 98f7d20..036defc 100644
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,7 @@ directory and its subdirectories to a fresh root directory.
Then for example execute
```
-cargo rustc --release --features "bn254 bls383 bls24 bls48 ed25519 nist256 goldilocks rsa2048"
+cargo build --release --features "bn254 bls383 bls24 bls48 ed25519 nist256 goldilocks rsa2048"
```
This will create a build of the library for the current default target (be it 32 or 64 bits).