瀏覽代碼

restore shared secret benchmarks

master
Michael Hamburg 8 年之前
父節點
當前提交
957ec6cd2c
共有 3 個檔案被更改,包括 16 行新增4 行删除
  1. +1
    -1
      src/gen_headers/crypto_hxx.py
  2. +7
    -3
      test/bench_decaf.cxx
  3. +8
    -0
      test/test_decaf.cxx

+ 1
- 1
src/gen_headers/crypto_hxx.py 查看文件

@@ -63,7 +63,7 @@ public:
/** @brief Serialization size. */
inline size_t serSize() const NOEXCEPT { return SER_BYTES; }
/* TODO: verify_strobe? */
/* TODO: verify_strobe */
/** @brief Verify a message */
inline void verify(


+ 7
- 3
test/bench_decaf.cxx 查看文件

@@ -290,10 +290,10 @@ static void macro() {
printf("\nMacro-benchmarks for %s:\n", Group::name());
printf("Crypto benchmarks:\n");
SpongeRng rng(Block("macro rng seed"));
PublicKey<Group> p1((NOINIT())), p2((NOINIT()));
PrivateKey<Group> s1((NOINIT())), s2((NOINIT()));
PrivateKey<Group> s1((NOINIT())), s2(rng);
PublicKey<Group> p1((NOINIT())), p2(s2);

SecureBuffer message = rng.read(5), sig;
SecureBuffer message = rng.read(5), sig, ss;

for (Benchmark b("Create private key",1); b.iter(); ) {
s1 = PrivateKey<Group>(rng);
@@ -310,6 +310,10 @@ static void macro() {
try { p1.verify(message, sig); } catch (CryptoException) {}
}
for (Benchmark b("SharedSecret",1); b.iter(); ) {
ss = s1.sharedSecret(p2,32,true);
}
printf("\nProtocol benchmarks:\n");
SpongeRng clientRng(Block("client rng seed"));
SpongeRng serverRng(Block("server rng seed"));


+ 8
- 0
test/test_decaf.cxx 查看文件

@@ -335,7 +335,15 @@ static void test_crypto() {
SecureBuffer message = rng.read(i);
SecureBuffer sig(priv1.sign(message));

pub1.verify(message, sig);
SecureBuffer s1(priv1.sharedSecret(pub2,32,true));
SecureBuffer s2(priv2.sharedSecret(pub1,32,false));
if (memcmp(s1.data(),s2.data(),s1.size())) {
test.fail();
printf(" Shared secrets disagree.");
}
}
}



Loading…
取消
儲存