Skip to content

Fix for nightly scripts compile issue #369

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.

Sign up for GitHub

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

Draft
padelsbach wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix for nightly scripts compile issue #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions test/test_cmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
#include <openssl/core_names.h>

#include "unit.h"
#undef AES_BLOCK_SIZE
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/cmac.h>

#ifdef WP_HAVE_CMAC

Expand Down Expand Up @@ -262,4 +259,3 @@ int test_cmac_create(void *data)

#endif /* WP_HAVE_CMAC */


11 changes: 4 additions & 7 deletions test/test_gmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
#include <openssl/core_names.h>

#include "unit.h"
#undef AES_BLOCK_SIZE
#include <wolfssl/options.h>
#include <wolfssl/wolfcrypt/aes.h>

#ifdef WP_HAVE_GMAC

Expand Down Expand Up @@ -195,10 +192,10 @@ int test_gmac_dup(void *data)
(void)data;

/* Build full messages used for one-shot expected MAC calculations. */
XMEMCPY(msgA, prefix, sizeof(prefix));
XMEMCPY(msgA + sizeof(prefix), tailA, sizeof(tailA));
XMEMCPY(msgB, prefix, sizeof(prefix));
XMEMCPY(msgB + sizeof(prefix), tailB, sizeof(tailB));
memcpy(msgA, prefix, sizeof(prefix));
memcpy(msgA + sizeof(prefix), tailA, sizeof(tailA));
memcpy(msgB, prefix, sizeof(prefix));
memcpy(msgB + sizeof(prefix), tailB, sizeof(tailB));

/* Compute expected MACs for each post-duplication branch. */
ret = test_gmac_gen_mac(wpLibCtx, cipher, iv, (int)sizeof(iv), key,
Expand Down
Loading