The branch master has been updated
via d11dd381c561db5c5144e575ac6db63e07d5507b (commit)
via 64fac96de81d3dc19cc0c9045c341f0dec818075 (commit)
via a7981653ea61b587bbb963985e30394177945e8e (commit)
from e378be2a29f8bc5e679e63d5f5e9766d2f4dfc4b (commit)
- Log -----------------------------------------------------------------
commit d11dd381c561db5c5144e575ac6db63e07d5507b
Author: Pauli <pa...@openssl.org>
Date: Mon May 31 10:29:55 2021 +1000
add some cross compilation builds
Add some cross compiling builds to test things aren't broken.
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15535)
commit 64fac96de81d3dc19cc0c9045c341f0dec818075
Author: Pauli <pa...@openssl.org>
Date: Mon May 31 15:33:22 2021 +1000
sparc: fix cross compile build
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15535)
commit a7981653ea61b587bbb963985e30394177945e8e
Author: Pauli <pa...@openssl.org>
Date: Mon May 31 15:16:16 2021 +1000
ppc: fix ambiguous if if else statement
Reviewed-by: Richard Levitte <levi...@openssl.org>
Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15535)
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/cross-compiles.yml | 66 ++++++++++++++++++++++++++++++++++++
crypto/ppccap.c | 3 +-
crypto/sparcv9cap.c | 1 +
include/crypto/aes_platform.h | 12 +++----
include/crypto/cmll_platform.h | 8 ++---
5 files changed, 79 insertions(+), 11 deletions(-)
create mode 100644 .github/workflows/cross-compiles.yml
diff --git a/.github/workflows/cross-compiles.yml
b/.github/workflows/cross-compiles.yml
new file mode 100644
index 0000000000..668ef6a658
--- /dev/null
+++ b/.github/workflows/cross-compiles.yml
@@ -0,0 +1,66 @@
+name: Cross Compile
+
+on: [pull_request, push]
+
+jobs:
+ cross-compilation:
+ strategy:
+ fail-fast: false
+ matrix:
+ # The platform matrix specifies the package to be loaded by apt,
+ # then the cross compilation prefix and finally the configuration
+ # target.
+ platform: [
+ {
+ package: gcc-aarch64-linux-gnu libc6-dev-arm64-cross,
+ cross: aarch64-linux-gnu-,
+ target: linux-aarch64
+ }, {
+ package: gcc-alpha-linux-gnu libc6.1-dev-alpha-cross,
+ cross: alpha-linux-gnu-,
+ target: linux-alpha-gcc
+ }, {
+ package: gcc-arm-linux-gnueabi libc6-dev-armel-cross,
+ cross: arm-linux-gnueabi-,
+ target: linux-armv4
+ }, {
+ package: gcc-arm-linux-gnueabihf libc6-dev-armhf-cross,
+ cross: arm-linux-gnueabihf-,
+ target: linux-armv4
+ }, {
+ package: gcc-mips-linux-gnu libc6-dev-mips-cross,
+ cross: mips-linux-gnu-,
+ target: linux-mips32
+ }, {
+ package: gcc-mipsel-linux-gnu libc6-dev-mipsel-cross,
+ cross: mipsel-linux-gnu-,
+ target: linux-mips32
+ }, {
+ package: gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross,
+ cross: powerpc64le-linux-gnu-,
+ target: linux-ppc64le
+ }, {
+ package: gcc-riscv64-linux-gnu libc6-dev-riscv64-cross,
+ cross: riscv64-linux-gnu-,
+ target: linux64-riscv64
+ }, {
+ package: gcc-s390x-linux-gnu libc6-dev-s390x-cross,
+ cross: s390x-linux-gnu-,
+ target: linux64-s390x
+ }, {
+ package: gcc-sparc64-linux-gnu libc6-dev-sparc64-cross,
+ cross: sparc64-linux-gnu-,
+ target: linux64-sparcv9
+ }
+ ]
+ runs-on: ubuntu-latest
+ steps:
+ - name: install packages
+ run: |
+ sudo apt-get update
+ sudo apt-get -yq --no-install-suggests --no-install-recommends
--force-yes install ${{ matrix.platform.package }}
+ - uses: actions/checkout@v2
+ - name: config
+ run: ./config --banner=Configured --strict-warnings enable-fips
--cross-compile-prefix=${{ matrix.platform.cross }} ${{ matrix.platform.target
}} && perl configdata.pm --dump
+ - name: make
+ run: make -s -j4
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 4d28d84cae..27f048686e 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -68,11 +68,12 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const
BN_ULONG *bp,
* no opportunity to figure it out...
*/
- if (num == 6)
+ if (num == 6) {
if (OPENSSL_ppccap_P & PPC_MADD300)
return bn_mul_mont_300_fixed_n6(rp, ap, bp, np, n0, num);
else
return bn_mul_mont_fixed_n6(rp, ap, bp, np, n0, num);
+ }
return bn_mul_mont_int(rp, ap, bp, np, n0, num);
}
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 4c39362e40..44e74b309b 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"
diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
index 431aef908b..a50bdbe069 100644
--- a/include/crypto/aes_platform.h
+++ b/include/crypto/aes_platform.h
@@ -264,22 +264,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/include/crypto/cmll_platform.h b/include/crypto/cmll_platform.h
index 527f216ca8..fe2f789173 100644
--- a/include/crypto/cmll_platform.h
+++ b/include/crypto/cmll_platform.h
@@ -29,16 +29,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);
