[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  b48ca22a56553f285d91da0ac9399fd5efd54589 (commit)
      from  6f04bcc7e3b258f4a075279515881b13bd3fd04c (commit)


- Log -----------------------------------------------------------------
commit b48ca22a56553f285d91da0ac9399fd5efd54589
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Wed Sep 2 13:13:44 2020 +1000

    Avoid AIX compiler issue by making the macro argument names not match any substring
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12767)

-----------------------------------------------------------------------

Summary of changes:
 providers/baseprov.c  | 8 ++++----
 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"