diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2020-09-02 13:13:44 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-09-03 16:40:39 +1000 |
| commit | b48ca22a56553f285d91da0ac9399fd5efd54589 (patch) | |
| tree | 8531dbc65556c51cf8ddfbec5fc7241c226907a7 | |
| parent | 6f04bcc7e3b258f4a075279515881b13bd3fd04c (diff) | |
| download | openssl-new-b48ca22a56553f285d91da0ac9399fd5efd54589.tar.gz | |
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)
| -rw-r--r-- | providers/baseprov.c | 8 | ||||
| -rw-r--r-- | providers/defltprov.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/providers/baseprov.c b/providers/baseprov.c index eb0e4afbd3..dcea2ad93e 100644 --- a/providers/baseprov.c +++ b/providers/baseprov.c @@ -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" diff --git a/providers/defltprov.c b/providers/defltprov.c index 943bdc6136..855497be06 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -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" |