Skip to content

Use wolfCrypt's Base16_Decode in test.h when it is available #1169

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

Open
ejohnstown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use wolfCrypt's Base16_Decode in test.h when it is available #1169

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
7 changes: 1 addition & 6 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,7 @@
#endif
#ifdef WOLFSSH_OSSH_CERTS
#include <wolfssh/ossh.h>
#ifdef WOLFSSL_BASE64_ENCODE
/* Declared rather than including coding.h, whose Base16_Decode
* collides with the one wolfssh/test.h defines. */
WOLFSSL_API int Base64_Encode_NoNl(const byte* in, word32 inLen,
byte* out, word32* outLen);
#endif
#include <wolfssl/wolfcrypt/coding.h>
#endif

#if defined(WOLFSSH_SFTP) || defined(WOLFSSH_SCP)
Expand Down
9 changes: 9 additions & 0 deletions wolfssh/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,13 @@ static INLINE void build_addr_ipv6(struct sockaddr_in6* addr, const char* peer,

#ifdef WOLFSSH_TEST_HEX2BIN

/* Declares Base16_Decode when wolfSSL has it, and settles WOLFSSL_BASE16
* for the guard below. Only --enable-base16 and the options that imply it
* (openssh, sm2, all) build it, so the local copy is still needed. */
#include <wolfssl/wolfcrypt/coding.h>

#ifndef WOLFSSL_BASE16

#define BAD 0xFF

static const byte hexDecode[] =
Expand Down Expand Up @@ -1230,6 +1237,8 @@ static int Base16_Decode(const byte* in, word32 inLen,
return 0;
}

#endif /* !WOLFSSL_BASE16 */


static void FreeBins(byte* b1, byte* b2, byte* b3, byte* b4)
{
Expand Down
Loading