More more on SM2 error codes and tidy up

[openssl.git] / crypto / sm2 / sm2_za.c

diff --git a/crypto/sm2/sm2_za.c b/crypto/sm2/sm2_za.c
index cf355238b284c9ad8ca6eb37e85b098e61fc7579..9b1f70cdddecb5b43bf1a22877edbd206ac078ae 100644 (file)
--- a/crypto/sm2/sm2_za.c
+++ b/crypto/sm2/sm2_za.c
@@ -10,6 +10,8 @@
  */
 
 #include "internal/sm2.h"
+#include "internal/sm2err.h"
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
 #include <string.h>
@@ -20,21 +22,16 @@ int SM2_compute_userid_digest(uint8_t *out,
                               const EC_KEY *key)
 {
     int rc = 0;
-
     const EC_GROUP *group = EC_KEY_get0_group(key);
-
     BN_CTX *ctx = NULL;
     EVP_MD_CTX *hash = NULL;
-
     BIGNUM *p = NULL;
     BIGNUM *a = NULL;
     BIGNUM *b = NULL;
-
     BIGNUM *xG = NULL;
     BIGNUM *yG = NULL;
     BIGNUM *xA = NULL;
     BIGNUM *yA = NULL;
-
     int p_bytes = 0;
     uint8_t *buf = NULL;
     size_t uid_len = 0;
@@ -42,12 +39,11 @@ int SM2_compute_userid_digest(uint8_t *out,
     uint8_t e_byte = 0;
 
     hash = EVP_MD_CTX_new();
-    if (hash == NULL)
-       goto done;
-
     ctx = BN_CTX_new();
-    if (ctx == NULL)
-       goto done;
+    if (hash == NULL || ctx == NULL) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);
+        goto done;
+    }
 
     p = BN_CTX_get(ctx);
     a = BN_CTX_get(ctx);
@@ -57,70 +53,75 @@ int SM2_compute_userid_digest(uint8_t *out,
     xA = BN_CTX_get(ctx);
     yA = BN_CTX_get(ctx);
 
-    if (p == NULL || a == NULL || b == NULL ||
-        xG == NULL || yG == NULL || xA == NULL || yA == NULL)
-       goto done;
+    if (yA == NULL) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);
+        goto done;
+    }
 
     memset(out, 0, EVP_MD_size(digest));
 
-    if (EVP_DigestInit(hash, digest) == 0)
+    if (!EVP_DigestInit(hash, digest)) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);
         goto done;
+    }
 
-    /*
-       ZA=H256(ENTLA || IDA || a || b || xG || yG || xA || yA)
-     */
+    /* ZA = H256(ENTLA || IDA || a || b || xG || yG || xA || yA) */
 
     uid_len = strlen(user_id);
-
-    if (uid_len >= 8192)        /* too large */
+    if (uid_len >= (UINT16_MAX / 8)) {
+        /* too large */
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, SM2_R_USER_ID_TOO_LARGE);
         goto done;
+    }
 
-    entla = (unsigned short)(8 * uid_len);
+    entla = (uint16_t)(8 * uid_len);
 
     e_byte = entla >> 8;
-    if (EVP_DigestUpdate(hash, &e_byte, 1) == 0)
+    if (!EVP_DigestUpdate(hash, &e_byte, 1)) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);
         goto done;
+    }
     e_byte = entla & 0xFF;
-    if (EVP_DigestUpdate(hash, &e_byte, 1) == 0)
+    if (!EVP_DigestUpdate(hash, &e_byte, 1)
+            || !EVP_DigestUpdate(hash, user_id, uid_len)) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);
         goto done;
+    }
 
-    if (EVP_DigestUpdate(hash, user_id, uid_len) == 0)
-        goto done;
-
-    if (EC_GROUP_get_curve_GFp(group, p, a, b, ctx) == 0)
+    if (!EC_GROUP_get_curve_GFp(group, p, a, b, ctx)) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EC_LIB);
         goto done;
+    }
 
     p_bytes = BN_num_bytes(p);
     buf = OPENSSL_zalloc(p_bytes);
-
-    BN_bn2binpad(a, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
-        goto done;
-    BN_bn2binpad(b, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
-        goto done;
-    EC_POINT_get_affine_coordinates_GFp(group,
-                                        EC_GROUP_get0_generator(group),
-                                        xG, yG, ctx);
-    BN_bn2binpad(xG, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
-        goto done;
-    BN_bn2binpad(yG, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
+    if (buf == NULL) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);
         goto done;
-
-    EC_POINT_get_affine_coordinates_GFp(group,
-                                        EC_KEY_get0_public_key(key),
-                                        xA, yA, ctx);
-    BN_bn2binpad(xA, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
-        goto done;
-    BN_bn2binpad(yA, buf, p_bytes);
-    if (EVP_DigestUpdate(hash, buf, p_bytes) == 0)
-        goto done;
-
-    if (EVP_DigestFinal(hash, out, NULL) == 0)
+    }
+
+    if (BN_bn2binpad(a, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || BN_bn2binpad(b, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || !EC_POINT_get_affine_coordinates_GFp(group,
+                                                EC_GROUP_get0_generator(group),
+                                                xG, yG, ctx)
+            || BN_bn2binpad(xG, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || BN_bn2binpad(yG, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || !EC_POINT_get_affine_coordinates_GFp(group,
+                                                    EC_KEY_get0_public_key(key),
+                                                    xA, yA, ctx)
+            || BN_bn2binpad(xA, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || BN_bn2binpad(yA, buf, p_bytes) < 0
+            || !EVP_DigestUpdate(hash, buf, p_bytes)
+            || !EVP_DigestFinal(hash, out, NULL)) {
+        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_INTERNAL_ERROR);
         goto done;
+    }
 
     rc = 1;