From c3b1d9f9e7eec04bc23539e92ee7fe9dd9c8320c Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Tue, 30 Nov 2021 10:00:02 +0100 Subject: [PATCH] Cosmetic and prototypes changes after reviewer's comments --- src/ssl.c | 3 +-- src/tls13.c | 2 +- wolfssl/ssl.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index b6d585ba7..b67dd2445 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -42003,8 +42003,7 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl) #if defined(HAVE_PK_CALLBACKS) && defined(HAVE_HKDF) -WOLFSSL_ABI -void wolfSSL_CTX_SetHKDFExtractCb(WOLFSSL_CTX* ctx, CallbackHKDFExtract cb) +void wolfSSL_CTX_SetHKDFExtractCb(WOLFSSL_CTX* ctx, CallbackHKDFExtract cb) { if (ctx) ctx->HkdfExtractCb = cb; diff --git a/src/tls13.c b/src/tls13.c index 116ffe53a..e43fc4585 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -851,7 +851,7 @@ static int DeriveTrafficSecret(WOLFSSL* ssl, byte* secret) } -static inline int Tls13_HKDF_Extract(WOLFSSL *ssl, byte* prk, const byte* salt, int saltLen, +static int Tls13_HKDF_Extract(WOLFSSL *ssl, byte* prk, const byte* salt, int saltLen, byte* ikm, int ikmLen, int digest) { int ret; diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 49c76f50b..db43d6bb4 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -3046,9 +3046,9 @@ WOLFSSL_API void* wolfSSL_GetEccSharedSecretCtx(WOLFSSL* ssl); #include typedef int (*CallbackHKDFExtract)(byte* prk, const byte* salt, word32 saltLen, byte* ikm, word32 ikmLen, int digest, void* ctx); -WOLFSSL_ABI WOLFSSL_API void wolfSSL_CTX_SetHKDFExtractCb(WOLFSSL_CTX*, CallbackHKDFExtract); +WOLFSSL_API void wolfSSL_CTX_SetHKDFExtractCb(WOLFSSL_CTX*, CallbackHKDFExtract); WOLFSSL_API void* wolfSSL_GetHKDFExtractCtx(WOLFSSL* ssl); -WOLFSSL_API void wolfSSL_SetHKDFExtractCtx(WOLFSSL* ssl, void *ctx); +WOLFSSL_API void wolfSSL_SetHKDFExtractCtx(WOLFSSL* ssl, void *ctx); #endif #ifndef NO_DH