From 720f3fdad200d08db09e0a28899bbc8eac1e2be6 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 23 May 2017 15:00:55 -0700 Subject: [PATCH] Fixed a few minor build errors with async enabled. --- wolfssl/internal.h | 2 +- wolfssl/wolfcrypt/curve25519.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 568fb7e86..e17d8840b 100755 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -2999,7 +2999,7 @@ typedef struct HS_Hashes { #ifdef WOLFSSL_ASYNC_CRYPT - #define MAX_ASYNC_ARGS 16 + #define MAX_ASYNC_ARGS 18 typedef void (*FreeArgsCb)(struct WOLFSSL* ssl, void* pArgs); struct WOLFSSL_ASYNC { diff --git a/wolfssl/wolfcrypt/curve25519.h b/wolfssl/wolfcrypt/curve25519.h index fb4a96c29..85b036d14 100644 --- a/wolfssl/wolfcrypt/curve25519.h +++ b/wolfssl/wolfcrypt/curve25519.h @@ -30,6 +30,10 @@ #include #include +#ifdef WOLFSSL_ASYNC_CRYPT + #include +#endif + #ifdef __cplusplus extern "C" { #endif @@ -50,7 +54,7 @@ typedef struct { #ifdef FREESCALE_LTC_ECC byte pointY[CURVE25519_KEYSIZE]; #endif -}ECPoint; +} ECPoint; /* A CURVE25519 Key */ typedef struct curve25519_key { @@ -61,6 +65,10 @@ typedef struct curve25519_key { curves (idx >= 0) or user supplied */ ECPoint p; /* public key */ ECPoint k; /* private key */ + +#ifdef WOLFSSL_ASYNC_CRYPT + WC_ASYNC_DEV asyncDev; +#endif } curve25519_key; enum {