Commit 722add71 authored by Matt Caswell's avatar Matt Caswell
Browse files

Rebuild error codes 



There were a large number of error codes that were unused (probably a
copy&paste from somewhere else). Since these have never been made public
we should remove then and rebuild the error codes.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6386)
parent 2167239a

crypto/err/openssl.txt

+16 −75
Original line number Diff line number Diff line
@@ -1063,20 +1063,15 @@ 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_CTRL:274:pkey_sm2_ctrl

SM2_F_PKEY_SM2_CTRL_STR:275:pkey_sm2_ctrl_str

SM2_F_PKEY_SM2_KEYGEN:276:pkey_sm2_keygen

SM2_F_PKEY_SM2_PARAMGEN:277:pkey_sm2_paramgen

SM2_F_PKEY_SM2_SIGN:278:pkey_sm2_sign

SM2_F_SM2_COMPUTE_MSG_HASH:284:sm2_compute_msg_hash

SM2_F_SM2_COMPUTE_USERID_DIGEST:286:sm2_compute_userid_digest

SM2_F_SM2_DECRYPT:279:sm2_decrypt

SM2_F_SM2_ENCRYPT:280:sm2_encrypt

SM2_F_SM2_PLAINTEXT_SIZE:287:sm2_plaintext_size

SM2_F_SM2_SIGN:281:sm2_sign

SM2_F_SM2_SIG_GEN:285:sm2_sig_gen

SM2_F_SM2_SIG_VERIFY:282:sm2_sig_verify

SM2_F_SM2_VERIFY:283:sm2_verify

SM2_F_SM2_COMPUTE_MSG_HASH:100:sm2_compute_msg_hash

SM2_F_SM2_COMPUTE_USERID_DIGEST:101:sm2_compute_userid_digest

SM2_F_SM2_DECRYPT:102:sm2_decrypt

SM2_F_SM2_ENCRYPT:103:sm2_encrypt

SM2_F_SM2_PLAINTEXT_SIZE:104:sm2_plaintext_size

SM2_F_SM2_SIGN:105:sm2_sign

SM2_F_SM2_SIG_GEN:106:sm2_sig_gen

SM2_F_SM2_SIG_VERIFY:107:sm2_sig_verify

SM2_F_SM2_VERIFY:108:sm2_verify

SSL_F_ADD_CLIENT_KEY_SHARE_EXT:438:*

SSL_F_ADD_KEY_SHARE:512:add_key_share

SSL_F_BYTES_TO_CIPHER_LIST:519:bytes_to_cipher_list
@@ -2524,67 +2519,13 @@ RSA_R_UNSUPPORTED_MASK_PARAMETER:154:unsupported mask parameter 
RSA_R_UNSUPPORTED_SIGNATURE_TYPE:155:unsupported signature type

RSA_R_VALUE_MISSING:147:value missing

RSA_R_WRONG_SIGNATURE_LENGTH:119:wrong signature length

SM2_R_ASN1_ERROR:115:asn1 error

SM2_R_ASN5_ERROR:1150:asn5 error

SM2_R_BAD_SIGNATURE:156:bad signature

SM2_R_BIGNUM_OUT_OF_RANGE:144:bignum out of range

SM2_R_BUFFER_TOO_SMALL:100:buffer too small

SM2_R_COORDINATES_OUT_OF_RANGE:146:coordinates out of range

SM2_R_CURVE_DOES_NOT_SUPPORT_ECDH:160:curve does not support ecdh

SM2_R_CURVE_DOES_NOT_SUPPORT_SIGNING:159:curve does not support signing

SM2_R_D2I_ECPKPARAMETERS_FAILURE:117:d2i ecpkparameters failure

SM2_R_DECODE_ERROR:142:decode error

SM2_R_DISCRIMINANT_IS_ZERO:118:discriminant is zero

SM2_R_EC_GROUP_NEW_BY_NAME_FAILURE:119:ec group new by name failure

SM2_R_FIELD_TOO_LARGE:143:field too large

SM2_R_GF2M_NOT_SUPPORTED:147:gf2m not supported

SM2_R_GROUP2PKPARAMETERS_FAILURE:120:group2pkparameters failure

SM2_R_I2D_ECPKPARAMETERS_FAILURE:121:i2d ecpkparameters failure

SM2_R_INCOMPATIBLE_OBJECTS:101:incompatible objects

SM2_R_INVALID_ARGUMENT:112:invalid argument

SM2_R_INVALID_COMPRESSED_POINT:110:invalid compressed point

SM2_R_INVALID_COMPRESSION_BIT:109:invalid compression bit

SM2_R_INVALID_CURVE:141:invalid curve

SM2_R_INVALID_DIGEST:151:invalid digest

SM2_R_INVALID_DIGEST_TYPE:138:invalid digest type

SM2_R_INVALID_ENCODING:102:invalid encoding

SM2_R_INVALID_FIELD:103:invalid field

SM2_R_INVALID_FORM:104:invalid form

SM2_R_INVALID_GROUP_ORDER:122:invalid group order

SM2_R_INVALID_KEY:116:invalid key

SM2_R_INVALID_OUTPUT_LENGTH:161:invalid output length

SM2_R_INVALID_PEER_KEY:133:invalid peer key

SM2_R_INVALID_PENTANOMIAL_BASIS:132:invalid pentanomial basis

SM2_R_INVALID_PRIVATE_KEY:123:invalid private key

SM2_R_INVALID_TRINOMIAL_BASIS:137:invalid trinomial basis

SM2_R_KDF_PARAMETER_ERROR:148:kdf parameter error

SM2_R_KEYS_NOT_SET:140:keys not set

SM2_R_MISSING_PARAMETERS:124:missing parameters

SM2_R_MISSING_PRIVATE_KEY:125:missing private key

SM2_R_NEED_NEW_SETUP_VALUES:157:need new setup values

SM2_R_NOT_A_NIST_PRIME:135:not a NIST prime

SM2_R_NOT_IMPLEMENTED:126:not implemented

SM2_R_NOT_INITIALIZED:111:not initialized

SM2_R_NO_PARAMETERS_SET:139:no parameters set

SM2_R_NO_PRIVATE_VALUE:154:no private value

SM2_R_OPERATION_NOT_SUPPORTED:152:operation not supported

SM2_R_PASSED_NULL_PARAMETER:134:passed null parameter

SM2_R_PEER_KEY_ERROR:149:peer key error

SM2_R_PKPARAMETERS2GROUP_FAILURE:127:pkparameters2group failure

SM2_R_POINT_ARITHMETIC_FAILURE:155:point arithmetic failure

SM2_R_POINT_AT_INFINITY:106:point at infinity

SM2_R_POINT_IS_NOT_ON_CURVE:107:point is not on curve

SM2_R_RANDOM_NUMBER_GENERATION_FAILED:158:random number generation failed

SM2_R_SHARED_INFO_ERROR:150:shared info error

SM2_R_SLOT_FULL:108:slot full

SM2_R_UNDEFINED_GENERATOR:113:undefined generator

SM2_R_UNDEFINED_ORDER:128:undefined order

SM2_R_UNKNOWN_GROUP:129:unknown group

SM2_R_UNKNOWN_ORDER:114:unknown order

SM2_R_UNSUPPORTED_FIELD:131:unsupported field

SM2_R_USER_ID_TOO_LARGE:136:user id too large

SM2_R_WRONG_CURVE_PARAMETERS:145:wrong curve parameters

SM2_R_WRONG_ORDER:130:wrong order

SM2_R_ASN1_ERROR:100:asn1 error

SM2_R_BAD_SIGNATURE:101:bad signature

SM2_R_INVALID_DIGEST:102:invalid digest

SM2_R_INVALID_DIGEST_TYPE:103:invalid digest type

SM2_R_INVALID_ENCODING:104:invalid encoding

SM2_R_INVALID_FIELD:105:invalid field

SM2_R_USER_ID_TOO_LARGE:106:user id too large

SSL_R_APP_DATA_IN_HANDSHAKE:100:app data in handshake

SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT:272:\

	attempt to reuse session in different context

crypto/include/internal/sm2err.h

+16 −75
Original line number Diff line number Diff line
@@ -23,85 +23,26 @@ int ERR_load_SM2_strings(void); 
/*

 * SM2 function codes.

 */

#  define SM2_F_PKEY_SM2_CTRL                              274

#  define SM2_F_PKEY_SM2_CTRL_STR                          275

#  define SM2_F_PKEY_SM2_KEYGEN                            276

#  define SM2_F_PKEY_SM2_PARAMGEN                          277

#  define SM2_F_PKEY_SM2_SIGN                              278

#  define SM2_F_SM2_COMPUTE_MSG_HASH                       284

#  define SM2_F_SM2_COMPUTE_USERID_DIGEST                  286

#  define SM2_F_SM2_DECRYPT                                279

#  define SM2_F_SM2_ENCRYPT                                280

#  define SM2_F_SM2_PLAINTEXT_SIZE                         287

#  define SM2_F_SM2_SIGN                                   281

#  define SM2_F_SM2_SIG_GEN                                285

#  define SM2_F_SM2_SIG_VERIFY                             282

#  define SM2_F_SM2_VERIFY                                 283

#  define SM2_F_SM2_COMPUTE_MSG_HASH                       100

#  define SM2_F_SM2_COMPUTE_USERID_DIGEST                  101

#  define SM2_F_SM2_DECRYPT                                102

#  define SM2_F_SM2_ENCRYPT                                103

#  define SM2_F_SM2_PLAINTEXT_SIZE                         104

#  define SM2_F_SM2_SIGN                                   105

#  define SM2_F_SM2_SIG_GEN                                106

#  define SM2_F_SM2_SIG_VERIFY                             107

#  define SM2_F_SM2_VERIFY                                 108



/*

 * SM2 reason codes.

 */

#  define SM2_R_ASN1_ERROR                                 115

#  define SM2_R_ASN5_ERROR                                 1150

#  define SM2_R_BAD_SIGNATURE                              156

#  define SM2_R_BIGNUM_OUT_OF_RANGE                        144

#  define SM2_R_BUFFER_TOO_SMALL                           100

#  define SM2_R_COORDINATES_OUT_OF_RANGE                   146

#  define SM2_R_CURVE_DOES_NOT_SUPPORT_ECDH                160

#  define SM2_R_CURVE_DOES_NOT_SUPPORT_SIGNING             159

#  define SM2_R_D2I_ECPKPARAMETERS_FAILURE                 117

#  define SM2_R_DECODE_ERROR                               142

#  define SM2_R_DISCRIMINANT_IS_ZERO                       118

#  define SM2_R_EC_GROUP_NEW_BY_NAME_FAILURE               119

#  define SM2_R_FIELD_TOO_LARGE                            143

#  define SM2_R_GF2M_NOT_SUPPORTED                         147

#  define SM2_R_GROUP2PKPARAMETERS_FAILURE                 120

#  define SM2_R_I2D_ECPKPARAMETERS_FAILURE                 121

#  define SM2_R_INCOMPATIBLE_OBJECTS                       101

#  define SM2_R_INVALID_ARGUMENT                           112

#  define SM2_R_INVALID_COMPRESSED_POINT                   110

#  define SM2_R_INVALID_COMPRESSION_BIT                    109

#  define SM2_R_INVALID_CURVE                              141

#  define SM2_R_INVALID_DIGEST                             151

#  define SM2_R_INVALID_DIGEST_TYPE                        138

#  define SM2_R_INVALID_ENCODING                           102

#  define SM2_R_INVALID_FIELD                              103

#  define SM2_R_INVALID_FORM                               104

#  define SM2_R_INVALID_GROUP_ORDER                        122

#  define SM2_R_INVALID_KEY                                116

#  define SM2_R_INVALID_OUTPUT_LENGTH                      161

#  define SM2_R_INVALID_PEER_KEY                           133

#  define SM2_R_INVALID_PENTANOMIAL_BASIS                  132

#  define SM2_R_INVALID_PRIVATE_KEY                        123

#  define SM2_R_INVALID_TRINOMIAL_BASIS                    137

#  define SM2_R_KDF_PARAMETER_ERROR                        148

#  define SM2_R_KEYS_NOT_SET                               140

#  define SM2_R_MISSING_PARAMETERS                         124

#  define SM2_R_MISSING_PRIVATE_KEY                        125

#  define SM2_R_NEED_NEW_SETUP_VALUES                      157

#  define SM2_R_NOT_A_NIST_PRIME                           135

#  define SM2_R_NOT_IMPLEMENTED                            126

#  define SM2_R_NOT_INITIALIZED                            111

#  define SM2_R_NO_PARAMETERS_SET                          139

#  define SM2_R_NO_PRIVATE_VALUE                           154

#  define SM2_R_OPERATION_NOT_SUPPORTED                    152

#  define SM2_R_PASSED_NULL_PARAMETER                      134

#  define SM2_R_PEER_KEY_ERROR                             149

#  define SM2_R_PKPARAMETERS2GROUP_FAILURE                 127

#  define SM2_R_POINT_ARITHMETIC_FAILURE                   155

#  define SM2_R_POINT_AT_INFINITY                          106

#  define SM2_R_POINT_IS_NOT_ON_CURVE                      107

#  define SM2_R_RANDOM_NUMBER_GENERATION_FAILED            158

#  define SM2_R_SHARED_INFO_ERROR                          150

#  define SM2_R_SLOT_FULL                                  108

#  define SM2_R_UNDEFINED_GENERATOR                        113

#  define SM2_R_UNDEFINED_ORDER                            128

#  define SM2_R_UNKNOWN_GROUP                              129

#  define SM2_R_UNKNOWN_ORDER                              114

#  define SM2_R_UNSUPPORTED_FIELD                          131

#  define SM2_R_USER_ID_TOO_LARGE                          136

#  define SM2_R_WRONG_CURVE_PARAMETERS                     145

#  define SM2_R_WRONG_ORDER                                130

#  define SM2_R_ASN1_ERROR                                 100

#  define SM2_R_BAD_SIGNATURE                              101

#  define SM2_R_INVALID_DIGEST                             102

#  define SM2_R_INVALID_DIGEST_TYPE                        103

#  define SM2_R_INVALID_ENCODING                           104

#  define SM2_R_INVALID_FIELD                              105

#  define SM2_R_USER_ID_TOO_LARGE                          106



# endif

#endif

crypto/sm2/sm2_err.c

+0 −87
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ 
#ifndef OPENSSL_NO_ERR



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_KEYGEN, 0), "pkey_sm2_keygen"},

    {ERR_PACK(ERR_LIB_SM2, SM2_F_PKEY_SM2_PARAMGEN, 0), "pkey_sm2_paramgen"},

    {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),
@@ -35,95 +30,13 @@ static const ERR_STRING_DATA SM2_str_functs[] = { 


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_ASN5_ERROR), "asn5 error"},

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

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_BIGNUM_OUT_OF_RANGE),

    "bignum out of range"},

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

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_COORDINATES_OUT_OF_RANGE),

    "coordinates out of range"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_CURVE_DOES_NOT_SUPPORT_ECDH),

    "curve does not support ecdh"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_CURVE_DOES_NOT_SUPPORT_SIGNING),

    "curve does not support signing"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_D2I_ECPKPARAMETERS_FAILURE),

    "d2i ecpkparameters failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DECODE_ERROR), "decode error"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_DISCRIMINANT_IS_ZERO),

    "discriminant is zero"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_EC_GROUP_NEW_BY_NAME_FAILURE),

    "ec group new by name failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_FIELD_TOO_LARGE), "field too large"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_GF2M_NOT_SUPPORTED), "gf2m not supported"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_GROUP2PKPARAMETERS_FAILURE),

    "group2pkparameters failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_I2D_ECPKPARAMETERS_FAILURE),

    "i2d ecpkparameters failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INCOMPATIBLE_OBJECTS),

    "incompatible objects"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_ARGUMENT), "invalid argument"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_COMPRESSED_POINT),

    "invalid compressed point"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_COMPRESSION_BIT),

    "invalid compression bit"},

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

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST), "invalid digest"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_DIGEST_TYPE),

    "invalid digest type"},

    {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_INVALID_FORM), "invalid form"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_GROUP_ORDER),

    "invalid group order"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_KEY), "invalid key"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_OUTPUT_LENGTH),

    "invalid output length"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PEER_KEY), "invalid peer key"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PENTANOMIAL_BASIS),

    "invalid pentanomial basis"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_PRIVATE_KEY),

    "invalid private key"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_INVALID_TRINOMIAL_BASIS),

    "invalid trinomial basis"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_KDF_PARAMETER_ERROR),

    "kdf parameter error"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_KEYS_NOT_SET), "keys not set"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_MISSING_PARAMETERS), "missing parameters"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_MISSING_PRIVATE_KEY),

    "missing private key"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NEED_NEW_SETUP_VALUES),

    "need new setup values"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NOT_A_NIST_PRIME), "not a NIST prime"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NOT_IMPLEMENTED), "not implemented"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NOT_INITIALIZED), "not initialized"},

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

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_NO_PRIVATE_VALUE), "no private value"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_OPERATION_NOT_SUPPORTED),

    "operation not supported"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_PASSED_NULL_PARAMETER),

    "passed null parameter"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_PEER_KEY_ERROR), "peer key error"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_PKPARAMETERS2GROUP_FAILURE),

    "pkparameters2group failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_POINT_ARITHMETIC_FAILURE),

    "point arithmetic failure"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_POINT_AT_INFINITY), "point at infinity"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_POINT_IS_NOT_ON_CURVE),

    "point is not on curve"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_RANDOM_NUMBER_GENERATION_FAILED),

    "random number generation failed"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_SHARED_INFO_ERROR), "shared info error"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_SLOT_FULL), "slot full"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_UNDEFINED_GENERATOR),

    "undefined generator"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_UNDEFINED_ORDER), "undefined order"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_UNKNOWN_GROUP), "unknown group"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_UNKNOWN_ORDER), "unknown order"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_UNSUPPORTED_FIELD), "unsupported field"},

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

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_WRONG_CURVE_PARAMETERS),

    "wrong curve parameters"},

    {ERR_PACK(ERR_LIB_SM2, 0, SM2_R_WRONG_ORDER), "wrong order"},

    {0, NULL}

};