[openssl] OpenSSL_1_1_1-stable update

[nic.tuv at gmail.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  4f850d7221ef6d9010053434d8ae43da13ad8fde (commit)
       via  e22819f1c811b7741b4db408ce18860fa77bc97f (commit)
      from  a7ce0c00a2eb8fe88786c4eb28e9ed385581eab7 (commit)


- Log -----------------------------------------------------------------
commit 4f850d7221ef6d9010053434d8ae43da13ad8fde
Author: Pauli <pauli at openssl.org>
Date:   Mon May 31 15:33:22 2021 +1000

    sparc: fix cross compile build
    
    (cherry picked from commit 64fac96de81d3dc19cc0c9045c341f0dec818075)
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/16336)

commit e22819f1c811b7741b4db408ce18860fa77bc97f
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date:   Thu Aug 19 01:16:10 2021 +0300

    Revert "[github-ci][cross-compiles.yml] Disable sparcv9"
    
    This reverts commit aa23aa759cf33b4f481fc719d42cb7bae8b2eaf0.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16336)

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

Summary of changes:
 .github/workflows/cross-compiles.yml | 15 +++++++--------
 crypto/evp/e_aes.c                   | 12 ++++++------
 crypto/evp/e_camellia.c              |  8 ++++----
 crypto/sparcv9cap.c                  |  1 +
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cross-compiles.yml b/.github/workflows/cross-compiles.yml
index dfc6b15b90..e40bcf5852 100644
--- a/.github/workflows/cross-compiles.yml
+++ b/.github/workflows/cross-compiles.yml
@@ -106,14 +106,13 @@ jobs:
             tests: none
           },
 
-          # sparcv9 is temporarily disabled due to failures during compilation
-          # # This build doesn't execute either with or without shared libraries.
-          # {
-          #   arch: sparc64-linux-gnu,
-          #   libs: libc6-dev-sparc64-cross,
-          #   target: linux64-sparcv9,
-          #   tests: none
-          # }
+          # This build doesn't execute either with or without shared libraries.
+          {
+            arch: sparc64-linux-gnu,
+            libs: libc6-dev-sparc64-cross,
+            target: linux64-sparcv9,
+            tests: none
+          }
         ]
     runs-on: ubuntu-latest
     steps:
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 73cadbf593..a7c6b3cca3 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -611,22 +611,22 @@ void aes_t4_decrypt(const unsigned char *in, unsigned char *out,
  */
 void aes128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                            size_t len, const AES_KEY *key,
-                           unsigned char *ivec);
+                           unsigned char *ivec, int /*unused*/);
 void aes128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                              size_t blocks, const AES_KEY *key,
                              unsigned char *ivec);
diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c
index 502d6936cc..87580cd39b 100644
--- a/crypto/evp/e_camellia.c
+++ b/crypto/evp/e_camellia.c
@@ -55,16 +55,16 @@ void cmll_t4_decrypt(const unsigned char *in, unsigned char *out,
 
 void cmll128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
                             size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec);
+                            unsigned char *ivec, int /*unused*/);
 void cmll128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
                               size_t blocks, const CAMELLIA_KEY *key,
                               unsigned char *ivec);
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index ff1a983ac9..98cacf24d9 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
+#include "bn/bn_local.h"    /* for definition of bn_mul_mont */
 
 #include "sparc_arch.h"