wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolving some unwanted dependencies

Browse Source
This commit is contained in:
kaleb-himes
2018-07-20 11:54:36 -06:00
parent d54c7a7df8
commit 027f18919a
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/random.c
View File

@@ -576,7 +576,9 @@ static int _InitRng(WC_RNG* rng, byte* nonce, word32 nonceSz,
void* heap, int devId) void* heap, int devId)
{ {
int ret = RNG_FAILURE_E; int ret = RNG_FAILURE_E;
#ifdef HAVE_HASHDRBG
word32 entropySz = ENTROPY_SZ; word32 entropySz = ENTROPY_SZ;
#endif
(void)nonce; (void)nonce;
(void)nonceSz; (void)nonceSz;

13
wolfcrypt/test/test.c
View File

@@ -123,9 +123,12 @@
#include <wolfssl/wolfcrypt/cryptodev.h> #include <wolfssl/wolfcrypt/cryptodev.h>
#endif #endif
#ifndef NO_INLINE
#define WOLFSSL_MISC_INCLUDED #define WOLFSSL_MISC_INCLUDED
#include <wolfcrypt/src/misc.c> #include <wolfcrypt/src/misc.c>
#else
#include <wolfssl/wolfcrypt/misc.h>
#endif
/* only for stack size check */ /* only for stack size check */
#ifdef HAVE_STACK_SIZE #ifdef HAVE_STACK_SIZE
@@ -17515,6 +17518,7 @@ int ed25519_test(void)
0 /*sizeof(msg1)*/, 0 /*sizeof(msg1)*/,
sizeof(msg4) sizeof(msg4)
}; };
#ifndef NO_ASN
static byte privateEd25519[] = { static byte privateEd25519[] = {
0x30,0x2e,0x02,0x01,0x00,0x30,0x05,0x06, 0x30,0x2e,0x02,0x01,0x00,0x30,0x05,0x06,
0x03,0x2b,0x65,0x70,0x04,0x22,0x04,0x20, 0x03,0x2b,0x65,0x70,0x04,0x22,0x04,0x20,
@@ -17544,9 +17548,10 @@ int ed25519_test(void)
0xda,0xa6,0x23,0x25,0xaf,0x02,0x1a,0x68, 0xda,0xa6,0x23,0x25,0xaf,0x02,0x1a,0x68,
0xf7,0x07,0x51,0x1a 0xf7,0x07,0x51,0x1a
}; };
word32 idx; word32 idx;
ed25519_key key3; ed25519_key key3;
#endif /* NO_ASN */
#endif /* HAVE_ED25519_SIGN && HAVE_ED25519_KEY_EXPORT && HAVE_ED25519_KEY_IMPORT */ #endif /* HAVE_ED25519_SIGN && HAVE_ED25519_KEY_EXPORT && HAVE_ED25519_KEY_IMPORT */
/* create ed25519 keys */ /* create ed25519 keys */
@@ -17560,7 +17565,9 @@ int ed25519_test(void)
wc_ed25519_init(&key); wc_ed25519_init(&key);
wc_ed25519_init(&key2); wc_ed25519_init(&key2);
#ifndef NO_ASN
wc_ed25519_init(&key3); wc_ed25519_init(&key3);
#endif
wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key); wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key);
wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key2); wc_ed25519_make_key(&rng, ED25519_KEY_SIZE, &key2);
@@ -17629,6 +17636,7 @@ int ed25519_test(void)
#endif /* HAVE_ED25519_VERIFY */ #endif /* HAVE_ED25519_VERIFY */
} }
#ifndef NO_ASN
/* Try ASN.1 encoded private-only key and public key. */ /* Try ASN.1 encoded private-only key and public key. */
idx = 0; idx = 0;
if (wc_Ed25519PrivateKeyDecode(privateEd25519, &idx, &key3, if (wc_Ed25519PrivateKeyDecode(privateEd25519, &idx, &key3,
@@ -17672,6 +17680,7 @@ int ed25519_test(void)
return -7234 - i; return -7234 - i;
wc_ed25519_free(&key3); wc_ed25519_free(&key3);
#endif /* NO_ASN */
#endif /* HAVE_ED25519_SIGN && HAVE_ED25519_KEY_EXPORT && HAVE_ED25519_KEY_IMPORT */ #endif /* HAVE_ED25519_SIGN && HAVE_ED25519_KEY_EXPORT && HAVE_ED25519_KEY_IMPORT */
/* clean up keys when done */ /* clean up keys when done */