Commit d5d65ea3 authored by Niels Möller's avatar Niels Möller
Browse files

Updated for new md5 and rsa conventions.

Rev: src/nettle/rsa-compat.c:1.3
parent 6e0c5d8e
...@@ -76,10 +76,18 @@ R_SignFinal(R_SIGNATURE_CTX *ctx, ...@@ -76,10 +76,18 @@ R_SignFinal(R_SIGNATURE_CTX *ctx,
nettle_mpz_init_set_str_256(k.c, nettle_mpz_init_set_str_256(k.c,
MAX_RSA_MODULUS_LEN, key->coefficient); MAX_RSA_MODULUS_LEN, key->coefficient);
if (rsa_init_private_key(&k) && (k.pub.size <= MAX_RSA_MODULUS_LEN)) if (rsa_prepare_private_key(&k) && (k.pub.size <= MAX_RSA_MODULUS_LEN))
{ {
mpz_t s;
mpz_init(s);
rsa_md5_sign(&k, &ctx->hash, s);
nettle_mpz_get_str_256(k.pub.size, signature, s);
mpz_clear(s);
*length = k.pub.size; *length = k.pub.size;
rsa_md5_sign(&k, &ctx->hash, signature);
res = RE_SUCCESS; res = RE_SUCCESS;
} }
else else
...@@ -126,10 +134,18 @@ R_VerifyFinal(R_SIGNATURE_CTX *ctx, ...@@ -126,10 +134,18 @@ R_VerifyFinal(R_SIGNATURE_CTX *ctx,
MAX_RSA_MODULUS_LEN, key->modulus); MAX_RSA_MODULUS_LEN, key->modulus);
nettle_mpz_init_set_str_256(k.e, nettle_mpz_init_set_str_256(k.e,
MAX_RSA_MODULUS_LEN, key->exponent); MAX_RSA_MODULUS_LEN, key->exponent);
if (rsa_prepare_public_key(&k) && (k.size == length))
{
mpz_t s;
nettle_mpz_init_set_str_256(s,
k.size, signature);
res = rsa_md5_verify(&k, &ctx->hash, s)
? RE_SUCCESS : RE_SIGNATURE;
if (rsa_init_public_key(&k) && (k.size == length)) mpz_clear(s);
res = rsa_md5_verify(&k, &ctx->hash, signature) }
? RE_SUCCESS : RE_SIGNATURE;
else else
res = RE_PUBLIC_KEY; res = RE_PUBLIC_KEY;
......
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