Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

armasm with opensslcoexist build #8265

Merged
merged 1 commit into from
Dec 21, 2024
Merged

Conversation

JacobBarthelmeh
Copy link
Contributor

./configure --enable-armasm --enable-opensslcoexist

@JacobBarthelmeh JacobBarthelmeh self-assigned this Dec 9, 2024
Copy link
Contributor

@douzzer douzzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just needs one more change:

diff --git a/wolfssl/wolfcrypt/aes.h b/wolfssl/wolfcrypt/aes.h
index ab2159abf..da9509a8d 100644
--- a/wolfssl/wolfcrypt/aes.h
+++ b/wolfssl/wolfcrypt/aes.h
@@ -850,7 +850,7 @@ WOLFSSL_API int wc_AesEaxFree(AesEax* eax);
  */
 #define GHASH_ONE_BLOCK(aes, block)                     \
     do {                                                \
-        xorbuf(AES_TAG(aes), block, AES_BLOCK_SIZE);    \
+        xorbuf(AES_TAG(aes), block, WC_AES_BLOCK_SIZE);    \
         GMULT_AARCH64(AES_TAG(aes), aes->gcm.H);        \
     }                                                   \
     while (0)

@douzzer douzzer merged commit 33a47c1 into wolfSSL:master Dec 21, 2024
145 checks passed
@douzzer
Copy link
Contributor

douzzer commented Dec 21, 2024

Merged as-is, followup PR in prep.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants