Commit 5bd0abe7 authored by Paul Yang's avatar Paul Yang
Browse files

Remove unnecessary sm2_za.c 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7113)
parent 63c5ac80

crypto/include/internal/sm2.h

+0 −5
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
/* The default user id as specified in GM/T 0009-2012 */

#  define SM2_DEFAULT_USERID "1234567812345678"



int sm2_compute_userid_digest(uint8_t *out,

                              const EVP_MD *digest,

                              const char *user_id, const EC_KEY *key);



/*

 * SM2 signature operation. Computes ZA (user id digest) and then signs

 * H(ZA || msg) using SM2
@@ -49,7 +45,6 @@ int sm2_sign(const unsigned char *dgst, int dgstlen, 
int sm2_verify(const unsigned char *dgst, int dgstlen,

               const unsigned char *sig, int siglen, EC_KEY *eckey);





/*

 * SM2 encryption

 */

crypto/sm2/build.info

+1 −1
Original line number Diff line number Diff line 
LIBS=../../libcrypto

SOURCE[../../libcrypto]=\

        sm2_za.c sm2_sign.c sm2_crypt.c sm2_err.c sm2_pmeth.c

        sm2_sign.c sm2_crypt.c sm2_err.c sm2_pmeth.c

crypto/sm2/sm2_sign.c

+115 −2
Original line number Diff line number Diff line
@@ -18,6 +18,120 @@ 
#include <openssl/bn.h>

#include <string.h>



static int sm2_compute_userid_digest(uint8_t *out,

                                     const EVP_MD *digest,

                                     const char *user_id,

                                     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;

    uint16_t entla = 0;

    uint8_t e_byte = 0;



    hash = EVP_MD_CTX_new();

    ctx = BN_CTX_new();

    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);

    b = BN_CTX_get(ctx);

    xG = BN_CTX_get(ctx);

    yG = BN_CTX_get(ctx);

    xA = BN_CTX_get(ctx);

    yA = BN_CTX_get(ctx);



    if (yA == NULL) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);

        goto done;

    }



    if (!EVP_DigestInit(hash, digest)) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);

        goto done;

    }



    /* Z = SM3(ENTLA || IDA || a || b || xG || yG || xA || yA) */



    uid_len = strlen(user_id);

    if (uid_len >= (UINT16_MAX / 8)) {

        /* too large */

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, SM2_R_USER_ID_TOO_LARGE);

        goto done;

    }



    entla = (uint16_t)(8 * uid_len);



    e_byte = entla >> 8;

    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)

            || !EVP_DigestUpdate(hash, user_id, uid_len)) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);

        goto done;

    }



    if (!EC_GROUP_get_curve(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);

    if (buf == NULL) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);

        goto done;

    }



    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(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(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;



 done:

    OPENSSL_free(buf);

    BN_CTX_free(ctx);

    EVP_MD_CTX_free(hash);

    return rc;

}



static BIGNUM *sm2_compute_msg_hash(const EVP_MD *digest,

                                    const EC_KEY *key,

                                    const char *user_id,
@@ -85,7 +199,6 @@ static ECDSA_SIG *sm2_sig_gen(const EC_KEY *key, const BIGNUM *e) 
        goto done;

    }





    BN_CTX_start(ctx);

    k = BN_CTX_get(ctx);

    rk = BN_CTX_get(ctx);

crypto/sm2/sm2_za.c

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
/*

 * Copyright 2017-2018 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 2017 Ribose Inc. All Rights Reserved.

 * Ported from Ribose contributions from Botan.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

 */



#include "internal/sm2.h"

#include "internal/sm2err.h"

#include <openssl/err.h>

#include <openssl/evp.h>

#include <openssl/bn.h>

#include <string.h>

#include "internal/numbers.h"



int sm2_compute_userid_digest(uint8_t *out,

                              const EVP_MD *digest,

                              const char *user_id,

                              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;

    uint16_t entla = 0;

    uint8_t e_byte = 0;



    hash = EVP_MD_CTX_new();

    ctx = BN_CTX_new();

    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);

    b = BN_CTX_get(ctx);

    xG = BN_CTX_get(ctx);

    yG = BN_CTX_get(ctx);

    xA = BN_CTX_get(ctx);

    yA = BN_CTX_get(ctx);



    if (yA == NULL) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);

        goto done;

    }



    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) */



    uid_len = strlen(user_id);

    if (uid_len >= (UINT16_MAX / 8)) {

        /* too large */

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, SM2_R_USER_ID_TOO_LARGE);

        goto done;

    }



    entla = (uint16_t)(8 * uid_len);



    e_byte = entla >> 8;

    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)

            || !EVP_DigestUpdate(hash, user_id, uid_len)) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_EVP_LIB);

        goto done;

    }



    if (!EC_GROUP_get_curve(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);

    if (buf == NULL) {

        SM2err(SM2_F_SM2_COMPUTE_USERID_DIGEST, ERR_R_MALLOC_FAILURE);

        goto done;

    }



    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(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(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;



 done:

    OPENSSL_free(buf);

    BN_CTX_free(ctx);

    EVP_MD_CTX_free(hash);

    return rc;

}