Commit 675f4cee authored by Paul Yang's avatar Paul Yang
Browse files

Update document for SM2 stuffs 



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 a6c4cb84

crypto/err/openssl.txt

+2 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,7 @@ RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1:126:RSA_verify_PKCS1_PSS_mgf1 
RSA_F_SETUP_TBUF:167:setup_tbuf

SM2_F_PKEY_SM2_CTRL:109:pkey_sm2_ctrl

SM2_F_PKEY_SM2_CTRL_STR:110:pkey_sm2_ctrl_str

SM2_F_PKEY_SM2_DIGEST_CUSTOM:114:pkey_sm2_digest_custom

SM2_F_PKEY_SM2_INIT:111:pkey_sm2_init

SM2_F_PKEY_SM2_SIGN:112:pkey_sm2_sign

SM2_F_SM2_COMPUTE_MSG_HASH:100:sm2_compute_msg_hash
@@ -2556,6 +2557,7 @@ SM2_R_ASN1_ERROR:100:asn1 error 
SM2_R_BAD_SIGNATURE:101:bad signature

SM2_R_BUFFER_TOO_SMALL:107:buffer too small

SM2_R_DIST_ID_TOO_LARGE:110:dist id too large

SM2_R_ID_NOT_SET:112:id not set

SM2_R_ID_TOO_LARGE:111:id too large

SM2_R_INVALID_CURVE:108:invalid curve

SM2_R_INVALID_DIGEST:102:invalid digest

crypto/evp/m_sigver.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int do_sigver_init(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx, 
     * This indicates the current algorithm requires

     * special treatment before hashing the tbs-message.

     */

    if (ctx->pctx->pmeth->digest_custom)

    if (ctx->pctx->pmeth->digest_custom != NULL)

        return ctx->pctx->pmeth->digest_custom(ctx->pctx, ctx);



    return 1;

crypto/evp/pmeth_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -859,6 +859,6 @@ void EVP_PKEY_meth_get_digest_custom(EVP_PKEY_METHOD *pmeth, 
                                     int (**pdigest_custom) (EVP_PKEY_CTX *ctx,

                                                             EVP_MD_CTX *mctx))

{

    if (*pdigest_custom)

    if (pdigest_custom != NULL)

        *pdigest_custom = pmeth->digest_custom;

}

crypto/include/internal/sm2err.h

+5 −0
Original line number Diff line number Diff line
@@ -25,9 +25,11 @@ int ERR_load_SM2_strings(void); 
 */

#  define SM2_F_PKEY_SM2_CTRL                              109

#  define SM2_F_PKEY_SM2_CTRL_STR                          110

#  define SM2_F_PKEY_SM2_DIGEST_CUSTOM                     114

#  define SM2_F_PKEY_SM2_INIT                              111

#  define SM2_F_PKEY_SM2_SIGN                              112

#  define SM2_F_SM2_COMPUTE_MSG_HASH                       100

#  define SM2_F_SM2_COMPUTE_USERID_DIGEST                  101

#  define SM2_F_SM2_COMPUTE_Z_DIGEST                       113

#  define SM2_F_SM2_DECRYPT                                102

#  define SM2_F_SM2_ENCRYPT                                103
@@ -43,6 +45,8 @@ int ERR_load_SM2_strings(void); 
#  define SM2_R_ASN1_ERROR                                 100

#  define SM2_R_BAD_SIGNATURE                              101

#  define SM2_R_BUFFER_TOO_SMALL                           107

#  define SM2_R_DIST_ID_TOO_LARGE                          110

#  define SM2_R_ID_NOT_SET                                 112

#  define SM2_R_ID_TOO_LARGE                               111

#  define SM2_R_INVALID_CURVE                              108

#  define SM2_R_INVALID_DIGEST                             102
@@ -50,6 +54,7 @@ int ERR_load_SM2_strings(void); 
#  define SM2_R_INVALID_ENCODING                           104

#  define SM2_R_INVALID_FIELD                              105

#  define SM2_R_NO_PARAMETERS_SET                          109

#  define SM2_R_USER_ID_TOO_LARGE                          106



# endif

#endif

crypto/sm2/sm2_err.c

+7 −0
Original line number Diff line number Diff line
@@ -16,10 +16,14 @@ 
static const ERR_STRING_DATA SM2_str_functs[] = {

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_CTRL, 0), "pkey_sm2_ctrl"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_CTRL_STR, 0), "pkey_sm2_ctrl_str"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_DIGEST_CUSTOM, 0),

     "pkey_sm2_digest_custom"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_INIT, 0), "pkey_sm2_init"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_SIGN, 0), "pkey_sm2_sign"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_SM2_COMPUTE_MSG_HASH, 0),

     "sm2_compute_msg_hash"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_SM2_COMPUTE_USERID_DIGEST, 0),

     "sm2_compute_userid_digest"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_SM2_COMPUTE_Z_DIGEST, 0),

     "sm2_compute_z_digest"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_SM2_DECRYPT, 0), "sm2_decrypt"},
@@ -36,6 +40,8 @@ static const ERR_STRING_DATA SM2_str_reasons[] = { 
    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ASN1_ERROR), "asn1 error"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BAD_SIGNATURE), "bad signature"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BUFFER_TOO_SMALL), "buffer too small"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DIST_ID_TOO_LARGE), "dist id too large"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_NOT_SET), "id not set"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_ID_TOO_LARGE), "id too large"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_CURVE), "invalid curve"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest"},
@@ -44,6 +50,7 @@ static const ERR_STRING_DATA SM2_str_reasons[] = { 
    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ENCODING), "invalid encoding"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_FIELD), "invalid field"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PARAMETERS_SET), "no parameters set"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_USER_ID_TOO_LARGE), "user id too large"},

    {0, NULL}

};