if (!ec) {
return NULL;
}
- if (!(priv = EC_KEY_get0_private_key(ec)))
+ if ((priv = EC_KEY_get0_private_key(ec)) == NULL)
return NULL;
return (BIGNUM *)priv;
}
dto = DSA_new();
EVP_PKEY_assign(to, EVP_PKEY_base_id(from), dto);
}
-#define COPYBIGNUM(a,b,x) if (a->x) BN_free(a->x); a->x=BN_dup(b->x);
- COPYBIGNUM(dto, dfrom, p)
- COPYBIGNUM(dto, dfrom, q)
- COPYBIGNUM(dto, dfrom, g)
+ BN_free(dto->p);
+ dto->p = BN_dup(dfrom->p);
+ BN_free(dto->q);
+ dto->q = BN_dup(dfrom->q);
+ BN_free(dto->g);
+ dto->g = BN_dup(dfrom->g);
- if (dto->priv_key)
+ if (dto->priv_key)
gost94_compute_public(dto);
return 1;
}
Y = BN_new();
if (!X || !Y) {
GOSTerr(GOST_F_PUB_ENCODE_GOST01, ERR_R_MALLOC_FAILURE);
- if (X)
- BN_free(X);
- if (Y)
- BN_free(Y);
+ BN_free(X);
+ BN_free(Y);
BN_free(order);
return 0;
}
/* ---------------------- ASN1 METHOD for GOST MAC -------------------*/
static void mackey_free_gost(EVP_PKEY *pk)
{
- if (pk->pkey.ptr) {
- OPENSSL_free(pk->pkey.ptr);
- }
+ OPENSSL_free(pk->pkey.ptr);
}
static int mac_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2)