mirror of https://github.com/openssl/openssl
Put message strings in state files
Add "*" as indicator meaning the function/reason is removed, so put an empty string in the function/reason string table; this preserves backward compatibility by keeping the #define's. In state files, trailing backslash means text is on the next line. Add copyright to state files Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3640)
This commit is contained in:
Rich Salz
parent
19546246cf
commit
5816586ba4
|
|
@ -49,7 +49,7 @@ static const ERR_STRING_DATA DSO_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_MERGER, 0), "win32_merger"},
|
||||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_NAME_CONVERTER, 0),
|
||||
"win32_name_converter"},
|
||||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_PATHBYADDR, 0), "win32_pathbyaddr"},
|
||||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_PATHBYADDR, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_SPLITTER, 0), "win32_splitter"},
|
||||
{ERR_PACK(ERR_LIB_DSO, DSO_F_WIN32_UNLOAD, 0), "win32_unload"},
|
||||
{0, NULL}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -36,17 +36,13 @@ static const ERR_STRING_DATA RSA_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_DUP, 0), "RSA_meth_dup"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_NEW, 0), "RSA_meth_new"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_METH_SET1_NAME, 0), "RSA_meth_set1_name"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_MGF1_TO_MD, 0), "rsa_mgf1_to_md"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_MGF1_TO_MD, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NEW_METHOD, 0), "RSA_new_method"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL, 0), "RSA_NULL"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PRIVATE_DECRYPT, 0),
|
||||
"RSA_NULL_PRIVATE_DECRYPT"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PRIVATE_ENCRYPT, 0),
|
||||
"RSA_NULL_PRIVATE_ENCRYPT"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PUBLIC_DECRYPT, 0),
|
||||
"RSA_NULL_PUBLIC_DECRYPT"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PUBLIC_ENCRYPT, 0),
|
||||
"RSA_NULL_PUBLIC_ENCRYPT"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PRIVATE_DECRYPT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PRIVATE_ENCRYPT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PUBLIC_DECRYPT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_NULL_PUBLIC_ENCRYPT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_OSSL_PRIVATE_DECRYPT, 0),
|
||||
"rsa_ossl_private_decrypt"},
|
||||
{ERR_PACK(ERR_LIB_RSA, RSA_F_RSA_OSSL_PRIVATE_ENCRYPT, 0),
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ static const ERR_STRING_DATA TS_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_TST_INFO_SET_TIME, 0),
|
||||
"TS_TST_INFO_set_time"},
|
||||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_TST_INFO_SET_TSA, 0), "TS_TST_INFO_set_tsa"},
|
||||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_VERIFY, 0), "TS_VERIFY"},
|
||||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_VERIFY, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_VERIFY_CERT, 0), "ts_verify_cert"},
|
||||
{ERR_PACK(ERR_LIB_TS, TS_F_TS_VERIFY_CTX_NEW, 0), "TS_VERIFY_CTX_new"},
|
||||
{0, NULL}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,30 @@
|
|||
AFALG_F_AFALG_CHK_PLATFORM 100
|
||||
AFALG_F_AFALG_CREATE_SK 101
|
||||
AFALG_F_AFALG_INIT_AIO 102
|
||||
AFALG_F_AFALG_SETUP_ASYNC_EVENT_NOTIFICATION 103
|
||||
AFALG_F_AFALG_SET_KEY 104
|
||||
AFALG_F_BIND_AFALG 105
|
||||
AFALG_R_EVENTFD_FAILED 108
|
||||
AFALG_R_FAILED_TO_GET_PLATFORM_INFO 111
|
||||
AFALG_R_INIT_FAILED 100
|
||||
AFALG_R_IO_SETUP_FAILED 105
|
||||
AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG 101
|
||||
AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG 107
|
||||
AFALG_R_MEM_ALLOC_FAILED 102
|
||||
AFALG_R_SOCKET_ACCEPT_FAILED 110
|
||||
AFALG_R_SOCKET_BIND_FAILED 103
|
||||
AFALG_R_SOCKET_CREATE_FAILED 109
|
||||
AFALG_R_SOCKET_OPERATION_FAILED 104
|
||||
AFALG_R_SOCKET_SET_KEY_FAILED 106
|
||||
# Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
|
||||
# Function codes
|
||||
AFALG_F_AFALG_CHK_PLATFORM:100:afalg_chk_platform
|
||||
AFALG_F_AFALG_CREATE_SK:101:afalg_create_sk
|
||||
AFALG_F_AFALG_INIT_AIO:102:afalg_init_aio
|
||||
AFALG_F_AFALG_SETUP_ASYNC_EVENT_NOTIFICATION:103:\
|
||||
afalg_setup_async_event_notification
|
||||
AFALG_F_AFALG_SET_KEY:104:afalg_set_key
|
||||
AFALG_F_BIND_AFALG:105:bind_afalg
|
||||
|
||||
#Reason codes
|
||||
AFALG_R_EVENTFD_FAILED:108:eventfd failed
|
||||
AFALG_R_FAILED_TO_GET_PLATFORM_INFO:111:failed to get platform info
|
||||
AFALG_R_INIT_FAILED:100:init failed
|
||||
AFALG_R_IO_SETUP_FAILED:105:io setup failed
|
||||
AFALG_R_KERNEL_DOES_NOT_SUPPORT_AFALG:101:kernel does not support afalg
|
||||
AFALG_R_KERNEL_DOES_NOT_SUPPORT_ASYNC_AFALG:107:\
|
||||
kernel does not support async afalg
|
||||
AFALG_R_MEM_ALLOC_FAILED:102:mem alloc failed
|
||||
AFALG_R_SOCKET_ACCEPT_FAILED:110:socket accept failed
|
||||
AFALG_R_SOCKET_BIND_FAILED:103:socket bind failed
|
||||
AFALG_R_SOCKET_CREATE_FAILED:109:socket create failed
|
||||
AFALG_R_SOCKET_OPERATION_FAILED:104:socket operation failed
|
||||
AFALG_R_SOCKET_SET_KEY_FAILED:106:socket set key failed
|
||||
|
|
|
|||
|
|
@ -1,50 +1,62 @@
|
|||
CAPI_F_CAPI_CERT_GET_FNAME 99
|
||||
CAPI_F_CAPI_CTRL 100
|
||||
CAPI_F_CAPI_CTX_NEW 101
|
||||
CAPI_F_CAPI_CTX_SET_PROVNAME 102
|
||||
CAPI_F_CAPI_DSA_DO_SIGN 114
|
||||
CAPI_F_CAPI_GET_KEY 103
|
||||
CAPI_F_CAPI_GET_PKEY 115
|
||||
CAPI_F_CAPI_GET_PROVNAME 104
|
||||
CAPI_F_CAPI_GET_PROV_INFO 105
|
||||
CAPI_F_CAPI_INIT 106
|
||||
CAPI_F_CAPI_LIST_CONTAINERS 107
|
||||
CAPI_F_CAPI_LOAD_PRIVKEY 108
|
||||
CAPI_F_CAPI_OPEN_STORE 109
|
||||
CAPI_F_CAPI_RSA_PRIV_DEC 110
|
||||
CAPI_F_CAPI_RSA_PRIV_ENC 111
|
||||
CAPI_F_CAPI_RSA_SIGN 112
|
||||
CAPI_F_CAPI_VTRACE 118
|
||||
CAPI_F_CERT_SELECT_DIALOG 117
|
||||
CAPI_F_CLIENT_CERT_SELECT 116
|
||||
CAPI_F_WIDE_TO_ASC 113
|
||||
CAPI_R_CANT_CREATE_HASH_OBJECT 100
|
||||
CAPI_R_CANT_FIND_CAPI_CONTEXT 101
|
||||
CAPI_R_CANT_GET_KEY 102
|
||||
CAPI_R_CANT_SET_HASH_VALUE 103
|
||||
CAPI_R_CRYPTACQUIRECONTEXT_ERROR 104
|
||||
CAPI_R_CRYPTENUMPROVIDERS_ERROR 105
|
||||
CAPI_R_DECRYPT_ERROR 106
|
||||
CAPI_R_ENGINE_NOT_INITIALIZED 107
|
||||
CAPI_R_ENUMCONTAINERS_ERROR 108
|
||||
CAPI_R_ERROR_ADDING_CERT 109
|
||||
CAPI_R_ERROR_CREATING_STORE 110
|
||||
CAPI_R_ERROR_GETTING_FRIENDLY_NAME 111
|
||||
CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO 112
|
||||
CAPI_R_ERROR_OPENING_STORE 113
|
||||
CAPI_R_ERROR_SIGNING_HASH 114
|
||||
CAPI_R_FILE_OPEN_ERROR 115
|
||||
CAPI_R_FUNCTION_NOT_SUPPORTED 116
|
||||
CAPI_R_GETUSERKEY_ERROR 117
|
||||
CAPI_R_INVALID_DIGEST_LENGTH 118
|
||||
CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 119
|
||||
CAPI_R_INVALID_LOOKUP_METHOD 120
|
||||
CAPI_R_INVALID_PUBLIC_KEY_BLOB 121
|
||||
CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 122
|
||||
CAPI_R_PUBKEY_EXPORT_ERROR 123
|
||||
CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR 124
|
||||
CAPI_R_UNKNOWN_COMMAND 125
|
||||
CAPI_R_UNSUPPORTED_ALGORITHM_NID 126
|
||||
CAPI_R_UNSUPPORTED_PADDING 127
|
||||
CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM 128
|
||||
CAPI_R_WIN32_ERROR 129
|
||||
# Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
|
||||
# Function codes
|
||||
CAPI_F_CAPI_CERT_GET_FNAME:99:capi_cert_get_fname
|
||||
CAPI_F_CAPI_CTRL:100:capi_ctrl
|
||||
CAPI_F_CAPI_CTX_NEW:101:capi_ctx_new
|
||||
CAPI_F_CAPI_CTX_SET_PROVNAME:102:capi_ctx_set_provname
|
||||
CAPI_F_CAPI_DSA_DO_SIGN:114:capi_dsa_do_sign
|
||||
CAPI_F_CAPI_GET_KEY:103:capi_get_key
|
||||
CAPI_F_CAPI_GET_PKEY:115:capi_get_pkey
|
||||
CAPI_F_CAPI_GET_PROVNAME:104:capi_get_provname
|
||||
CAPI_F_CAPI_GET_PROV_INFO:105:capi_get_prov_info
|
||||
CAPI_F_CAPI_INIT:106:capi_init
|
||||
CAPI_F_CAPI_LIST_CONTAINERS:107:capi_list_containers
|
||||
CAPI_F_CAPI_LOAD_PRIVKEY:108:capi_load_privkey
|
||||
CAPI_F_CAPI_OPEN_STORE:109:capi_open_store
|
||||
CAPI_F_CAPI_RSA_PRIV_DEC:110:capi_rsa_priv_dec
|
||||
CAPI_F_CAPI_RSA_PRIV_ENC:111:capi_rsa_priv_enc
|
||||
CAPI_F_CAPI_RSA_SIGN:112:capi_rsa_sign
|
||||
CAPI_F_CAPI_VTRACE:118:capi_vtrace
|
||||
CAPI_F_CERT_SELECT_DIALOG:117:cert_select_dialog
|
||||
CAPI_F_CLIENT_CERT_SELECT:116:*
|
||||
CAPI_F_WIDE_TO_ASC:113:wide_to_asc
|
||||
|
||||
#Reason codes
|
||||
CAPI_R_CANT_CREATE_HASH_OBJECT:100:cant create hash object
|
||||
CAPI_R_CANT_FIND_CAPI_CONTEXT:101:cant find capi context
|
||||
CAPI_R_CANT_GET_KEY:102:cant get key
|
||||
CAPI_R_CANT_SET_HASH_VALUE:103:cant set hash value
|
||||
CAPI_R_CRYPTACQUIRECONTEXT_ERROR:104:cryptacquirecontext error
|
||||
CAPI_R_CRYPTENUMPROVIDERS_ERROR:105:cryptenumproviders error
|
||||
CAPI_R_DECRYPT_ERROR:106:decrypt error
|
||||
CAPI_R_ENGINE_NOT_INITIALIZED:107:engine not initialized
|
||||
CAPI_R_ENUMCONTAINERS_ERROR:108:enumcontainers error
|
||||
CAPI_R_ERROR_ADDING_CERT:109:error adding cert
|
||||
CAPI_R_ERROR_CREATING_STORE:110:error creating store
|
||||
CAPI_R_ERROR_GETTING_FRIENDLY_NAME:111:error getting friendly name
|
||||
CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO:112:error getting key provider info
|
||||
CAPI_R_ERROR_OPENING_STORE:113:error opening store
|
||||
CAPI_R_ERROR_SIGNING_HASH:114:error signing hash
|
||||
CAPI_R_FILE_OPEN_ERROR:115:file open error
|
||||
CAPI_R_FUNCTION_NOT_SUPPORTED:116:function not supported
|
||||
CAPI_R_GETUSERKEY_ERROR:117:getuserkey error
|
||||
CAPI_R_INVALID_DIGEST_LENGTH:118:invalid digest length
|
||||
CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER:119:\
|
||||
invalid dsa public key blob magic number
|
||||
CAPI_R_INVALID_LOOKUP_METHOD:120:invalid lookup method
|
||||
CAPI_R_INVALID_PUBLIC_KEY_BLOB:121:invalid public key blob
|
||||
CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER:122:\
|
||||
invalid rsa public key blob magic number
|
||||
CAPI_R_PUBKEY_EXPORT_ERROR:123:pubkey export error
|
||||
CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR:124:pubkey export length error
|
||||
CAPI_R_UNKNOWN_COMMAND:125:unknown command
|
||||
CAPI_R_UNSUPPORTED_ALGORITHM_NID:126:unsupported algorithm nid
|
||||
CAPI_R_UNSUPPORTED_PADDING:127:unsupported padding
|
||||
CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM:128:unsupported public key algorithm
|
||||
CAPI_R_WIN32_ERROR:129:win32 error
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
CAPI_F_CAPI_CERT_GET_FNAME 99
|
||||
CAPI_F_CAPI_CTRL 100
|
||||
CAPI_F_CAPI_CTX_NEW 101
|
||||
CAPI_F_CAPI_CTX_SET_PROVNAME 102
|
||||
CAPI_F_CAPI_DSA_DO_SIGN 114
|
||||
CAPI_F_CAPI_GET_KEY 103
|
||||
CAPI_F_CAPI_GET_PKEY 115
|
||||
CAPI_F_CAPI_GET_PROVNAME 104
|
||||
CAPI_F_CAPI_GET_PROV_INFO 105
|
||||
CAPI_F_CAPI_INIT 106
|
||||
CAPI_F_CAPI_LIST_CONTAINERS 107
|
||||
CAPI_F_CAPI_LOAD_PRIVKEY 108
|
||||
CAPI_F_CAPI_OPEN_STORE 109
|
||||
CAPI_F_CAPI_RSA_PRIV_DEC 110
|
||||
CAPI_F_CAPI_RSA_PRIV_ENC 111
|
||||
CAPI_F_CAPI_RSA_SIGN 112
|
||||
CAPI_F_CAPI_VTRACE 118
|
||||
CAPI_F_CERT_SELECT_DIALOG 117
|
||||
CAPI_F_CLIENT_CERT_SELECT 116
|
||||
CAPI_F_WIDE_TO_ASC 113
|
||||
CAPI_R_CANT_CREATE_HASH_OBJECT 100
|
||||
CAPI_R_CANT_FIND_CAPI_CONTEXT 101
|
||||
CAPI_R_CANT_GET_KEY 102
|
||||
CAPI_R_CANT_SET_HASH_VALUE 103
|
||||
CAPI_R_CRYPTACQUIRECONTEXT_ERROR 104
|
||||
CAPI_R_CRYPTENUMPROVIDERS_ERROR 105
|
||||
CAPI_R_DECRYPT_ERROR 106
|
||||
CAPI_R_ENGINE_NOT_INITIALIZED 107
|
||||
CAPI_R_ENUMCONTAINERS_ERROR 108
|
||||
CAPI_R_ERROR_ADDING_CERT 109
|
||||
CAPI_R_ERROR_CREATING_STORE 110
|
||||
CAPI_R_ERROR_GETTING_FRIENDLY_NAME 111
|
||||
CAPI_R_ERROR_GETTING_KEY_PROVIDER_INFO 112
|
||||
CAPI_R_ERROR_OPENING_STORE 113
|
||||
CAPI_R_ERROR_SIGNING_HASH 114
|
||||
CAPI_R_FILE_OPEN_ERROR 115
|
||||
CAPI_R_FUNCTION_NOT_SUPPORTED 116
|
||||
CAPI_R_GETUSERKEY_ERROR 117
|
||||
CAPI_R_INVALID_DIGEST_LENGTH 118
|
||||
CAPI_R_INVALID_DSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 119
|
||||
CAPI_R_INVALID_LOOKUP_METHOD 120
|
||||
CAPI_R_INVALID_PUBLIC_KEY_BLOB 121
|
||||
CAPI_R_INVALID_RSA_PUBLIC_KEY_BLOB_MAGIC_NUMBER 122
|
||||
CAPI_R_PUBKEY_EXPORT_ERROR 123
|
||||
CAPI_R_PUBKEY_EXPORT_LENGTH_ERROR 124
|
||||
CAPI_R_UNKNOWN_COMMAND 125
|
||||
CAPI_R_UNSUPPORTED_ALGORITHM_NID 126
|
||||
CAPI_R_UNSUPPORTED_PADDING 127
|
||||
CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM 128
|
||||
CAPI_R_WIN32_ERROR 129
|
||||
|
|
@ -32,7 +32,7 @@ static ERR_STRING_DATA CAPI_str_functs[] = {
|
|||
{ERR_PACK(0, CAPI_F_CAPI_RSA_SIGN, 0), "capi_rsa_sign"},
|
||||
{ERR_PACK(0, CAPI_F_CAPI_VTRACE, 0), "capi_vtrace"},
|
||||
{ERR_PACK(0, CAPI_F_CERT_SELECT_DIALOG, 0), "cert_select_dialog"},
|
||||
{ERR_PACK(0, CAPI_F_CLIENT_CERT_SELECT, 0), "CLIENT_CERT_SELECT"},
|
||||
{ERR_PACK(0, CAPI_F_CLIENT_CERT_SELECT, 0), ""},
|
||||
{ERR_PACK(0, CAPI_F_WIDE_TO_ASC, 0), "wide_to_asc"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,22 @@
|
|||
DASYNC_F_BIND_DASYNC 107
|
||||
DASYNC_F_CIPHER_AES_128_CBC_CODE 100
|
||||
DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY 109
|
||||
DASYNC_F_DASYNC_AES128_INIT_KEY 108
|
||||
DASYNC_F_DASYNC_BN_MOD_EXP 101
|
||||
DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER 110
|
||||
DASYNC_F_DASYNC_MOD_EXP 102
|
||||
DASYNC_F_DASYNC_PRIVATE_DECRYPT 103
|
||||
DASYNC_F_DASYNC_PRIVATE_ENCRYPT 104
|
||||
DASYNC_F_DASYNC_PUBLIC_DECRYPT 105
|
||||
DASYNC_F_DASYNC_PUBLIC_ENCRYPT 106
|
||||
DASYNC_R_INIT_FAILED 100
|
||||
# Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
|
||||
# Function codes
|
||||
DASYNC_F_BIND_DASYNC:107:bind_dasync
|
||||
DASYNC_F_CIPHER_AES_128_CBC_CODE:100:*
|
||||
DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY:109:*
|
||||
DASYNC_F_DASYNC_AES128_INIT_KEY:108:*
|
||||
DASYNC_F_DASYNC_BN_MOD_EXP:101:*
|
||||
DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER:110:dasync_cipher_init_key_helper
|
||||
DASYNC_F_DASYNC_MOD_EXP:102:*
|
||||
DASYNC_F_DASYNC_PRIVATE_DECRYPT:103:*
|
||||
DASYNC_F_DASYNC_PRIVATE_ENCRYPT:104:*
|
||||
DASYNC_F_DASYNC_PUBLIC_DECRYPT:105:*
|
||||
DASYNC_F_DASYNC_PUBLIC_ENCRYPT:106:*
|
||||
|
||||
#Reason codes
|
||||
DASYNC_R_INIT_FAILED:100:init failed
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
DASYNC_F_BIND_DASYNC 107
|
||||
DASYNC_F_CIPHER_AES_128_CBC_CODE 100
|
||||
DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY 109
|
||||
DASYNC_F_DASYNC_AES128_INIT_KEY 108
|
||||
DASYNC_F_DASYNC_BN_MOD_EXP 101
|
||||
DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER 110
|
||||
DASYNC_F_DASYNC_MOD_EXP 102
|
||||
DASYNC_F_DASYNC_PRIVATE_DECRYPT 103
|
||||
DASYNC_F_DASYNC_PRIVATE_ENCRYPT 104
|
||||
DASYNC_F_DASYNC_PUBLIC_DECRYPT 105
|
||||
DASYNC_F_DASYNC_PUBLIC_ENCRYPT 106
|
||||
DASYNC_R_INIT_FAILED 100
|
||||
|
|
@ -15,19 +15,17 @@
|
|||
|
||||
static ERR_STRING_DATA DASYNC_str_functs[] = {
|
||||
{ERR_PACK(0, DASYNC_F_BIND_DASYNC, 0), "bind_dasync"},
|
||||
{ERR_PACK(0, DASYNC_F_CIPHER_AES_128_CBC_CODE, 0),
|
||||
"CIPHER_AES_128_CBC_CODE"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY, 0),
|
||||
"dasync_aes128_cbc_hmac_sha1_init_key"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_AES128_INIT_KEY, 0), "dasync_aes128_init_key"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_BN_MOD_EXP, 0), "DASYNC_BN_MOD_EXP"},
|
||||
{ERR_PACK(0, DASYNC_F_CIPHER_AES_128_CBC_CODE, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_AES128_CBC_HMAC_SHA1_INIT_KEY, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_AES128_INIT_KEY, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_BN_MOD_EXP, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_CIPHER_INIT_KEY_HELPER, 0),
|
||||
"dasync_cipher_init_key_helper"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_MOD_EXP, 0), "DASYNC_MOD_EXP"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PRIVATE_DECRYPT, 0), "DASYNC_PRIVATE_DECRYPT"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PRIVATE_ENCRYPT, 0), "DASYNC_PRIVATE_ENCRYPT"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PUBLIC_DECRYPT, 0), "DASYNC_PUBLIC_DECRYPT"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PUBLIC_ENCRYPT, 0), "DASYNC_PUBLIC_ENCRYPT"},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_MOD_EXP, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PRIVATE_DECRYPT, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PRIVATE_ENCRYPT, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PUBLIC_DECRYPT, 0), ""},
|
||||
{ERR_PACK(0, DASYNC_F_DASYNC_PUBLIC_ENCRYPT, 0), ""},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
OSSLTEST_F_BIND_OSSLTEST 100
|
||||
OSSLTEST_F_OSSLTEST_AES128_INIT_KEY 101
|
||||
OSSLTEST_R_INIT_FAILED 100
|
||||
# Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
|
||||
#
|
||||
# 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
|
||||
|
||||
# Function codes
|
||||
OSSLTEST_F_BIND_OSSLTEST:100:bind_ossltest
|
||||
OSSLTEST_F_OSSLTEST_AES128_INIT_KEY:101:*
|
||||
|
||||
#Reason codes
|
||||
OSSLTEST_R_INIT_FAILED:100:init failed
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
OSSLTEST_F_BIND_OSSLTEST 100
|
||||
OSSLTEST_F_OSSLTEST_AES128_INIT_KEY 101
|
||||
OSSLTEST_R_INIT_FAILED 100
|
||||
|
|
@ -15,8 +15,7 @@
|
|||
|
||||
static ERR_STRING_DATA OSSLTEST_str_functs[] = {
|
||||
{ERR_PACK(0, OSSLTEST_F_BIND_OSSLTEST, 0), "bind_ossltest"},
|
||||
{ERR_PACK(0, OSSLTEST_F_OSSLTEST_AES128_INIT_KEY, 0),
|
||||
"OSSLTEST_AES128_INIT_KEY"},
|
||||
{ERR_PACK(0, OSSLTEST_F_OSSLTEST_AES128_INIT_KEY, 0), ""},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
|
|
|
|||
130
ssl/ssl_err.c
130
ssl/ssl_err.c
|
|
@ -14,8 +14,7 @@
|
|||
#ifndef OPENSSL_NO_ERR
|
||||
|
||||
static const ERR_STRING_DATA SSL_str_functs[] = {
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_ADD_CLIENT_KEY_SHARE_EXT, 0),
|
||||
"add_client_key_share_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_ADD_CLIENT_KEY_SHARE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_ADD_KEY_SHARE, 0), "add_key_share"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_BYTES_TO_CIPHER_LIST, 0),
|
||||
"bytes_to_cipher_list"},
|
||||
|
|
@ -37,7 +36,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"dtls1_buffer_record"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_DTLS1_CHECK_TIMEOUT_NUM, 0),
|
||||
"dtls1_check_timeout_num"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_DTLS1_HEARTBEAT, 0), "dtls1_heartbeat"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_DTLS1_HEARTBEAT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_DTLS1_PREPROCESS_FRAGMENT, 0),
|
||||
"dtls1_preprocess_fragment"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS, 0),
|
||||
|
|
@ -70,21 +69,16 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_SSL, SSL_F_FINAL_SIG_ALGS, 0), "final_sig_algs"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_NSS_KEYLOG_INT, 0), "nss_keylog_int"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OPENSSL_INIT_SSL, 0), "OPENSSL_init_ssl"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION, 0),
|
||||
"ossl_statem_client13_read_transition"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE, 0),
|
||||
"ossl_statem_client_construct_message"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION, 0),
|
||||
"ossl_statem_client_read_transition"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_SERVER13_READ_TRANSITION, 0),
|
||||
"ossl_statem_server13_read_transition"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE, 0),
|
||||
"ossl_statem_server_construct_message"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_SERVER13_READ_TRANSITION, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION, 0),
|
||||
"ossl_statem_server_read_transition"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_PARSE_CA_NAMES, 0), "parse_ca_names"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_PROCESS_KEY_SHARE_EXT, 0),
|
||||
"process_key_share_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_PROCESS_KEY_SHARE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_READ_STATE_MACHINE, 0), "read_state_machine"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SET_CLIENT_CIPHERSUITE, 0),
|
||||
"set_client_ciphersuite"},
|
||||
|
|
@ -120,26 +114,19 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL3_WRITE_BYTES, 0), "ssl3_write_bytes"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL3_WRITE_PENDING, 0), "ssl3_write_pending"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CERT_CHAIN, 0), "ssl_add_cert_chain"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CERT_TO_BUF, 0),
|
||||
"ssl_add_cert_to_buf"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CERT_TO_BUF, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CERT_TO_WPACKET, 0),
|
||||
"ssl_add_cert_to_wpacket"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT, 0),
|
||||
"ssl_add_clienthello_renegotiate_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, 0),
|
||||
"ssl_add_clienthello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT, 0),
|
||||
"ssl_add_clienthello_use_srtp_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK, 0),
|
||||
"SSL_add_dir_cert_subjects_to_stack"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK, 0),
|
||||
"SSL_add_file_cert_subjects_to_stack"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT, 0),
|
||||
"ssl_add_serverhello_renegotiate_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, 0),
|
||||
"ssl_add_serverhello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT, 0),
|
||||
"ssl_add_serverhello_use_srtp_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_BAD_METHOD, 0), "ssl_bad_method"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_BUILD_CERT_CHAIN, 0),
|
||||
"ssl_build_cert_chain"},
|
||||
|
|
@ -155,8 +142,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"ssl_cert_set0_chain"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_CHECK_PRIVATE_KEY, 0),
|
||||
"SSL_check_private_key"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT, 0),
|
||||
"ssl_check_serverhello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG, 0),
|
||||
"ssl_check_srvr_ecc_cert_and_alg"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_CIPHER_LIST_TO_BYTES, 0),
|
||||
|
|
@ -226,32 +212,24 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"ssl_get_new_session"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_GET_PREV_SESSION, 0),
|
||||
"ssl_get_prev_session"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_GET_SERVER_CERT_INDEX, 0),
|
||||
"ssl_get_server_cert_index"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_GET_SIGN_PKEY, 0), "ssl_get_sign_pkey"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_GET_SERVER_CERT_INDEX, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_GET_SIGN_PKEY, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_INIT_WBIO_BUFFER, 0),
|
||||
"ssl_init_wbio_buffer"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_KEY_UPDATE, 0), "SSL_key_update"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_LOAD_CLIENT_CA_FILE, 0),
|
||||
"SSL_load_client_CA_file"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_LOG_MASTER_SECRET, 0),
|
||||
"ssl_log_master_secret"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_LOG_MASTER_SECRET, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_LOG_RSA_CLIENT_KEY_EXCHANGE, 0),
|
||||
"ssl_log_rsa_client_key_exchange"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_MODULE_INIT, 0), "ssl_module_init"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_NEW, 0), "SSL_new"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, 0),
|
||||
"ssl_parse_clienthello_renegotiate_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT, 0),
|
||||
"ssl_parse_clienthello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, 0),
|
||||
"ssl_parse_clienthello_use_srtp_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, 0),
|
||||
"ssl_parse_serverhello_renegotiate_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, 0),
|
||||
"ssl_parse_serverhello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT, 0),
|
||||
"ssl_parse_serverhello_use_srtp_ext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PEEK, 0), "SSL_peek"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PEEK_EX, 0), "SSL_peek_ex"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_PEEK_INTERNAL, 0), "ssl_peek_internal"},
|
||||
|
|
@ -263,10 +241,8 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_RENEGOTIATE, 0), "SSL_renegotiate"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_RENEGOTIATE_ABBREVIATED, 0),
|
||||
"SSL_renegotiate_abbreviated"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT, 0),
|
||||
"ssl_scan_clienthello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT, 0),
|
||||
"ssl_scan_serverhello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SESSION_DUP, 0), "ssl_session_dup"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SESSION_NEW, 0), "SSL_SESSION_new"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_SESSION_PRINT_FP, 0),
|
||||
|
|
@ -324,8 +300,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE, 0), "SSL_write"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE_EARLY_DATA, 0),
|
||||
"SSL_write_early_data"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE_EARLY_FINISH, 0),
|
||||
"ssl_write_early_finish"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE_EARLY_FINISH, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE_EX, 0), "SSL_write_ex"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_SSL_WRITE_INTERNAL, 0), "ssl_write_internal"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_STATE_MACHINE, 0), "state_machine"},
|
||||
|
|
@ -338,8 +313,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls13_setup_key_block"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS1_CHANGE_CIPHER_STATE, 0),
|
||||
"tls1_change_cipher_state"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS, 0),
|
||||
"tls1_check_duplicate_extensions"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS1_ENC, 0), "tls1_enc"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS1_EXPORT_KEYING_MATERIAL, 0),
|
||||
"tls1_export_keying_material"},
|
||||
|
|
@ -358,8 +332,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_certificate_authorities"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST, 0),
|
||||
"tls_construct_certificate_request"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CERT_STATUS, 0),
|
||||
"tls_construct_cert_status"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CERT_STATUS, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CERT_STATUS_BODY, 0),
|
||||
"tls_construct_cert_status_body"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CERT_VERIFY, 0),
|
||||
|
|
@ -384,12 +357,10 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_client_hello"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE, 0),
|
||||
"tls_construct_client_key_exchange"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, 0),
|
||||
"tls_construct_client_verify"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_ALPN, 0),
|
||||
"tls_construct_ctos_alpn"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE, 0),
|
||||
"TLS_CONSTRUCT_CTOS_CERTIFICATE"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_COOKIE, 0),
|
||||
"tls_construct_ctos_cookie"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_EARLY_DATA, 0),
|
||||
|
|
@ -400,10 +371,8 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_ctos_ems"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_ETM, 0),
|
||||
"tls_construct_ctos_etm"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_HELLO, 0),
|
||||
"TLS_CONSTRUCT_CTOS_HELLO"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE, 0),
|
||||
"TLS_CONSTRUCT_CTOS_KEY_EXCHANGE"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_HELLO, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE, 0),
|
||||
"tls_construct_ctos_key_share"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_NPN, 0),
|
||||
|
|
@ -434,8 +403,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_ctos_supported_versions"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_USE_SRTP, 0),
|
||||
"tls_construct_ctos_use_srtp"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_VERIFY, 0),
|
||||
"TLS_CONSTRUCT_CTOS_VERIFY"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_CTOS_VERIFY, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS, 0),
|
||||
"tls_construct_encrypted_extensions"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_END_OF_EARLY_DATA, 0),
|
||||
|
|
@ -444,8 +412,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_extensions"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_FINISHED, 0),
|
||||
"tls_construct_finished"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_HELLO_REQUEST, 0),
|
||||
"tls_construct_hello_request"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_HELLO_REQUEST, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_HELLO_RETRY_REQUEST, 0),
|
||||
"tls_construct_hello_retry_request"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_KEY_UPDATE, 0),
|
||||
|
|
@ -462,26 +429,21 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_construct_server_key_exchange"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_ALPN, 0),
|
||||
"tls_construct_stoc_alpn"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE, 0),
|
||||
"TLS_CONSTRUCT_STOC_CERTIFICATE"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_CRYPTOPRO_BUG, 0),
|
||||
"tls_construct_stoc_cryptopro_bug"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_DONE, 0),
|
||||
"TLS_CONSTRUCT_STOC_DONE"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_DONE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA, 0),
|
||||
"tls_construct_stoc_early_data"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA_INFO, 0),
|
||||
"tls_construct_stoc_early_data_info"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA_INFO, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_EC_PT_FORMATS, 0),
|
||||
"tls_construct_stoc_ec_pt_formats"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_EMS, 0),
|
||||
"tls_construct_stoc_ems"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_ETM, 0),
|
||||
"tls_construct_stoc_etm"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_HELLO, 0),
|
||||
"TLS_CONSTRUCT_STOC_HELLO"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE, 0),
|
||||
"TLS_CONSTRUCT_STOC_KEY_EXCHANGE"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_HELLO, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_KEY_SHARE, 0),
|
||||
"tls_construct_stoc_key_share"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_CONSTRUCT_STOC_NEXT_PROTO_NEG, 0),
|
||||
|
|
@ -506,8 +468,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_get_message_body"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_GET_MESSAGE_HEADER, 0),
|
||||
"tls_get_message_header"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT, 0),
|
||||
"tls_parse_clienthello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_CTOS_KEY_SHARE, 0),
|
||||
"tls_parse_ctos_key_share"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_CTOS_PSK, 0), "tls_parse_ctos_psk"},
|
||||
|
|
@ -519,8 +480,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_parse_stoc_cookie"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_STOC_EARLY_DATA, 0),
|
||||
"tls_parse_stoc_early_data"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO, 0),
|
||||
"tls_parse_stoc_early_data_info"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_STOC_KEY_SHARE, 0),
|
||||
"tls_parse_stoc_key_share"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PARSE_STOC_PSK, 0), "tls_parse_stoc_psk"},
|
||||
|
|
@ -536,8 +496,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
"tls_prepare_client_certificate"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST, 0),
|
||||
"tls_process_certificate_request"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_CERT_STATUS, 0),
|
||||
"tls_process_cert_status"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_CERT_STATUS, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_CERT_STATUS_BODY, 0),
|
||||
"tls_process_cert_status_body"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_CERT_VERIFY, 0),
|
||||
|
|
@ -597,8 +556,7 @@ static const ERR_STRING_DATA SSL_str_functs[] = {
|
|||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PROCESS_SKE_SRP, 0),
|
||||
"tls_process_ske_srp"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_PSK_DO_BINDER, 0), "tls_psk_do_binder"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_SCAN_CLIENTHELLO_TLSEXT, 0),
|
||||
"tls_scan_clienthello_tlsext"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_SCAN_CLIENTHELLO_TLSEXT, 0), ""},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_TLS_SETUP_HANDSHAKE, 0),
|
||||
"tls_setup_handshake"},
|
||||
{ERR_PACK(ERR_LIB_SSL, SSL_F_USE_CERTIFICATE_CHAIN_FILE, 0),
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ my %rcodes; # reason-name -> value
|
|||
my %ftrans; # old name -> #define-friendly name (all caps)
|
||||
my %fcodes; # function-name -> value
|
||||
my $statefile; # state file with assigned reason and function codes
|
||||
my %strings; # define -> text
|
||||
|
||||
# Read and parse the config file
|
||||
open(IN, "$config") || die "Can't open config file $config, $!,";
|
||||
|
|
@ -152,6 +153,7 @@ while ( <IN> ) {
|
|||
}
|
||||
close IN;
|
||||
|
||||
my $statefile_prolog = '';
|
||||
if ( ! $statefile ) {
|
||||
$statefile = $config;
|
||||
$statefile =~ s/.ec/.txt/;
|
||||
|
|
@ -165,11 +167,28 @@ if ( ! $reindex && $statefile ) {
|
|||
|
||||
# Scan function and reason codes and store them: keep a note of the
|
||||
# maximum code used.
|
||||
my $collecting = 1;
|
||||
while ( <STATE> ) {
|
||||
$statefile_prolog .= $_ if $collecting && ( /^#/ || /^$/ );
|
||||
next if /^#/ || /^$/;
|
||||
die "Bad line in $statefile:\n$_\n" unless /(\S+)\s+(\d+)/;
|
||||
my $name = $1;
|
||||
my $code = $2;
|
||||
my $name;
|
||||
my $code;
|
||||
if ( /^(.+):(\d+):\\$/ ) {
|
||||
$name = $1;
|
||||
$code = $2;
|
||||
my $next = <STATE>;
|
||||
$next =~ s/^\s*(.*)\s*$/$1/;
|
||||
die "Duplicate define $name" if exists $strings{$name};
|
||||
$strings{$name} = $next;
|
||||
} elsif ( /^(\S+):(\d+):(.*)$/ ) {
|
||||
$name = $1;
|
||||
$code = $2;
|
||||
die "Duplicate define $name" if exists $strings{$name};
|
||||
$strings{$name} = $3;
|
||||
} else {
|
||||
die "Bad line in $statefile:\n$_\n";
|
||||
}
|
||||
$collecting = 0;
|
||||
my $lib = $name;
|
||||
$lib =~ s/_.*//;
|
||||
$lib = "SSL" if $lib =~ /TLS/;
|
||||
|
|
@ -299,8 +318,9 @@ while ( ( my $hdr, my $lib ) = each %libinc ) {
|
|||
# pretend as we didn't use curly braces: {} -> ()
|
||||
s/\{\}/\(\)/gs;
|
||||
|
||||
if ( /(\w+)\s*\(\).*/s ) { # first token prior [first] () is
|
||||
my $name = $1; # a function name!
|
||||
# Last token just before the first () is a function name.
|
||||
if ( /(\w+)\s*\(\).*/s ) {
|
||||
my $name = $1;
|
||||
$name =~ tr/[a-z]/[A-Z]/;
|
||||
$ftrans{$name} = $1;
|
||||
} elsif ( /[\(\)]/ and not(/=/) ) {
|
||||
|
|
@ -494,31 +514,7 @@ EOF
|
|||
# Rewrite the C source file containing the error details.
|
||||
|
||||
# First, read any existing reason string definitions:
|
||||
my %err_reason_strings;
|
||||
my $cfile = $errorfile{$lib};
|
||||
if ( open( IN, "<$cfile" ) ) {
|
||||
my $line = "";
|
||||
while ( <IN> ) {
|
||||
s|\R$||; # Better chomp
|
||||
$_ = $line . $_;
|
||||
$line = "";
|
||||
if ( /{ERR_(PACK|FUNC|REASON)\(/ ) {
|
||||
if ( /\b(${lib}_R_\w*)\b.*\"(.*)\"/ ) {
|
||||
$err_reason_strings{$1} = $2;
|
||||
} elsif ( /\b${lib}_F_(\w*)\b.*\"(.*)\"/ ) {
|
||||
if ( !exists $ftrans{$1} && $1 ne $2 ) {
|
||||
# Don't print warning, too noisy. :(
|
||||
# print STDERR "WARNING: Mismatched/unused function $2\n";
|
||||
$ftrans{$1} = $2;
|
||||
}
|
||||
} else {
|
||||
$line = $_;
|
||||
}
|
||||
}
|
||||
}
|
||||
close(IN);
|
||||
}
|
||||
|
||||
my $pack_lib = $internal ? "ERR_LIB_${lib}" : "0";
|
||||
my $hincf = $hfile;
|
||||
$hincf =~ s|.*include/||;
|
||||
|
|
@ -555,9 +551,15 @@ EOF
|
|||
# Add each function code: if a function name is found then use it.
|
||||
foreach my $i ( @function ) {
|
||||
my $fn;
|
||||
$i =~ /^${lib}_F_(\S+)$/;
|
||||
$fn = $1;
|
||||
$fn = $ftrans{$fn} if exists $ftrans{$fn};
|
||||
if ( exists $strings{$i} and $strings{$i} ne '' ) {
|
||||
$fn = $strings{$i};
|
||||
$fn = "" if $fn eq '*';
|
||||
} else {
|
||||
$i =~ /^${lib}_F_(\S+)$/;
|
||||
$fn = $1;
|
||||
$fn = $ftrans{$fn} if exists $ftrans{$fn};
|
||||
$strings{$i} = $fn;
|
||||
}
|
||||
my $short = " {ERR_PACK($pack_lib, $i, 0), \"$fn\"},";
|
||||
if ( length($short) <= 80 ) {
|
||||
print OUT "$short\n";
|
||||
|
|
@ -575,12 +577,14 @@ EOF
|
|||
# Add each reason code.
|
||||
foreach my $i ( @reasons ) {
|
||||
my $rn;
|
||||
if ( exists $err_reason_strings{$i} ) {
|
||||
$rn = $err_reason_strings{$i};
|
||||
if ( exists $strings{$i} ) {
|
||||
$rn = $strings{$i};
|
||||
$rn = "" if $rn eq '*';
|
||||
} else {
|
||||
$i =~ /^${lib}_R_(\S+)$/;
|
||||
$rn = $1;
|
||||
$rn =~ tr/_[A-Z]/ [a-z]/;
|
||||
$strings{$i} = $rn;
|
||||
}
|
||||
my $short = " {ERR_PACK($pack_lib, 0, $i), \"$rn\"},";
|
||||
if ( length($short) <= 80 ) {
|
||||
|
|
@ -653,7 +657,6 @@ EOF
|
|||
}
|
||||
|
||||
close OUT;
|
||||
undef %err_reason_strings;
|
||||
}
|
||||
|
||||
&phase("Ending");
|
||||
|
|
@ -687,11 +690,20 @@ die "Found $errors errors, quitting" if $errors;
|
|||
if ( $newstate ) {
|
||||
open(OUT, ">$statefile.new")
|
||||
|| die "Can't write $statefile.new, $!";
|
||||
print OUT $statefile_prolog;
|
||||
print OUT "# Function codes\n";
|
||||
foreach my $i ( sort keys %fcodes ) {
|
||||
print OUT "$i $fcodes{$i}\n";
|
||||
my $short = "$i:$fcodes{$i}:";
|
||||
my $t = exists $strings{$i} ? $strings{$i} : "";
|
||||
$t = "\\\n\t" . $t if length($short) + length($t) > 80;
|
||||
print OUT "$short$t\n";
|
||||
}
|
||||
print OUT "\n#Reason codes\n";
|
||||
foreach my $i ( sort keys %rcodes ) {
|
||||
print OUT "$i $rcodes{$i}\n" if !exists $rextra{$i};
|
||||
my $short = "$i:$rcodes{$i}:";
|
||||
my $t = exists $strings{$i} ? "$strings{$i}" : "";
|
||||
$t = "\\\n\t" . $t if length($short) + length($t) > 80;
|
||||
print OUT "$short$t\n" if !exists $rextra{$i};
|
||||
}
|
||||
close(OUT);
|
||||
if ( $skippedstate ) {
|
||||
|
|
@ -703,4 +715,5 @@ if ( $newstate ) {
|
|||
|| die "Can't rename $statefile to $statefile.new, $!";
|
||||
}
|
||||
}
|
||||
|
||||
exit;
|
||||
|
|
|
|||
Loading…
Reference in New Issue