for (i = 0; i < len; i++) {
buf[len - i - 1] = dgst[i];
}
- return getbnfrombuf(buf, len);
+ return BN_bin2bn(buf, len, NULL);
}
static R3410_ec_params *gost_nid2params(int nid)
goto end;
}
ok = 1;
-end:
+ end:
if (P)
EC_POINT_free(P);
if (grp)
const BIGNUM *priv_key;
BIGNUM *r = NULL, *s = NULL, *X = NULL, *tmp = NULL, *tmp2 = NULL,
*k = NULL, *e = NULL;
+
+ BIGNUM *new_r = NULL, *new_s = NULL;
+
EC_POINT *C = NULL;
BN_CTX *ctx;
md = hashsum2bn(dgst, dlen);
newsig = DSA_SIG_new();
if (!newsig || !md) {
- GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_NO_MEMORY);
+ GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE);
goto err;
}
group = EC_KEY_get0_group(eckey);
do {
do {
if (!BN_rand_range(k, order)) {
- GOSTerr(GOST_F_GOST_EC_SIGN,
- GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
+ GOSTerr(GOST_F_GOST_EC_SIGN, GOST_R_RNG_ERROR);
goto err;
}
/*
}
while (BN_is_zero(s));
- newsig->s = BN_dup(s);
- newsig->r = BN_dup(r);
- if (!newsig->s || !newsig->r) {
+ new_s = BN_dup(s);
+ new_r = BN_dup(r);
+ if (!new_s || !new_r) {
GOSTerr(GOST_F_GOST_EC_SIGN, ERR_R_MALLOC_FAILURE);
goto err;
}
+ DSA_SIG_set0(newsig, new_r, new_s);
ret = newsig;
err:
BIGNUM *order;
BIGNUM *md = NULL, *e = NULL, *R = NULL, *v = NULL,
*z1 = NULL, *z2 = NULL;
+ const BIGNUM *sig_s = NULL, *sig_r = NULL;
BIGNUM *X = NULL, *tmp = NULL;
EC_POINT *C = NULL;
const EC_POINT *pub_key = NULL;
OPENSSL_assert(dgst != NULL && sig != NULL && group != NULL);
if (!(ctx = BN_CTX_new())) {
- GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_NO_MEMORY);
+ GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_MALLOC_FAILURE);
return 0;
}
goto err;
}
- if (BN_is_zero(sig->s) || BN_is_zero(sig->r) ||
- (BN_cmp(sig->s, order) >= 1) || (BN_cmp(sig->r, order) >= 1)) {
+ DSA_SIG_get0(sig, &sig_r, &sig_s);
+
+ if (BN_is_zero(sig_s) || BN_is_zero(sig_r) ||
+ (BN_cmp(sig_s, order) >= 1) || (BN_cmp(sig_r, order) >= 1)) {
GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_SIGNATURE_PARTS_GREATER_THAN_Q);
goto err;
goto err;
}
v = BN_mod_inverse(v, e, order, ctx);
- if (!v
- || !BN_mod_mul(z1, sig->s, v, order, ctx)
- || !BN_sub(tmp, order, sig->r)
+ if (!v || !BN_mod_mul(z1, sig_s, v, order, ctx)
+ || !BN_sub(tmp, order, sig_r)
|| !BN_mod_mul(z2, tmp, v, order, ctx)) {
GOSTerr(GOST_F_GOST_EC_VERIFY, ERR_R_INTERNAL_ERROR);
goto err;
BN_print_fp(stderr, R);
fprintf(stderr, "\n");
#endif
- if (BN_cmp(R, sig->r) != 0) {
+ if (BN_cmp(R, sig_r) != 0) {
GOSTerr(GOST_F_GOST_EC_VERIFY, GOST_R_SIGNATURE_MISMATCH);
} else {
ok = 1;
do {
if (!BN_rand_range(d, order)) {
- GOSTerr(GOST_F_GOST_EC_KEYGEN,
- GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
+ GOSTerr(GOST_F_GOST_EC_KEYGEN, GOST_R_RNG_ERROR);
goto end;
}
}
}
ok = 1;
-end:
+ end:
if (d)
BN_free(d);
if (order)
BN_free(order);
-
+
return (ok) ? gost_ec_compute_public(ec) : 0;
}