summaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-06-07 16:29:15 -0400
committerRich Salz <rsalz@openssl.org>2017-06-12 15:03:40 -0400
commit5816586ba45bba05f6d9f0432a408063a42e1012 (patch)
tree9b2b2f28d3dcdfa6dc086099ff3f0b9d1861d168 /engines
parent19546246cf44d30043fb17d1899b2c325924ac8b (diff)
downloadopenssl-new-5816586ba45bba05f6d9f0432a408063a42e1012.tar.gz
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)
Diffstat (limited to 'engines')
-rw-r--r--engines/e_afalg.txt48
-rw-r--r--engines/e_capi.txt112
-rw-r--r--engines/e_capi.txt.old50
-rw-r--r--engines/e_capi_err.c2
-rw-r--r--engines/e_dasync.txt34
-rw-r--r--engines/e_dasync.txt.old12
-rw-r--r--engines/e_dasync_err.c20
-rw-r--r--engines/e_ossltest.txt16
-rw-r--r--engines/e_ossltest.txt.old3
-rw-r--r--engines/e_ossltest_err.c3
10 files changed, 138 insertions, 162 deletions
diff --git a/engines/e_afalg.txt b/engines/e_afalg.txt
index 4f304762fc..3b79305acf 100644
--- a/engines/e_afalg.txt
+++ b/engines/e_afalg.txt
@@ -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
diff --git a/engines/e_capi.txt b/engines/e_capi.txt
index 6444a069f6..3f34cdf6b7 100644
--- a/engines/e_capi.txt
+++ b/engines/e_capi.txt
@@ -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
diff --git a/engines/e_capi.txt.old b/engines/e_capi.txt.old
deleted file mode 100644
index 6444a069f6..0000000000
--- a/engines/e_capi.txt.old
+++ /dev/null
@@ -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
diff --git a/engines/e_capi_err.c b/engines/e_capi_err.c
index 23bcc093e4..b72bc51a87 100644
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -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}
};
diff --git a/engines/e_dasync.txt b/engines/e_dasync.txt
index 05f359d49e..bff64bcf2f 100644
--- a/engines/e_dasync.txt
+++ b/engines/e_dasync.txt
@@ -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
diff --git a/engines/e_dasync.txt.old b/engines/e_dasync.txt.old
deleted file mode 100644
index 05f359d49e..0000000000
--- a/engines/e_dasync.txt.old
+++ /dev/null
@@ -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
diff --git a/engines/e_dasync_err.c b/engines/e_dasync_err.c
index 6f14e12ff9..794fb710cf 100644
--- a/engines/e_dasync_err.c
+++ b/engines/e_dasync_err.c
@@ -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}
};
diff --git a/engines/e_ossltest.txt b/engines/e_ossltest.txt
index e51eb8c100..2b2e31a075 100644
--- a/engines/e_ossltest.txt
+++ b/engines/e_ossltest.txt
@@ -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
diff --git a/engines/e_ossltest.txt.old b/engines/e_ossltest.txt.old
deleted file mode 100644
index e51eb8c100..0000000000
--- a/engines/e_ossltest.txt.old
+++ /dev/null
@@ -1,3 +0,0 @@
-OSSLTEST_F_BIND_OSSLTEST 100
-OSSLTEST_F_OSSLTEST_AES128_INIT_KEY 101
-OSSLTEST_R_INIT_FAILED 100
diff --git a/engines/e_ossltest_err.c b/engines/e_ossltest_err.c
index d46c03840b..920a13a692 100644
--- a/engines/e_ossltest_err.c
+++ b/engines/e_ossltest_err.c
@@ -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}
};