*/
#include "internal/sm2.h"
+#include "internal/sm2err.h"
+#include <openssl/err.h>
#include <openssl/evp.h>
+#include <openssl/err.h>
#include <openssl/bn.h>
#include <string.h>
-static BIGNUM *compute_msg_hash(const EVP_MD *digest,
- const EC_KEY *key,
- const char *user_id,
- const uint8_t *msg, size_t msg_len)
+static BIGNUM *SM2_compute_msg_hash(const EVP_MD *digest,
+ const EC_KEY *key,
+ const char *user_id,
+ const uint8_t *msg, size_t msg_len)
{
EVP_MD_CTX *hash = EVP_MD_CTX_new();
const int md_size = EVP_MD_size(digest);
BIGNUM *e = NULL;
if (za == NULL)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_MALLOC_FAILURE);
goto done;
+ }
if (hash == NULL)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_MALLOC_FAILURE);
goto done;
+ }
if (SM2_compute_userid_digest(za, digest, user_id, key) == 0)
goto done;
if (EVP_DigestInit(hash, digest) == 0)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_EVP_LIB);
goto done;
+ }
if (EVP_DigestUpdate(hash, za, md_size) == 0)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_EVP_LIB);
goto done;
+ }
if (EVP_DigestUpdate(hash, msg, msg_len) == 0)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_EVP_LIB);
goto done;
+ }
/* reuse za buffer to hold H(ZA || M) */
if (EVP_DigestFinal(hash, za, NULL) == 0)
+ {
+ SM2err(SM2_F_SM2_COMPUTE_MSG_HASH, ERR_R_EVP_LIB);
goto done;
+ }
e = BN_bin2bn(za, md_size, NULL);
kG = EC_POINT_new(group);
if (kG == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_MALLOC_FAILURE);
goto done;
+ }
ctx = BN_CTX_new();
if (ctx == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_MALLOC_FAILURE);
goto done;
+ }
BN_CTX_start(ctx);
tmp = BN_CTX_get(ctx);
if (tmp == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
goto done;
+ }
/* These values are returned and so should not be allocated out of the context */
r = BN_new();
s = BN_new();
if (r == NULL || s == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_MALLOC_FAILURE);
goto done;
+ }
for (;;) {
BN_priv_rand_range(k, order);
if (EC_POINT_mul(group, kG, k, NULL, NULL, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_EC_LIB);
goto done;
+ }
if (EC_POINT_get_affine_coordinates_GFp(group, kG, x1, NULL, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_EC_LIB);
goto done;
+ }
if (BN_mod_add(r, e, x1, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
goto done;
+ }
/* try again if r == 0 or r+k == n */
if (BN_is_zero(r))
if (BN_cmp(rk, order) == 0)
continue;
- BN_add(s, dA, BN_value_one());
- BN_mod_inverse(s, s, order, ctx);
-
- BN_mod_mul(tmp, dA, r, order, ctx);
- BN_sub(tmp, k, tmp);
-
- BN_mod_mul(s, s, tmp, order, ctx);
+ if(BN_add(s, dA, BN_value_one()) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
+ goto done;
+ }
+
+ if(BN_mod_inverse(s, s, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
+ goto done;
+ }
+
+ if(BN_mod_mul(tmp, dA, r, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
+ goto done;
+ }
+
+ if(BN_sub(tmp, k, tmp) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
+ goto done;
+ }
+
+ if(BN_mod_mul(s, s, tmp, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_BN_LIB);
+ goto done;
+ }
sig = ECDSA_SIG_new();
if (sig == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_GEN, ERR_R_MALLOC_FAILURE);
goto done;
+ }
/* takes ownership of r and s */
ECDSA_SIG_set0(sig, r, s);
ctx = BN_CTX_new();
if (ctx == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_MALLOC_FAILURE);
goto done;
+ }
+
pt = EC_POINT_new(group);
if (pt == NULL)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_MALLOC_FAILURE);
goto done;
+ }
BN_CTX_start(ctx);
x1 = BN_CTX_get(ctx);
if (x1 == NULL)
- goto done;
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_MALLOC_FAILURE);
+ goto done;
+ }
/*
B1: verify whether r' in [1,n-1], verification failed if not
ECDSA_SIG_get0(sig, &r, &s);
- if (BN_cmp(r, BN_value_one()) < 0)
- goto done;
- if (BN_cmp(s, BN_value_one()) < 0)
+ if ((BN_cmp(r, BN_value_one()) < 0) || (BN_cmp(s, BN_value_one()) < 0))
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, SM2_R_BAD_SIGNATURE);
goto done;
+ }
- if (BN_cmp(order, r) <= 0)
- goto done;
- if (BN_cmp(order, s) <= 0)
+ if ((BN_cmp(order, r) <= 0) || (BN_cmp(order, s) <= 0))
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, SM2_R_BAD_SIGNATURE);
goto done;
+ }
if (BN_mod_add(t, r, s, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_BN_LIB);
goto done;
+ }
if (BN_is_zero(t) == 1)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, SM2_R_BAD_SIGNATURE);
goto done;
+ }
if (EC_POINT_mul(group, pt, s, EC_KEY_get0_public_key(key), t, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_EC_LIB);
goto done;
+ }
if (EC_POINT_get_affine_coordinates_GFp(group, pt, x1, NULL, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_EC_LIB);
goto done;
+ }
if (BN_mod_add(t, e, x1, order, ctx) == 0)
+ {
+ SM2err(SM2_F_SM2_SIG_VERIFY, ERR_R_BN_LIB);
goto done;
+ }
if (BN_cmp(r, t) == 0)
ret = 1;
BIGNUM *e = NULL;
ECDSA_SIG *sig = NULL;
- e = compute_msg_hash(digest, key, user_id, msg, msg_len);
+ e = SM2_compute_msg_hash(digest, key, user_id, msg, msg_len);
if (e == NULL)
goto done;
BIGNUM *e = NULL;
int ret = -1;
- e = compute_msg_hash(digest, key, user_id, msg, msg_len);
+ e = SM2_compute_msg_hash(digest, key, user_id, msg, msg_len);
if (e == NULL)
goto done;
ECDSA_SIG *s = NULL;
int ret = -1;
- if (type != NID_sm3)
- goto done;
-
- if (dgstlen != 32) /* expected length of SM3 hash */
- goto done;
+ if (type != NID_sm3 || dgstlen != 32)
+ {
+ SM2err(SM2_F_SM2_SIGN, SM2_R_INVALID_DIGEST_TYPE);
+ goto done;
+ }
e = BN_bin2bn(dgst, dgstlen, NULL);
int ret = -1;
if (type != NID_sm3)
- goto done;
+ {
+ SM2err(SM2_F_SM2_VERIFY, SM2_R_INVALID_DIGEST_TYPE);
+ goto done;
+ }
s = ECDSA_SIG_new();
if (s == NULL)
+ {
+ SM2err(SM2_F_SM2_VERIFY, ERR_R_MALLOC_FAILURE);
goto done;
+ }
if (d2i_ECDSA_SIG(&s, &p, sig_len) == NULL)
+ {
+ SM2err(SM2_F_SM2_VERIFY, SM2_R_INVALID_ENCODING);
goto done;
+ }
/* Ensure signature uses DER and doesn't have trailing garbage */
derlen = i2d_ECDSA_SIG(s, &der);
if (derlen != sig_len || memcmp(sig, der, derlen) != 0)
+ {
+ SM2err(SM2_F_SM2_VERIFY, SM2_R_INVALID_ENCODING);
goto done;
+ }
e = BN_bin2bn(dgst, dgstlen, NULL);