Skip to content

Commit 14a6c6a

Browse files
committed
ERR: Rebuild all generated error headers and source files
This is the result of 'make errors ERROR_REBUILD=-rebuild' Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl#13390)
1 parent f5a46ed commit 14a6c6a

124 files changed

Lines changed: 1286 additions & 376 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

crypto/asn1/asn1_err.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/asn1err.h>
13+
#include "crypto/asn1err.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -199,7 +200,7 @@ static const ERR_STRING_DATA ASN1_str_reasons[] = {
199200

200201
#endif
201202

202-
int ERR_load_ASN1_strings(void)
203+
int err_load_ASN1_strings_int(void)
203204
{
204205
#ifndef OPENSSL_NO_ERR
205206
if (ERR_reason_error_string(ASN1_str_reasons[0].error) == NULL)

crypto/async/async_err.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/asyncerr.h>
13+
#include "crypto/asyncerr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -26,7 +27,7 @@ static const ERR_STRING_DATA ASYNC_str_reasons[] = {
2627

2728
#endif
2829

29-
int ERR_load_ASYNC_strings(void)
30+
int err_load_ASYNC_strings_int(void)
3031
{
3132
#ifndef OPENSSL_NO_ERR
3233
if (ERR_reason_error_string(ASYNC_str_reasons[0].error) == NULL)

crypto/bio/bio_err.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/bioerr.h>
13+
#include "crypto/bioerr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -76,7 +77,7 @@ static const ERR_STRING_DATA BIO_str_reasons[] = {
7677

7778
#endif
7879

79-
int ERR_load_BIO_strings(void)
80+
int err_load_BIO_strings_int(void)
8081
{
8182
#ifndef OPENSSL_NO_ERR
8283
if (ERR_reason_error_string(BIO_str_reasons[0].error) == NULL)

crypto/bn/bn_err.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/bnerr.h>
13+
#include "crypto/bnerr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -44,7 +45,7 @@ static const ERR_STRING_DATA BN_str_reasons[] = {
4445

4546
#endif
4647

47-
int ERR_load_BN_strings(void)
48+
int err_load_BN_strings_int(void)
4849
{
4950
#ifndef OPENSSL_NO_ERR
5051
if (ERR_reason_error_string(BN_str_reasons[0].error) == NULL)

crypto/buffer/buf_err.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/buffererr.h>
13+
#include "crypto/buffererr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -19,7 +20,7 @@ static const ERR_STRING_DATA BUF_str_reasons[] = {
1920

2021
#endif
2122

22-
int ERR_load_BUF_strings(void)
23+
int err_load_BUF_strings_int(void)
2324
{
2425
#ifndef OPENSSL_NO_ERR
2526
if (ERR_reason_error_string(BUF_str_reasons[0].error) == NULL)

crypto/cmp/cmp_err.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/cmperr.h>
13+
#include "crypto/cmperr.h"
1314

14-
#ifndef OPENSSL_NO_ERR
15+
#ifndef OPENSSL_NO_CMP
16+
17+
# ifndef OPENSSL_NO_ERR
1518

1619
static const ERR_STRING_DATA CMP_str_reasons[] = {
1720
{ERR_PACK(ERR_LIB_CMP, 0, CMP_R_ALGORITHM_NOT_SUPPORTED),
@@ -155,13 +158,16 @@ static const ERR_STRING_DATA CMP_str_reasons[] = {
155158
{0, NULL}
156159
};
157160

158-
#endif
161+
# endif
159162

160-
int ERR_load_CMP_strings(void)
163+
int err_load_CMP_strings_int(void)
161164
{
162-
#ifndef OPENSSL_NO_ERR
165+
# ifndef OPENSSL_NO_ERR
163166
if (ERR_reason_error_string(CMP_str_reasons[0].error) == NULL)
164167
ERR_load_strings_const(CMP_str_reasons);
165-
#endif
168+
# endif
166169
return 1;
167170
}
171+
#else
172+
NON_EMPTY_TRANSLATION_UNIT
173+
#endif

crypto/cms/cms_err.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/cmserr.h>
13+
#include "crypto/cmserr.h"
1314

14-
#ifndef OPENSSL_NO_ERR
15+
#ifndef OPENSSL_NO_CMS
16+
17+
# ifndef OPENSSL_NO_ERR
1518

1619
static const ERR_STRING_DATA CMS_str_reasons[] = {
1720
{ERR_PACK(ERR_LIB_CMS, 0, CMS_R_ADD_SIGNER_ERROR), "add signer error"},
@@ -160,13 +163,16 @@ static const ERR_STRING_DATA CMS_str_reasons[] = {
160163
{0, NULL}
161164
};
162165

163-
#endif
166+
# endif
164167

165-
int ERR_load_CMS_strings(void)
168+
int err_load_CMS_strings_int(void)
166169
{
167-
#ifndef OPENSSL_NO_ERR
170+
# ifndef OPENSSL_NO_ERR
168171
if (ERR_reason_error_string(CMS_str_reasons[0].error) == NULL)
169172
ERR_load_strings_const(CMS_str_reasons);
170-
#endif
173+
# endif
171174
return 1;
172175
}
176+
#else
177+
NON_EMPTY_TRANSLATION_UNIT
178+
#endif

crypto/comp/comp_err.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Generated by util/mkerr.pl DO NOT EDIT
3-
* Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
3+
* Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
44
*
55
* Licensed under the Apache License 2.0 (the "License"). You may not use
66
* this file except in compliance with the License. You can obtain a copy
@@ -10,8 +10,11 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/comperr.h>
13+
#include "crypto/comperr.h"
1314

14-
#ifndef OPENSSL_NO_ERR
15+
#ifndef OPENSSL_NO_COMP
16+
17+
# ifndef OPENSSL_NO_ERR
1518

1619
static const ERR_STRING_DATA COMP_str_reasons[] = {
1720
{ERR_PACK(ERR_LIB_COMP, 0, COMP_R_ZLIB_DEFLATE_ERROR),
@@ -23,13 +26,16 @@ static const ERR_STRING_DATA COMP_str_reasons[] = {
2326
{0, NULL}
2427
};
2528

26-
#endif
29+
# endif
2730

28-
int ERR_load_COMP_strings(void)
31+
int err_load_COMP_strings_int(void)
2932
{
30-
#ifndef OPENSSL_NO_ERR
33+
# ifndef OPENSSL_NO_ERR
3134
if (ERR_reason_error_string(COMP_str_reasons[0].error) == NULL)
3235
ERR_load_strings_const(COMP_str_reasons);
33-
#endif
36+
# endif
3437
return 1;
3538
}
39+
#else
40+
NON_EMPTY_TRANSLATION_UNIT
41+
#endif

crypto/conf/conf_err.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/conferr.h>
13+
#include "crypto/conferr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -60,7 +61,7 @@ static const ERR_STRING_DATA CONF_str_reasons[] = {
6061

6162
#endif
6263

63-
int ERR_load_CONF_strings(void)
64+
int err_load_CONF_strings_int(void)
6465
{
6566
#ifndef OPENSSL_NO_ERR
6667
if (ERR_reason_error_string(CONF_str_reasons[0].error) == NULL)

crypto/cpt_err.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#include <openssl/err.h>
1212
#include <openssl/cryptoerr.h>
13+
#include "crypto/cryptoerr.h"
1314

1415
#ifndef OPENSSL_NO_ERR
1516

@@ -57,7 +58,7 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
5758

5859
#endif
5960

60-
int ERR_load_CRYPTO_strings(void)
61+
int err_load_CRYPTO_strings_int(void)
6162
{
6263
#ifndef OPENSSL_NO_ERR
6364
if (ERR_reason_error_string(CRYPTO_str_reasons[0].error) == NULL)

0 commit comments

Comments
 (0)