|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
@@ -521,3 +521,289 @@ TEST(ABITest, AArch64) {
|
|
|
|
|
CHECK_ABI_NO_UNWIND(abi_test_clobber_v15_upper);
|
|
|
|
|
}
|
|
|
|
@ -292,10 +292,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/abi_self_test.cc
|
|
|
|
|
+ CHECK_ABI_NO_UNWIND(abi_test_clobber_lr);
|
|
|
|
|
+}
|
|
|
|
|
+#endif // OPENSSL_PPC64LE && SUPPORTS_ABI_TEST
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/cpu_ppc64le.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/cpu_ppc64le.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/cpu_ppc64le.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/cpu_ppc64le.c
|
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
|
|
+/* Copyright (c) 2016, Google Inc.
|
|
|
|
|
+ *
|
|
|
|
@ -335,38 +335,11 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/cpu_ppc64le.c
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+#endif // OPENSSL_PPC64LE
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
@@ -25,10 +25,12 @@ static_assert(sizeof(ossl_ssize_t) == si
|
|
|
|
|
"ossl_ssize_t should be the same size as size_t");
|
|
|
|
|
|
|
|
|
|
#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \
|
|
|
|
|
- (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \
|
|
|
|
|
- defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64))
|
|
|
|
|
-// x86, x86_64, and the ARMs need to record the result of a cpuid/getauxval call
|
|
|
|
|
-// for the asm to work correctly, unless compiled without asm code.
|
|
|
|
|
+ (defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \
|
|
|
|
|
+ defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) || \
|
|
|
|
|
+ defined(OPENSSL_PPC64LE))
|
|
|
|
|
+// x86, x86_64, the ARMs and ppc64le need to record the result of a
|
|
|
|
|
+// cpuid/getauxval call for the asm to work correctly, unless compiled without
|
|
|
|
|
+// asm code.
|
|
|
|
|
#define NEED_CPUID
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
@@ -39,7 +41,8 @@ static_assert(sizeof(ossl_ssize_t) == si
|
|
|
|
|
#define BORINGSSL_NO_STATIC_INITIALIZER
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#endif // !NO_ASM && !STATIC_ARMCAP && (X86 || X86_64 || ARM || AARCH64)
|
|
|
|
|
+#endif // !NO_ASM && !STATIC_ARMCAP &&
|
|
|
|
|
+ // (X86 || X86_64 || ARM || AARCH64 || PPC64LE)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Our assembly does not use the GOT to reference symbols, which means
|
|
|
|
|
@@ -83,6 +86,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
@@ -66,6 +66,10 @@ uint32_t OPENSSL_get_ia32cap(int idx) {
|
|
|
|
|
return OPENSSL_ia32cap_P[idx];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -377,10 +350,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/crypto.c
|
|
|
|
|
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
|
|
|
|
|
|
|
|
|
|
#include <openssl/arm_arch.h>
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesp8-ppc.pl
|
|
|
|
|
@@ -0,0 +1,3809 @@
|
|
|
|
|
+#! /usr/bin/env perl
|
|
|
|
|
+# Copyright 2014-2018 The OpenSSL Project Authors. All Rights Reserved.
|
|
|
|
@ -4191,10 +4164,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/as
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+close STDOUT or die "error closing STDOUT: $!";
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/aes/internal.h
|
|
|
|
|
@@ -59,6 +59,12 @@ OPENSSL_INLINE int vpaes_capable(void) {
|
|
|
|
|
OPENSSL_INLINE int vpaes_capable(void) { return CRYPTO_is_NEON_capable(); }
|
|
|
|
|
#endif
|
|
|
|
@ -4208,10 +4181,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/aes/in
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif // !NO_ASM
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
@@ -102,6 +102,7 @@
|
|
|
|
|
#include "self_check/fips.c"
|
|
|
|
|
#include "self_check/self_check.c"
|
|
|
|
@ -4220,10 +4193,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bcm.c
|
|
|
|
|
#include "sha/sha1.c"
|
|
|
|
|
#include "sha/sha256.c"
|
|
|
|
|
#include "sha/sha512.c"
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/bn/bn.c
|
|
|
|
|
@@ -384,6 +384,23 @@ int bn_expand(BIGNUM *bn, size_t bits) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -4248,10 +4221,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/bn/bn.
|
|
|
|
|
if ((size_t)bn->width <= words) {
|
|
|
|
|
if (!bn_wexpand(bn, words)) {
|
|
|
|
|
return 0;
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/cipher/e_aes.c
|
|
|
|
|
@@ -1455,6 +1455,8 @@ int EVP_has_aes_hardware(void) {
|
|
|
|
|
return hwaes_capable() && crypto_gcm_clmul_enabled();
|
|
|
|
|
#elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)
|
|
|
|
@ -4261,10 +4234,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/cipher
|
|
|
|
|
#else
|
|
|
|
|
return 0;
|
|
|
|
|
#endif
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghashp8-ppc.pl
|
|
|
|
|
@@ -0,0 +1,671 @@
|
|
|
|
|
+#! /usr/bin/env perl
|
|
|
|
|
+# Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
|
|
@ -4937,10 +4910,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+close STDOUT or die "error closing STDOUT: $!"; # enforce flush
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/gcm.c
|
|
|
|
|
@@ -228,6 +228,13 @@ void CRYPTO_ghash_init(gmult_func *out_m
|
|
|
|
|
*out_hash = gcm_ghash_neon;
|
|
|
|
|
return;
|
|
|
|
@ -4955,11 +4928,11 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
gcm_init_nohw(out_table, H);
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
@@ -215,5 +215,15 @@ TEST(GCMTest, ABI) {
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/gcm_test.cc
|
|
|
|
|
@@ -209,5 +209,15 @@ TEST(GCMTest, ABI) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
@ -4975,10 +4948,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/
|
|
|
|
|
+#endif // GHASH_ASM_PPC64LE
|
|
|
|
|
}
|
|
|
|
|
#endif // SUPPORTS_ABI_TEST && !OPENSSL_NO_ASM
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/modes/internal.h
|
|
|
|
|
@@ -325,6 +325,13 @@ void aes_gcm_dec_kernel(const uint8_t *i
|
|
|
|
|
const u128 Htable[16]);
|
|
|
|
|
#endif
|
|
|
|
@ -4993,10 +4966,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/modes/
|
|
|
|
|
#endif
|
|
|
|
|
#endif // OPENSSL_NO_ASM
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/rand/getrandom_fillin.h
|
|
|
|
|
@@ -30,6 +30,8 @@
|
|
|
|
|
#define EXPECTED_NR_getrandom 278
|
|
|
|
|
#elif defined(OPENSSL_ARM)
|
|
|
|
@ -5006,10 +4979,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/g
|
|
|
|
|
#elif defined(OPENSSL_RISCV64)
|
|
|
|
|
#define EXPECTED_NR_getrandom 278
|
|
|
|
|
#endif
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/rand/rand.c
|
|
|
|
|
@@ -431,6 +431,11 @@ void RAND_bytes_with_additional_data(uin
|
|
|
|
|
// Take a read lock around accesses to |state->drbg|. This is needed to
|
|
|
|
|
// avoid returning bad entropy if we race with
|
|
|
|
@ -5022,10 +4995,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/rand/r
|
|
|
|
|
CRYPTO_MUTEX_lock_read(&state->clear_drbg_lock);
|
|
|
|
|
#endif
|
|
|
|
|
if (!CTR_DRBG_reseed(&state->drbg, seed, reseed_additional_data,
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/internal.h
|
|
|
|
|
@@ -23,6 +23,16 @@
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
@ -5043,10 +5016,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/in
|
|
|
|
|
// Define SHA{n}[_{variant}]_ASM if sha{n}_block_data_order[_{variant}] is
|
|
|
|
|
// defined in assembly.
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/sha1-altivec.c
|
|
|
|
|
@@ -0,0 +1,361 @@
|
|
|
|
|
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
|
|
|
+ * All rights reserved.
|
|
|
|
@ -5409,20 +5382,23 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sh
|
|
|
|
|
+#undef BODY_20_39
|
|
|
|
|
+#undef BODY_40_59
|
|
|
|
|
+#undef BODY_60_79
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
@@ -181,7 +181,7 @@ extern "C" {
|
|
|
|
|
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
@@ -183,8 +183,9 @@ extern "C" {
|
|
|
|
|
#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_STATIC_ARMCAP) && \
|
|
|
|
|
(defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || \
|
|
|
|
|
defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64))
|
|
|
|
|
-// x86, x86_64, and the ARMs need to record the result of a cpuid/getauxval call
|
|
|
|
|
-// for the asm to work correctly, unless compiled without asm code.
|
|
|
|
|
+// x86, x86_64, the ARMs, and ppc64le need to record the result of a
|
|
|
|
|
+// cpuid/getauxval call for the asm to work correctly, unless compiled without
|
|
|
|
|
+// asm code.
|
|
|
|
|
#define NEED_CPUID
|
|
|
|
|
|
|
|
|
|
#if defined(OPENSSL_X86) || defined(OPENSSL_X86_64) || defined(OPENSSL_ARM) || \
|
|
|
|
|
- defined(OPENSSL_AARCH64)
|
|
|
|
|
+ defined(OPENSSL_AARCH64) || defined(OPENSSL_PPC64LE)
|
|
|
|
|
// OPENSSL_cpuid_setup initializes the platform-specific feature cache.
|
|
|
|
|
void OPENSSL_cpuid_setup(void);
|
|
|
|
|
#endif
|
|
|
|
|
@@ -1638,6 +1638,16 @@ OPENSSL_INLINE int CRYPTO_is_ARMv8_SHA51
|
|
|
|
|
// OPENSSL_cpuid_setup initializes the platform-specific feature cache. This
|
|
|
|
|
@@ -1657,6 +1658,16 @@ OPENSSL_INLINE int CRYPTO_is_ARMv8_SHA51
|
|
|
|
|
|
|
|
|
|
#endif // OPENSSL_ARM || OPENSSL_AARCH64
|
|
|
|
|
|
|
|
|
@ -5439,10 +5415,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/internal.h
|
|
|
|
|
#if defined(BORINGSSL_DISPATCH_TEST)
|
|
|
|
|
// Runtime CPU dispatch testing support
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/perlasm/ppc-xlate.pl
|
|
|
|
|
@@ -0,0 +1,320 @@
|
|
|
|
|
+#! /usr/bin/env perl
|
|
|
|
|
+# Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
|
|
@ -5764,10 +5740,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/perlasm/ppc-xlate
|
|
|
|
|
+___
|
|
|
|
|
+
|
|
|
|
|
+close STDOUT or die "error closing STDOUT: $!";
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
@@ -179,7 +179,78 @@ struct alignas(16) Reg128 {
|
|
|
|
|
CALLER_STATE_REGISTER(uint64_t, x28) \
|
|
|
|
|
CALLER_STATE_REGISTER(uint64_t, x29)
|
|
|
|
@ -5874,10 +5850,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/abi_test.h
|
|
|
|
|
static_assert(sizeof...(args) <= 8,
|
|
|
|
|
"too many arguments for abi_test_trampoline");
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/test/asm/trampoline-ppc.pl
|
|
|
|
|
@@ -0,0 +1,262 @@
|
|
|
|
|
+#!/usr/bin/env perl
|
|
|
|
|
+# Copyright (c) 2019, Google Inc.
|
|
|
|
@ -6141,10 +6117,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/test/asm/trampoli
|
|
|
|
|
+
|
|
|
|
|
+print $code;
|
|
|
|
|
+close STDOUT or die "error closing STDOUT: $!";
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
@@ -34,6 +34,9 @@
|
|
|
|
|
#elif defined(__ARMEL__) || defined(_M_ARM)
|
|
|
|
|
#define OPENSSL_32_BIT
|
|
|
|
@ -6155,10 +6131,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/include/openssl/target.h
|
|
|
|
|
#elif defined(__MIPSEL__) && !defined(__LP64__)
|
|
|
|
|
#define OPENSSL_32_BIT
|
|
|
|
|
#define OPENSSL_MIPS
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/acvp/modulewrapper/main.cc
|
|
|
|
|
@@ -37,6 +37,8 @@ int main(int argc, char **argv) {
|
|
|
|
|
puts("ARM (32-bit)");
|
|
|
|
|
#elif defined(OPENSSL_AARCH64)
|
|
|
|
@ -6168,10 +6144,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/acvp/modu
|
|
|
|
|
#else
|
|
|
|
|
#error "FIPS build not supported on this architecture"
|
|
|
|
|
#endif
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate.go
|
|
|
|
|
@@ -54,7 +54,8 @@ type stringWriter interface {
|
|
|
|
|
type processorType int
|
|
|
|
|
|
|
|
|
@ -6638,7 +6614,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
/* Intel */
|
|
|
|
|
|
|
|
|
|
type instructionType int
|
|
|
|
|
@@ -1323,6 +1729,8 @@ func writeAarch64Function(w stringWriter
|
|
|
|
|
@@ -1332,6 +1738,8 @@ func writeAarch64Function(w stringWriter
|
|
|
|
|
func transform(w stringWriter, inputs []inputFile) error {
|
|
|
|
|
// symbols contains all defined symbols.
|
|
|
|
|
symbols := make(map[string]struct{})
|
|
|
|
@ -6647,7 +6623,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
// fileNumbers is the set of IDs seen in .file directives.
|
|
|
|
|
fileNumbers := make(map[int]struct{})
|
|
|
|
|
// maxObservedFileNumber contains the largest seen file number in a
|
|
|
|
|
@@ -1346,6 +1754,25 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
@@ -1355,6 +1763,25 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
}, ruleStatement, ruleLabel, ruleSymbolName)
|
|
|
|
|
|
|
|
|
|
forEachPath(input.ast.up, func(node *node32) {
|
|
|
|
@ -6673,7 +6649,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
assertNodeType(node, ruleLocationDirective)
|
|
|
|
|
directive := input.contents[node.begin:node.end]
|
|
|
|
|
if !strings.HasPrefix(directive, ".file") {
|
|
|
|
|
@@ -1393,11 +1820,13 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
@@ -1402,11 +1829,13 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
|
|
|
|
|
d := &delocation{
|
|
|
|
|
symbols: symbols,
|
|
|
|
@ -6687,7 +6663,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
gotExternalsNeeded: make(map[string]struct{}),
|
|
|
|
|
gotOffsetsNeeded: make(map[string]struct{}),
|
|
|
|
|
gotOffOffsetsNeeded: make(map[string]struct{}),
|
|
|
|
|
@@ -1432,6 +1861,22 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
@@ -1441,6 +1870,22 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
for _, name := range redirectorNames {
|
|
|
|
|
redirector := d.redirectors[name]
|
|
|
|
|
switch d.processor {
|
|
|
|
@ -6710,7 +6686,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
case aarch64:
|
|
|
|
|
writeAarch64Function(w, redirector, func(w stringWriter) {
|
|
|
|
|
w.WriteString("\tb " + name + "\n")
|
|
|
|
|
@@ -1456,6 +1901,13 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
@@ -1465,6 +1910,13 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
target := d.bssAccessorsNeeded[name]
|
|
|
|
|
|
|
|
|
|
switch d.processor {
|
|
|
|
@ -6724,7 +6700,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
case x86_64:
|
|
|
|
|
w.WriteString(".type " + funcName + ", @function\n")
|
|
|
|
|
w.WriteString(funcName + ":\n")
|
|
|
|
|
@@ -1471,6 +1923,26 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
@@ -1480,6 +1932,26 @@ func transform(w stringWriter, inputs []
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch d.processor {
|
|
|
|
@ -6751,7 +6727,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
case aarch64:
|
|
|
|
|
externalNames := sortedSet(d.gotExternalsNeeded)
|
|
|
|
|
for _, symbol := range externalNames {
|
|
|
|
|
@@ -1781,6 +2253,10 @@ func localTargetName(name string) string
|
|
|
|
|
@@ -1790,6 +2262,10 @@ func localTargetName(name string) string
|
|
|
|
|
return ".L" + name + "_local_target"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -6762,7 +6738,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
func isSynthesized(symbol string) bool {
|
|
|
|
|
return strings.HasSuffix(symbol, "_bss_get") ||
|
|
|
|
|
symbol == "OPENSSL_ia32cap_get" ||
|
|
|
|
|
@@ -1836,6 +2312,8 @@ func detectProcessor(input inputFile) pr
|
|
|
|
|
@@ -1845,6 +2321,8 @@ func detectProcessor(input inputFile) pr
|
|
|
|
|
switch instructionName {
|
|
|
|
|
case "movq", "call", "leaq":
|
|
|
|
|
return x86_64
|
|
|
|
@ -6771,10 +6747,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
case "str", "bl", "ldr", "st1":
|
|
|
|
|
return aarch64
|
|
|
|
|
}
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate.peg
|
|
|
|
|
@@ -12,7 +12,7 @@
|
|
|
|
|
# OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
|
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
@ -6784,10 +6760,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
# https://github.com/pointlander/peg. delocate.go has a go:generate line for
|
|
|
|
|
# rebuilding delocate.peg.go from this file.
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/delocate_test.go
|
|
|
|
|
@@ -39,6 +39,11 @@ func (test *delocateTest) Path(file stri
|
|
|
|
|
|
|
|
|
|
var delocateTests = []delocateTest{
|
|
|
|
@ -6800,10 +6776,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
{"x86_64-Basic", []string{"in.s"}, "out.s"},
|
|
|
|
|
{"x86_64-BSS", []string{"in.s"}, "out.s"},
|
|
|
|
|
{"x86_64-GOTRewrite", []string{"in.s"}, "out.s"},
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/in.s
|
|
|
|
|
@@ -0,0 +1,9 @@
|
|
|
|
|
+ .text
|
|
|
|
|
+foo:
|
|
|
|
@ -6814,10 +6790,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+ .localentry foo,.-foo
|
|
|
|
|
+.LVL0:
|
|
|
|
|
+ bl
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-GlobalEntry/out.s
|
|
|
|
|
@@ -0,0 +1,62 @@
|
|
|
|
|
+.text
|
|
|
|
|
+.file 1 "inserted_by_delocate.c"
|
|
|
|
@ -6881,19 +6857,19 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+.byte 0xff
|
|
|
|
|
+.byte 0x31
|
|
|
|
|
+.byte 0x80
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/in.s
|
|
|
|
|
@@ -0,0 +1,4 @@
|
|
|
|
|
+ .text
|
|
|
|
|
+foo:
|
|
|
|
|
+ addis 22,2,bar@toc@ha
|
|
|
|
|
+ ld 0,bar@toc@l(22)
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-LoadToR0/out.s
|
|
|
|
|
@@ -0,0 +1,72 @@
|
|
|
|
|
+.text
|
|
|
|
|
+.file 1 "inserted_by_delocate.c"
|
|
|
|
@ -6967,10 +6943,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+.byte 0xff
|
|
|
|
|
+.byte 0x31
|
|
|
|
|
+.byte 0x80
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/in.s
|
|
|
|
|
@@ -0,0 +1,161 @@
|
|
|
|
|
+ .file "foo.c"
|
|
|
|
|
+ .abiversion 2
|
|
|
|
@ -7133,10 +7109,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+ .size exported_function,.-exported_function
|
|
|
|
|
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
|
|
|
|
|
+ .section .note.GNU-stack,"",@progbits
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample/out.s
|
|
|
|
|
@@ -0,0 +1,552 @@
|
|
|
|
|
+.text
|
|
|
|
|
+.file 1 "inserted_by_delocate.c"
|
|
|
|
@ -7690,10 +7666,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+.byte 0xff
|
|
|
|
|
+.byte 0x31
|
|
|
|
|
+.byte 0x80
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/in.s
|
|
|
|
|
@@ -0,0 +1,226 @@
|
|
|
|
|
+ .file "foo.c"
|
|
|
|
|
+ .abiversion 2
|
|
|
|
@ -7921,10 +7897,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+ .zero 20
|
|
|
|
|
+ .ident "GCC: (Ubuntu 4.9.2-10ubuntu13) 4.9.2"
|
|
|
|
|
+ .section .note.GNU-stack,"",@progbits
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-Sample2/out.s
|
|
|
|
|
@@ -0,0 +1,677 @@
|
|
|
|
|
+.text
|
|
|
|
|
+.file 1 "inserted_by_delocate.c"
|
|
|
|
@ -8603,10 +8579,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+.byte 0xff
|
|
|
|
|
+.byte 0x31
|
|
|
|
|
+.byte 0x80
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/in.s
|
|
|
|
|
@@ -0,0 +1,23 @@
|
|
|
|
|
+ .text
|
|
|
|
|
+foo:
|
|
|
|
@ -8631,10 +8607,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+
|
|
|
|
|
+ addis 4, 2, 1+foo-2@toc@ha+3
|
|
|
|
|
+ addi 4, 4, 1+foo-2@toc@l+3
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/fipstools/delocate/testdata/ppc64le-TOCWithOffset/out.s
|
|
|
|
|
@@ -0,0 +1,178 @@
|
|
|
|
|
+.text
|
|
|
|
|
+.file 1 "inserted_by_delocate.c"
|
|
|
|
@ -8814,10 +8790,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/fipstools/delocate/
|
|
|
|
|
+.byte 0xff
|
|
|
|
|
+.byte 0x31
|
|
|
|
|
+.byte 0x80
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/crypto/fipsmodule/sha/sha1.c
|
|
|
|
|
@@ -416,6 +416,10 @@ static void sha1_block_data_order(uint32
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
@ -8829,11 +8805,11 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/crypto/fipsmodule/sha/sh
|
|
|
|
|
sha1_block_data_order_nohw(state, data, num);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/build.json
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/build.json
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/build.json
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/build.json
|
|
|
|
|
@@ -118,6 +118,10 @@
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/build.json
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/build.json
|
|
|
|
|
@@ -122,6 +122,10 @@
|
|
|
|
|
{"src": "crypto/fipsmodule/sha/asm/sha512-armv4.pl"},
|
|
|
|
|
{"src": "crypto/fipsmodule/aes/asm/vpaes-armv7.pl"}
|
|
|
|
|
],
|
|
|
|
@ -8844,7 +8820,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/build.json
|
|
|
|
|
"perlasm_x86": [
|
|
|
|
|
{"src": "crypto/fipsmodule/aes/asm/aesni-x86.pl"},
|
|
|
|
|
{"src": "crypto/fipsmodule/bn/asm/bn-586.pl"},
|
|
|
|
|
@@ -221,6 +225,7 @@
|
|
|
|
|
@@ -225,6 +229,7 @@
|
|
|
|
|
"crypto/cpu_arm_freebsd.c",
|
|
|
|
|
"crypto/cpu_arm_linux.c",
|
|
|
|
|
"crypto/cpu_intel.c",
|
|
|
|
@ -8852,7 +8828,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/build.json
|
|
|
|
|
"crypto/crypto.c",
|
|
|
|
|
"crypto/curve25519/curve25519.c",
|
|
|
|
|
"crypto/curve25519/curve25519_64_adx.c",
|
|
|
|
|
@@ -769,6 +774,9 @@
|
|
|
|
|
@@ -775,6 +780,9 @@
|
|
|
|
|
"perlasm_arm": [
|
|
|
|
|
{"src": "crypto/test/asm/trampoline-armv4.pl"}
|
|
|
|
|
],
|
|
|
|
@ -8862,10 +8838,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/build.json
|
|
|
|
|
"perlasm_x86": [
|
|
|
|
|
{"src": "crypto/test/asm/trampoline-x86.pl"}
|
|
|
|
|
],
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/src/util/pregenerate/build.go
|
|
|
|
|
@@ -38,6 +38,7 @@ type InputTarget struct {
|
|
|
|
|
// architecture.
|
|
|
|
|
PerlasmAarch64 []PerlasmSource `json:"perlasm_aarch64,omitempty"`
|
|
|
|
@ -8882,13 +8858,13 @@ Index: chromium-127.0.6533.72/third_party/boringssl/src/util/pregenerate/build.g
|
|
|
|
|
+ addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"linux64le"})
|
|
|
|
|
+ }
|
|
|
|
|
for _, p := range in.PerlasmX86 {
|
|
|
|
|
addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC", "-DOPENSSL_IA32_SSE2"})
|
|
|
|
|
addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC", "-DOPENSSL_IA32_SSE2"})
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
addPerlasmTask(&out.Asm, &p, "-apple.S", []string{"macosx", "-fPIC"})
|
|
|
|
|
addPerlasmTask(&out.Asm, &p, "-linux.S", []string{"elf", "-fPIC"})
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
===================================================================
|
|
|
|
|
--- chromium-127.0.6533.72.orig/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
@@ -93,6 +93,7 @@ crypto_sources = [
|
|
|
|
|
--- chromium-128.0.6613.113.orig/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
@@ -92,6 +92,7 @@ crypto_sources = [
|
|
|
|
|
"src/crypto/cpu_arm_linux.c",
|
|
|
|
|
"src/crypto/cpu_arm_linux.h",
|
|
|
|
|
"src/crypto/cpu_intel.c",
|
|
|
|
@ -8896,7 +8872,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
"src/crypto/crypto.c",
|
|
|
|
|
"src/crypto/curve25519/curve25519.c",
|
|
|
|
|
"src/crypto/curve25519/curve25519_64_adx.c",
|
|
|
|
|
@@ -334,6 +335,7 @@ crypto_sources_asm = [
|
|
|
|
|
@@ -335,6 +336,7 @@ crypto_sources_asm = [
|
|
|
|
|
"src/gen/bcm/aesv8-gcm-armv8-apple.S",
|
|
|
|
|
"src/gen/bcm/aesv8-gcm-armv8-linux.S",
|
|
|
|
|
"src/gen/bcm/aesv8-gcm-armv8-win.S",
|
|
|
|
@ -8904,7 +8880,7 @@ Index: chromium-127.0.6533.72/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
"src/gen/bcm/armv4-mont-linux.S",
|
|
|
|
|
"src/gen/bcm/armv8-mont-apple.S",
|
|
|
|
|
"src/gen/bcm/armv8-mont-linux.S",
|
|
|
|
|
@@ -350,6 +352,7 @@ crypto_sources_asm = [
|
|
|
|
|
@@ -351,6 +353,7 @@ crypto_sources_asm = [
|
|
|
|
|
"src/gen/bcm/ghash-neon-armv8-apple.S",
|
|
|
|
|
"src/gen/bcm/ghash-neon-armv8-linux.S",
|
|
|
|
|
"src/gen/bcm/ghash-neon-armv8-win.S",
|
|
|
|
@ -8912,10 +8888,10 @@ Index: chromium-127.0.6533.72/third_party/boringssl/BUILD.generated.gni
|
|
|
|
|
"src/gen/bcm/ghash-ssse3-x86-apple.S",
|
|
|
|
|
"src/gen/bcm/ghash-ssse3-x86-linux.S",
|
|
|
|
|
"src/gen/bcm/ghash-ssse3-x86_64-apple.S",
|
|
|
|
|
Index: chromium-127.0.6533.72/third_party/boringssl/README.ppc64le
|
|
|
|
|
Index: chromium-128.0.6613.113/third_party/boringssl/README.ppc64le
|
|
|
|
|
===================================================================
|
|
|
|
|
--- /dev/null
|
|
|
|
|
+++ chromium-127.0.6533.72/third_party/boringssl/README.ppc64le
|
|
|
|
|
+++ chromium-128.0.6613.113/third_party/boringssl/README.ppc64le
|
|
|
|
|
@@ -0,0 +1,8 @@
|
|
|
|
|
+==============================================================
|
|
|
|
|
+To recreate boringssl pregenerated files patch for ppc64le:
|
|
|
|
|