Commit f922dac8 authored by Paul Yang's avatar Paul Yang
Browse files

Add missing SM2err and fix doc nits 



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 81c79453

crypto/err/openssl.txt

+1 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,7 @@ RSA_F_RSA_VERIFY:119:RSA_verify 
RSA_F_RSA_VERIFY_ASN1_OCTET_STRING:120:RSA_verify_ASN1_OCTET_STRING

RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1:126:RSA_verify_PKCS1_PSS_mgf1

RSA_F_SETUP_TBUF:167:setup_tbuf

SM2_F_PKEY_SM2_COPY:115:pkey_sm2_copy

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

crypto/include/internal/sm2err.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ int ERR_load_SM2_strings(void); 
/*

 * SM2 function codes.

 */

#  define SM2_F_PKEY_SM2_COPY                              115

#  define SM2_F_PKEY_SM2_CTRL                              109

#  define SM2_F_PKEY_SM2_CTRL_STR                          110

#  define SM2_F_PKEY_SM2_DIGEST_CUSTOM                     114

crypto/sm2/sm2_err.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#ifndef OPENSSL_NO_ERR



static const ERR_STRING_DATA SM2_str_functs[] = {

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_COPY, 0), "pkey_sm2_copy"},

    {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),

crypto/sm2/sm2_pmeth.c

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static int pkey_sm2_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src) 
    if (sctx->id != NULL) {

        dctx->id = OPENSSL_malloc(sctx->id_len);

        if (dctx->id == NULL) {

            SM2err(SM2_F_PKEY_SM2_COPY, ERR_R_MALLOC_FAILURE);

            pkey_sm2_cleanup(dst);

            return 0;

        }
@@ -195,8 +196,10 @@ static int pkey_sm2_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
    case EVP_PKEY_CTRL_SET1_ID:

        if (p1 > 0) {

            tmp_id = OPENSSL_malloc(p1);

            if (tmp_id == NULL)

            if (tmp_id == NULL) {

                SM2err(SM2_F_PKEY_SM2_CTRL, ERR_R_MALLOC_FAILURE);

                return 0;

            }

            memcpy(tmp_id, p2, p1);

            OPENSSL_free(smctx->id);

            smctx->id = tmp_id;

doc/man3/EVP_DigestInit.pod

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ B<ASN1_OBJECT> structure respectively. 
Assigns an B<EVP_PKEY_CTX> to B<EVP_MD_CTX>. This is usually used to provide

a customzied B<EVP_PKEY_CTX> to L<EVP_DigestSignInit(3)> or

L<EVP_DigestVerifyInit(3)>. The B<pctx> passed to this function should be freed

by the caller. A null B<pctx> pointer is also allowed to clear the B<EVP_PKEY_CTX>

by the caller. A NULL B<pctx> pointer is also allowed to clear the B<EVP_PKEY_CTX>

assigned to B<ctx>. In such case, freeing the cleared B<EVP_PKEY_CTX> or not

depends on how the B<EVP_PKEY_CTX> is created.