Commit 5816586b authored by Rich Salz's avatar Rich Salz
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3640)
parent 19546246

crypto/dso/dso_err.c

+1 −1
Original line number Diff line number Diff line
@@ -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}

crypto/err/openssl.txt

+2535 −2461

File changed.

Preview size limit exceeded, changes collapsed.

crypto/rsa/rsa_err.c

+6 −10
Original line number Diff line number Diff line
@@ -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),

crypto/ts/ts_err.c

+1 −1
Original line number Diff line number Diff line
@@ -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}

engines/e_afalg.txt

+30 −18
Original line number Diff line number Diff line 
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