diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-07-11 14:01:56 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-07-16 05:26:28 +0200 |
| commit | cbfa5b03989ee6b8f5c13c4284d5bae02c562f20 (patch) | |
| tree | 3310c99c9e47c0fa88a276e789cad33136663185 /crypto/objects | |
| parent | aac96e2797c34a6b2a839eb58c30ab3328a0cee8 (diff) | |
| download | openssl-new-cbfa5b03989ee6b8f5c13c4284d5bae02c562f20.tar.gz | |
Regenerate mkerr files
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9058)
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_err.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/crypto/objects/obj_err.c b/crypto/objects/obj_err.c index 16d6e65e3d..f8b48fe0de 100644 --- a/crypto/objects/obj_err.c +++ b/crypto/objects/obj_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -13,19 +13,6 @@ #ifndef OPENSSL_NO_ERR -static const ERR_STRING_DATA OBJ_str_functs[] = { - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_ADD_OBJECT, 0), "OBJ_add_object"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_ADD_SIGID, 0), "OBJ_add_sigid"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_CREATE, 0), "OBJ_create"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_DUP, 0), "OBJ_dup"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_NAME_NEW_INDEX, 0), "OBJ_NAME_new_index"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_NID2LN, 0), "OBJ_nid2ln"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_NID2OBJ, 0), "OBJ_nid2obj"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_NID2SN, 0), "OBJ_nid2sn"}, - {ERR_PACK(ERR_LIB_OBJ, OBJ_F_OBJ_TXT2OBJ, 0), "OBJ_txt2obj"}, - {0, NULL} -}; - static const ERR_STRING_DATA OBJ_str_reasons[] = { {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_OID_EXISTS), "oid exists"}, {ERR_PACK(ERR_LIB_OBJ, 0, OBJ_R_UNKNOWN_NID), "unknown nid"}, @@ -37,10 +24,8 @@ static const ERR_STRING_DATA OBJ_str_reasons[] = { int ERR_load_OBJ_strings(void) { #ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL) { - ERR_load_strings_const(OBJ_str_functs); + if (ERR_func_error_string(OBJ_str_reasons[0].error) == NULL) ERR_load_strings_const(OBJ_str_reasons); - } #endif return 1; } |