commit 2fc7912e26589360d5db453a2d390e7806ba0d3c
author David Benjamin <davidben@google.com> Wed Sep 04 11:45:19 2024 -0400
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Sep 04 16:02:49 2024 +0000
tree 144856bef42e32c2d3af1e6e849d7fbf3786e003
parent 6763c954da6b9c7ff4e4c1a335c3833c55a0ec05

Remove now unnecessary OPENSSL_init_cpuid call

I should have removed this when the OPENSSL_ia32cap_P dispatch was
removed from the ChaCha20-Poly1305 assembly.

Bug: 42290548
Change-Id: Ic2ca0f6a897c27974833155935e42189fcbc1494
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/70887
Commit-Queue: Bob Beck <bbe@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Bob Beck <bbe@google.com>

crypto/cipher_extra/e_chacha20poly1305.c

diff --git a/crypto/cipher_extra/e_chacha20poly1305.c b/crypto/cipher_extra/e_chacha20poly1305.c
index d200465..6510ff4 100644
--- a/crypto/cipher_extra/e_chacha20poly1305.c
+++ b/crypto/cipher_extra/e_chacha20poly1305.c
@@ -41,13 +41,6 @@
 
 static int aead_chacha20_poly1305_init(EVP_AEAD_CTX *ctx, const uint8_t *key,
                                        size_t key_len, size_t tag_len) {
-  // TODO(crbug.com/42290548): The x86_64 assembly depends on initializing
-  // |OPENSSL_ia32cap_P|. Move the dispatch to C. While we're here, it may be
-  // worth adjusting the assembly calling convention. The assembly functions do
-  // too much work right now. For now, explicitly initialize |OPENSSL_ia32cap_P|
-  // first.
-  OPENSSL_init_cpuid();
-
   struct aead_chacha20_poly1305_ctx *c20_ctx =
       (struct aead_chacha20_poly1305_ctx *)&ctx->state;