From 6ef5f753b4c30926b27ce6e2c34722ca0f519316 Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@google.com>
Date: Tue, 1 Feb 2022 16:56:26 -0500
Subject: Fix Abseil random tests on s390x

Apply some patches from upstream to correct AES implementation on
big-endian machines.
---
 debian/patches/big-endian-random3.diff | 82 ++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 debian/patches/big-endian-random3.diff

(limited to 'debian/patches/big-endian-random3.diff')

diff --git a/debian/patches/big-endian-random3.diff b/debian/patches/big-endian-random3.diff
new file mode 100644
index 00000000..a7847a00
--- /dev/null
+++ b/debian/patches/big-endian-random3.diff
@@ -0,0 +1,82 @@
+From: Laramie Leavitt <lar@google.com>
+Subject: Also use uint8_t golden values in randen_test.cc
+Forwarded: yes
+Origin: upstream, https://github.com/abseil/abseil-cpp/commit/cc413f8b674d61e3aa948386432e526e051afca0
+
+Also use uint8_t golden values in randen_test.cc
+    
+This makes randen_test, randen_slow_test, and randen_hwaes_test essentially
+identical, as is the intent.
+
+The author works at Google. Upstream applied this patch as Piper
+revision 405484423 and exported it to GitHub; the Applied-Upstream URL
+above points to the exported commit.
+
+--- a/absl/random/internal/randen_test.cc
++++ b/absl/random/internal/randen_test.cc
+@@ -23,9 +23,6 @@
+ 
+ using absl::random_internal::Randen;
+ 
+-// Local state parameters.
+-constexpr size_t kStateSizeT = Randen::kStateBytes / sizeof(uint64_t);
+-
+ TEST(RandenTest, CopyAndMove) {
+   static_assert(std::is_copy_constructible<Randen>::value,
+                 "Randen must be copy constructible");
+@@ -41,30 +38,38 @@
+ }
+ 
+ TEST(RandenTest, Default) {
+-  constexpr uint64_t kGolden[] = {
+-      0x6c6534090ee6d3ee, 0x044e2b9b9d5333c6, 0xc3c14f134e433977,
+-      0xdda9f47cd90410ee, 0x887bf3087fd8ca10, 0xf0b780f545c72912,
+-      0x15dbb1d37696599f, 0x30ec63baff3c6d59, 0xb29f73606f7f20a6,
+-      0x02808a316f49a54c, 0x3b8feaf9d5c8e50e, 0x9cbf605e3fd9de8a,
+-      0xc970ae1a78183bbb, 0xd8b2ffd356301ed5, 0xf4b327fe0fc73c37,
+-      0xcdfd8d76eb8f9a19, 0xc3a506eb91420c9d, 0xd5af05dd3eff9556,
+-      0x48db1bb78f83c4a1, 0x7023920e0d6bfe8c, 0x58d3575834956d42,
+-      0xed1ef4c26b87b840, 0x8eef32a23e0b2df3, 0x497cabf3431154fc,
+-      0x4e24370570029a8b, 0xd88b5749f090e5ea, 0xc651a582a970692f,
+-      0x78fcec2cbb6342f5, 0x463cb745612f55db, 0x352ee4ad1816afe3,
+-      0x026ff374c101da7e, 0x811ef0821c3de851,
++  constexpr uint8_t kGolden[] = {
++      0xee, 0xd3, 0xe6, 0x0e, 0x09, 0x34, 0x65, 0x6c, 0xc6, 0x33, 0x53, 0x9d,
++      0x9b, 0x2b, 0x4e, 0x04, 0x77, 0x39, 0x43, 0x4e, 0x13, 0x4f, 0xc1, 0xc3,
++      0xee, 0x10, 0x04, 0xd9, 0x7c, 0xf4, 0xa9, 0xdd, 0x10, 0xca, 0xd8, 0x7f,
++      0x08, 0xf3, 0x7b, 0x88, 0x12, 0x29, 0xc7, 0x45, 0xf5, 0x80, 0xb7, 0xf0,
++      0x9f, 0x59, 0x96, 0x76, 0xd3, 0xb1, 0xdb, 0x15, 0x59, 0x6d, 0x3c, 0xff,
++      0xba, 0x63, 0xec, 0x30, 0xa6, 0x20, 0x7f, 0x6f, 0x60, 0x73, 0x9f, 0xb2,
++      0x4c, 0xa5, 0x49, 0x6f, 0x31, 0x8a, 0x80, 0x02, 0x0e, 0xe5, 0xc8, 0xd5,
++      0xf9, 0xea, 0x8f, 0x3b, 0x8a, 0xde, 0xd9, 0x3f, 0x5e, 0x60, 0xbf, 0x9c,
++      0xbb, 0x3b, 0x18, 0x78, 0x1a, 0xae, 0x70, 0xc9, 0xd5, 0x1e, 0x30, 0x56,
++      0xd3, 0xff, 0xb2, 0xd8, 0x37, 0x3c, 0xc7, 0x0f, 0xfe, 0x27, 0xb3, 0xf4,
++      0x19, 0x9a, 0x8f, 0xeb, 0x76, 0x8d, 0xfd, 0xcd, 0x9d, 0x0c, 0x42, 0x91,
++      0xeb, 0x06, 0xa5, 0xc3, 0x56, 0x95, 0xff, 0x3e, 0xdd, 0x05, 0xaf, 0xd5,
++      0xa1, 0xc4, 0x83, 0x8f, 0xb7, 0x1b, 0xdb, 0x48, 0x8c, 0xfe, 0x6b, 0x0d,
++      0x0e, 0x92, 0x23, 0x70, 0x42, 0x6d, 0x95, 0x34, 0x58, 0x57, 0xd3, 0x58,
++      0x40, 0xb8, 0x87, 0x6b, 0xc2, 0xf4, 0x1e, 0xed, 0xf3, 0x2d, 0x0b, 0x3e,
++      0xa2, 0x32, 0xef, 0x8e, 0xfc, 0x54, 0x11, 0x43, 0xf3, 0xab, 0x7c, 0x49,
++      0x8b, 0x9a, 0x02, 0x70, 0x05, 0x37, 0x24, 0x4e, 0xea, 0xe5, 0x90, 0xf0,
++      0x49, 0x57, 0x8b, 0xd8, 0x2f, 0x69, 0x70, 0xa9, 0x82, 0xa5, 0x51, 0xc6,
++      0xf5, 0x42, 0x63, 0xbb, 0x2c, 0xec, 0xfc, 0x78, 0xdb, 0x55, 0x2f, 0x61,
++      0x45, 0xb7, 0x3c, 0x46, 0xe3, 0xaf, 0x16, 0x18, 0xad, 0xe4, 0x2e, 0x35,
++      0x7e, 0xda, 0x01, 0xc1, 0x74, 0xf3, 0x6f, 0x02, 0x51, 0xe8, 0x3d, 0x1c,
++      0x82, 0xf0, 0x1e, 0x81,
+   };
+ 
+-  alignas(16) uint64_t state[kStateSizeT];
++  alignas(16) uint8_t state[Randen::kStateBytes];
+   std::memset(state, 0, sizeof(state));
+ 
+   Randen r;
+   r.Generate(state);
+ 
+-  auto id = std::begin(state);
+-  for (const auto& elem : kGolden) {
+-    EXPECT_EQ(elem, *id++);
+-  }
++  EXPECT_EQ(0, std::memcmp(state, kGolden, sizeof(state)));
+ }
+ 
+ }  // namespace
-- 
cgit v1.2.3