Revert "CI: Pacify ASan vs. memcpy(), fully upgrade to actions/checkout@v5"

This reverts commit 5d9397e.

Author: solardiz

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       CC: gcc
       TARGET: x86_64
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v4
     - name: install dependencies
       run: .ci/install-dependencies.sh
     - name: build check

src/blake2b_plug.c

@@ -406,30 +406,29 @@ int blake2b_long(void *pout, size_t outlen, const void *in, size_t inlen) {
         TRY(blake2b_final(&blake_state, out, outlen));
     } else {
         uint32_t toproduce;
-        struct {
-            uint8_t b[BLAKE2B_OUTBYTES];
-        } out_buffer, in_buffer;
+        uint8_t out_buffer[BLAKE2B_OUTBYTES];
+        uint8_t in_buffer[BLAKE2B_OUTBYTES];
         TRY(blake2b_init(&blake_state, BLAKE2B_OUTBYTES));
         TRY(blake2b_update(&blake_state, outlen_bytes, sizeof(outlen_bytes)));
         TRY(blake2b_update(&blake_state, in, inlen));
-        TRY(blake2b_final(&blake_state, out_buffer.b, BLAKE2B_OUTBYTES));
-        memcpy(out, out_buffer.b, BLAKE2B_OUTBYTES / 2);
+        TRY(blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES));
+        memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
         out += BLAKE2B_OUTBYTES / 2;
         toproduce = (uint32_t)outlen - BLAKE2B_OUTBYTES / 2;
 
         while (toproduce > BLAKE2B_OUTBYTES) {
-            in_buffer = out_buffer;
-            TRY(blake2b(out_buffer.b, BLAKE2B_OUTBYTES, in_buffer.b,
+            memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
+            TRY(blake2b(out_buffer, BLAKE2B_OUTBYTES, in_buffer,
                         BLAKE2B_OUTBYTES, NULL, 0));
-            memcpy(out, out_buffer.b, BLAKE2B_OUTBYTES / 2);
+            memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
             out += BLAKE2B_OUTBYTES / 2;
             toproduce -= BLAKE2B_OUTBYTES / 2;
         }
 
-        in_buffer = out_buffer;
-        TRY(blake2b(out_buffer.b, toproduce, in_buffer.b, BLAKE2B_OUTBYTES, NULL,
+        memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
+        TRY(blake2b(out_buffer, toproduce, in_buffer, BLAKE2B_OUTBYTES, NULL,
                     0));
-        memcpy(out, out_buffer.b, toproduce);
+        memcpy(out, out_buffer, toproduce);
     }
 fail:
     secure_zero_memory(&blake_state, sizeof(blake_state));

src/secp256k1/secp256k1.c

@@ -119,13 +119,7 @@ static int secp256k1_pubkey_load(const secp256k1_context* ctx, secp256k1_ge* ge,
          * representation inside secp256k1_pubkey, as conversion is very fast.
          * Note that secp256k1_pubkey_save must use the same representation. */
         secp256k1_ge_storage s;
-#ifdef __SANITIZE_ADDRESS__
-/* Workaround ASan false positives seen in GitHub's Ubuntu 24.04 runner */
-        memcpy(&s, &pubkey->data[0], 32);
-        memcpy((uint8_t *)&s + 32, &pubkey->data[32], 32);
-#else
         memcpy(&s, &pubkey->data[0], 64);
-#endif
         secp256k1_ge_from_storage(ge, &s);
     } else {
         /* Otherwise, fall back to 32-byte big endian for X and Y. */
@@ -142,13 +136,7 @@ static void secp256k1_pubkey_save(secp256k1_pubkey* pubkey, secp256k1_ge* ge) {
     if (sizeof(secp256k1_ge_storage) == 64) {
         secp256k1_ge_storage s;
         secp256k1_ge_to_storage(&s, ge);
-#ifdef __SANITIZE_ADDRESS__
-/* Workaround ASan false positives seen in GitHub's Ubuntu 24.04 runner */
-        memcpy(&pubkey->data[0], &s, 32);
-        memcpy(&pubkey->data[32], (uint8_t *)&s + 32, 32);
-#else
         memcpy(&pubkey->data[0], &s, 64);
-#endif
     } else {
         VERIFY_CHECK(!secp256k1_ge_is_infinity(ge));
         secp256k1_fe_normalize_var(&ge->x);