Commit 52052ebb authored by Niels Möller's avatar Niels Möller

Deleted unneeded casts in benchmark program.

parent edfb12c0
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
* examples/hogweed-benchmark.c: Add benchmarking of OpenSSL's RSA * examples/hogweed-benchmark.c: Add benchmarking of OpenSSL's RSA
functions. functions.
(all functions): Deleted unneeded casts.
2013-04-24 Niels Möller <nisse@lysator.liu.se> 2013-04-24 Niels Möller <nisse@lysator.liu.se>
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include <openssl/ec.h> #include <openssl/ec.h>
#include <openssl/ecdsa.h> #include <openssl/ecdsa.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/err.h>
#endif #endif
#define BENCH_INTERVAL 0.1 #define BENCH_INTERVAL 0.1
...@@ -235,7 +234,7 @@ bench_rsa_init (unsigned size) ...@@ -235,7 +234,7 @@ bench_rsa_init (unsigned size)
static void static void
bench_rsa_sign (void *p) bench_rsa_sign (void *p)
{ {
struct rsa_ctx *ctx = (struct rsa_ctx *) p; struct rsa_ctx *ctx = p;
mpz_t s; mpz_t s;
mpz_init (s); mpz_init (s);
...@@ -246,16 +245,15 @@ bench_rsa_sign (void *p) ...@@ -246,16 +245,15 @@ bench_rsa_sign (void *p)
static void static void
bench_rsa_verify (void *p) bench_rsa_verify (void *p)
{ {
struct rsa_ctx *ctx = (struct rsa_ctx *) p; struct rsa_ctx *ctx = p;
int res = rsa_sha256_verify_digest (&ctx->pub, ctx->digest, ctx->s); if (! rsa_sha256_verify_digest (&ctx->pub, ctx->digest, ctx->s))
if (!res)
die ("Internal error, rsa_sha256_verify_digest failed.\n"); die ("Internal error, rsa_sha256_verify_digest failed.\n");
} }
static void static void
bench_rsa_clear (void *p) bench_rsa_clear (void *p)
{ {
struct rsa_ctx *ctx = (struct rsa_ctx *) p; struct rsa_ctx *ctx = p;
rsa_public_key_clear (&ctx->pub); rsa_public_key_clear (&ctx->pub);
rsa_private_key_clear (&ctx->key); rsa_private_key_clear (&ctx->key);
...@@ -320,7 +318,7 @@ bench_dsa_init (unsigned size) ...@@ -320,7 +318,7 @@ bench_dsa_init (unsigned size)
static void static void
bench_dsa_sign (void *p) bench_dsa_sign (void *p)
{ {
struct dsa_ctx *ctx = (struct dsa_ctx *) p; struct dsa_ctx *ctx = p;
struct dsa_signature s; struct dsa_signature s;
dsa_signature_init (&s); dsa_signature_init (&s);
...@@ -333,16 +331,15 @@ bench_dsa_sign (void *p) ...@@ -333,16 +331,15 @@ bench_dsa_sign (void *p)
static void static void
bench_dsa_verify (void *p) bench_dsa_verify (void *p)
{ {
struct dsa_ctx *ctx = (struct dsa_ctx *) p; struct dsa_ctx *ctx = p;
int res = dsa_sha1_verify_digest (&ctx->pub, ctx->digest, &ctx->s); if (! dsa_sha1_verify_digest (&ctx->pub, ctx->digest, &ctx->s))
if (!res)
die ("Internal error, dsa_sha1_verify_digest failed.\n"); die ("Internal error, dsa_sha1_verify_digest failed.\n");
} }
static void static void
bench_dsa_clear (void *p) bench_dsa_clear (void *p)
{ {
struct dsa_ctx *ctx = (struct dsa_ctx *) p; struct dsa_ctx *ctx = p;
dsa_public_key_clear (&ctx->pub); dsa_public_key_clear (&ctx->pub);
dsa_private_key_clear (&ctx->key); dsa_private_key_clear (&ctx->key);
dsa_signature_clear (&ctx->s); dsa_signature_clear (&ctx->s);
...@@ -458,7 +455,7 @@ bench_ecdsa_init (unsigned size) ...@@ -458,7 +455,7 @@ bench_ecdsa_init (unsigned size)
static void static void
bench_ecdsa_sign (void *p) bench_ecdsa_sign (void *p)
{ {
struct ecdsa_ctx *ctx = (struct ecdsa_ctx *) p; struct ecdsa_ctx *ctx = p;
struct dsa_signature s; struct dsa_signature s;
dsa_signature_init (&s); dsa_signature_init (&s);
...@@ -472,18 +469,17 @@ bench_ecdsa_sign (void *p) ...@@ -472,18 +469,17 @@ bench_ecdsa_sign (void *p)
static void static void
bench_ecdsa_verify (void *p) bench_ecdsa_verify (void *p)
{ {
struct ecdsa_ctx *ctx = (struct ecdsa_ctx *) p; struct ecdsa_ctx *ctx = p;
int res = ecdsa_verify (&ctx->pub, if (! ecdsa_verify (&ctx->pub,
ctx->digest_size, ctx->digest, ctx->digest_size, ctx->digest,
&ctx->s); &ctx->s))
if (!res)
die ("Internal error, _ecdsa_verify failed.\n"); die ("Internal error, _ecdsa_verify failed.\n");
} }
static void static void
bench_ecdsa_clear (void *p) bench_ecdsa_clear (void *p)
{ {
struct ecdsa_ctx *ctx = (struct ecdsa_ctx *) p; struct ecdsa_ctx *ctx = p;
ecc_point_clear (&ctx->pub); ecc_point_clear (&ctx->pub);
ecc_scalar_clear (&ctx->key); ecc_scalar_clear (&ctx->key);
...@@ -515,7 +511,7 @@ bench_openssl_rsa_init (unsigned size) ...@@ -515,7 +511,7 @@ bench_openssl_rsa_init (unsigned size)
if (! RSA_sign (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE, if (! RSA_sign (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE,
ctx->ref, &ctx->siglen, ctx->key)) ctx->ref, &ctx->siglen, ctx->key))
die ("OpenSSL RSA_sign failed: error = %ld.\n", ERR_get_error()); die ("OpenSSL RSA_sign failed.\n");
return ctx; return ctx;
} }
...@@ -523,27 +519,27 @@ bench_openssl_rsa_init (unsigned size) ...@@ -523,27 +519,27 @@ bench_openssl_rsa_init (unsigned size)
static void static void
bench_openssl_rsa_sign (void *p) bench_openssl_rsa_sign (void *p)
{ {
const struct openssl_rsa_ctx *ctx = (const struct openssl_rsa_ctx *) p; const struct openssl_rsa_ctx *ctx = p;
unsigned siglen; unsigned siglen;
if (! RSA_sign (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE, if (! RSA_sign (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE,
ctx->signature, &siglen, ctx->key)) ctx->signature, &siglen, ctx->key))
die ("OpenSSL RSA_sign failed: error = %ld.\n", ERR_get_error()); die ("OpenSSL RSA_sign failed.\n");
} }
static void static void
bench_openssl_rsa_verify (void *p) bench_openssl_rsa_verify (void *p)
{ {
const struct openssl_rsa_ctx *ctx = (const struct openssl_rsa_ctx *) p; const struct openssl_rsa_ctx *ctx = p;
if (! RSA_verify (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE, if (! RSA_verify (NID_sha1, ctx->digest, SHA1_DIGEST_SIZE,
ctx->ref, ctx->siglen, ctx->key)) ctx->ref, ctx->siglen, ctx->key))
die ("OpenSSL RSA_verify failed: error = %ld.\n", ERR_get_error()); die ("OpenSSL RSA_verify failed.\n");
} }
static void static void
bench_openssl_rsa_clear (void *p) bench_openssl_rsa_clear (void *p)
{ {
struct openssl_rsa_ctx *ctx = (struct openssl_rsa_ctx *) p; struct openssl_rsa_ctx *ctx = p;
RSA_free (ctx->key); RSA_free (ctx->key);
free (ctx->ref); free (ctx->ref);
free (ctx->signature); free (ctx->signature);
...@@ -612,7 +608,7 @@ bench_openssl_ecdsa_init (unsigned size) ...@@ -612,7 +608,7 @@ bench_openssl_ecdsa_init (unsigned size)
static void static void
bench_openssl_ecdsa_sign (void *p) bench_openssl_ecdsa_sign (void *p)
{ {
const struct openssl_ecdsa_ctx *ctx = (const struct openssl_ecdsa_ctx *) p; const struct openssl_ecdsa_ctx *ctx = p;
ECDSA_SIG *sig = ECDSA_do_sign (ctx->digest, ctx->digest_length, ctx->key); ECDSA_SIG *sig = ECDSA_do_sign (ctx->digest, ctx->digest_length, ctx->key);
ECDSA_SIG_free (sig); ECDSA_SIG_free (sig);
} }
...@@ -620,16 +616,15 @@ bench_openssl_ecdsa_sign (void *p) ...@@ -620,16 +616,15 @@ bench_openssl_ecdsa_sign (void *p)
static void static void
bench_openssl_ecdsa_verify (void *p) bench_openssl_ecdsa_verify (void *p)
{ {
const struct openssl_ecdsa_ctx *ctx = (const struct openssl_ecdsa_ctx *) p; const struct openssl_ecdsa_ctx *ctx = p;
int res = ECDSA_do_verify (ctx->digest, ctx->digest_length, if (ECDSA_do_verify (ctx->digest, ctx->digest_length,
ctx->signature, ctx->key); ctx->signature, ctx->key) != 1)
if (res != 1)
die ("Openssl ECDSA_do_verify failed.\n"); die ("Openssl ECDSA_do_verify failed.\n");
} }
static void static void
bench_openssl_ecdsa_clear (void *p) bench_openssl_ecdsa_clear (void *p)
{ {
struct openssl_ecdsa_ctx *ctx = (struct openssl_ecdsa_ctx *) p; struct openssl_ecdsa_ctx *ctx = p;
ECDSA_SIG_free (ctx->signature); ECDSA_SIG_free (ctx->signature);
EC_KEY_free (ctx->key); EC_KEY_free (ctx->key);
free (ctx->digest); free (ctx->digest);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment