Commit 51f3021d authored by Nicola Tuveri's avatar Nicola Tuveri Committed by Matt Caswell
Browse files

Remove stale SM2 error codes 



Run `make update ERROR_REBUILD=-rebuild` to remove some stale error
codes for SM2 (which is now using its own submodule for error codes,
i.e., `SM2_*`).

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6690)
parent 3c849bc9

crypto/ec/ec_err.c

+0 −6
Original line number Diff line number Diff line
@@ -261,12 +261,6 @@ static const ERR_STRING_DATA EC_str_functs[] = { 
    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_KEYGEN, 0), "pkey_ec_keygen"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_PARAMGEN, 0), "pkey_ec_paramgen"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_EC_SIGN, 0), "pkey_ec_sign"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_CTRL, 0), "pkey_sm2_ctrl"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_CTRL_STR, 0), "pkey_sm2_ctrl_str"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_INIT, 0), "pkey_sm2_init"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_KEYGEN, 0), "pkey_sm2_keygen"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_PARAMGEN, 0), "pkey_sm2_paramgen"},

    {ERR_PACK(ERR_LIB_EC, EC_F_PKEY_SM2_SIGN, 0), "pkey_sm2_sign"},

    {ERR_PACK(ERR_LIB_EC, EC_F_VALIDATE_ECX_DERIVE, 0), "validate_ecx_derive"},

    {0, NULL}

};

crypto/include/internal/sm2err.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 


# ifndef OPENSSL_NO_SM2



#  ifdef  __cplusplus

extern "C"

#  endif

int ERR_load_SM2_strings(void);



/*

include/internal/dsoerr.h

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 


# ifndef OPENSSL_NO_DSO



#  ifdef  __cplusplus

extern "C"

#  endif

int ERR_load_DSO_strings(void);



/*

include/openssl/ecerr.h

+0 −6
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ int ERR_load_EC_strings(void); 
#  define EC_F_PKEY_EC_KEYGEN                              199

#  define EC_F_PKEY_EC_PARAMGEN                            219

#  define EC_F_PKEY_EC_SIGN                                218

#  define EC_F_PKEY_SM2_CTRL                               284

#  define EC_F_PKEY_SM2_CTRL_STR                           285

#  define EC_F_PKEY_SM2_INIT                               287

#  define EC_F_PKEY_SM2_KEYGEN                             288

#  define EC_F_PKEY_SM2_PARAMGEN                           289

#  define EC_F_PKEY_SM2_SIGN                               290

#  define EC_F_VALIDATE_ECX_DERIVE                         278



/*