commit 526a3c49a2f04c3b55a909b80b98b2d56e80aefc
author Adam Langley <agl@chromium.org> Mon Aug 19 15:15:41 2024 -0700
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Aug 21 19:54:34 2024 +0000
tree f1b4c5f5c7cca79caa9374e29d7b305abb1241a4
parent 500fa1f9d274d06ddfc112e1815ad5dc5ce92234

Fix some ClangTidy nits in ML-DSA.

Change-Id: I65d66a2334318fd47e3e045511c21eb625b38eaa
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70348
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Adam Langley <agl@google.com>

crypto/mldsa/mldsa.c

diff --git a/crypto/mldsa/mldsa.c b/crypto/mldsa/mldsa.c
index f1a85b8..08ef50c 100644
--- a/crypto/mldsa/mldsa.c
+++ b/crypto/mldsa/mldsa.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 
 #include <openssl/bytestring.h>
+#include <openssl/mem.h>
 #include <openssl/rand.h>
 
 #include "../internal.h"
@@ -641,10 +642,10 @@
     e |= g << 14;
     e |= h << 27;
     h >>= 5;
-    memcpy(&out[13 * i], &a, sizeof(a));
-    memcpy(&out[13 * i + 4], &c, sizeof(c));
-    memcpy(&out[13 * i + 8], &e, sizeof(e));
-    memcpy(&out[13 * i + 12], &h, 1);
+    OPENSSL_memcpy(&out[13 * i], &a, sizeof(a));
+    OPENSSL_memcpy(&out[13 * i + 4], &c, sizeof(c));
+    OPENSSL_memcpy(&out[13 * i + 8], &e, sizeof(e));
+    OPENSSL_memcpy(&out[13 * i + 12], &h, 1);
   }
 }
 
@@ -668,9 +669,9 @@
     b |= c << 8;
     b |= d << 28;
     d >>= 4;
-    memcpy(&out[10 * i], &a, sizeof(a));
-    memcpy(&out[10 * i + 4], &b, sizeof(b));
-    memcpy(&out[10 * i + 8], &d, 2);
+    OPENSSL_memcpy(&out[10 * i], &a, sizeof(a));
+    OPENSSL_memcpy(&out[10 * i + 4], &b, sizeof(b));
+    OPENSSL_memcpy(&out[10 * i + 8], &d, 2);
   }
 }
 
@@ -1267,7 +1268,7 @@
   uint8_t entropy[MLDSA_SEED_BYTES];
   RAND_bytes(entropy, sizeof(entropy));
   if (optional_out_seed) {
-    memcpy(optional_out_seed, entropy, MLDSA_SEED_BYTES);
+    OPENSSL_memcpy(optional_out_seed, entropy, MLDSA_SEED_BYTES);
   }
   return MLDSA65_generate_key_external_entropy(out_encoded_public_key,
                                                out_private_key, entropy);

crypto/mldsa/mldsa_test.cc

diff --git a/crypto/mldsa/mldsa_test.cc b/crypto/mldsa/mldsa_test.cc
index 71d1280..e17cf05 100644
--- a/crypto/mldsa/mldsa_test.cc
+++ b/crypto/mldsa/mldsa_test.cc
@@ -20,7 +20,7 @@
 #include <gtest/gtest.h>
 
 #include <openssl/bytestring.h>
-#include <openssl/ctrdrbg.h>
+#include <openssl/mem.h>
 #include <openssl/span.h>
 
 #include "../test/file_test.h"