root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Avoid AIX compiler issue by making the macro argument names not match any substring 

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12767)
This commit is contained in:
Jon Spillett 2020-09-02 13:13:44 +10:00 committed by Shane Lontis
parent 6f04bcc7e3
commit b48ca22a56
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/baseprov.c
View File

@ -65,9 +65,9 @@ static int base_get_params(void *provctx, OSSL_PARAM params[])
}
static const OSSL_ALGORITHM base_encoder[] = {
#define ENCODER(name, fips, format, type, func_table) \
#define ENCODER(name, _fips, _format, _type, func_table) \
{ name, \
"provider=base,fips=" fips ",format=" format ",type=" type, \
"provider=base,fips=" _fips ",format=" _format ",type=" _type, \
(func_table) }
#include "encoders.inc"
@ -76,9 +76,9 @@ static const OSSL_ALGORITHM base_encoder[] = {
#undef ENCODER
static const OSSL_ALGORITHM base_decoder[] = {
#define DECODER(name, fips, input, func_table) \
#define DECODER(name, _fips, _input, func_table) \
{ name, \
"provider=base,fips=" fips ",input=" input, \
"provider=base,fips=" _fips ",input=" _input, \
(func_table) }
#include "decoders.inc"

8
providers/defltprov.c
View File

@ -412,9 +412,9 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = {
};
static const OSSL_ALGORITHM deflt_encoder[] = {
#define ENCODER(name, fips, format, type, func_table) \
#define ENCODER(name, _fips, _format, _type, func_table) \
{ name, \
"provider=default,fips=" fips ",format=" format ",type=" type, \
"provider=default,fips=" _fips ",format=" _format ",type=" _type, \
(func_table) }
#include "encoders.inc"
@ -423,9 +423,9 @@ static const OSSL_ALGORITHM deflt_encoder[] = {
#undef ENCODER
static const OSSL_ALGORITHM deflt_decoder[] = {
#define DECODER(name, fips, input, func_table) \
#define DECODER(name, _fips, _input, func_table) \
{ name, \
"provider=default,fips=" fips ",input=" input, \
"provider=default,fips=" _fips ",input=" _input, \
(func_table) }
#include "decoders.inc"