From 7dba293fbbf14889861c60161ee5ec94918d92a5 Mon Sep 17 00:00:00 2001 From: kaleb-himes Date: Wed, 28 Jan 2015 10:38:10 -0700 Subject: [PATCH] global declaration being shadowed in pwdbased.h --- wolfssl/wolfcrypt/pwdbased.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/wolfssl/wolfcrypt/pwdbased.h b/wolfssl/wolfcrypt/pwdbased.h index f8dd4e9c0..0e644dda2 100644 --- a/wolfssl/wolfcrypt/pwdbased.h +++ b/wolfssl/wolfcrypt/pwdbased.h @@ -33,16 +33,19 @@ extern "C" { #endif - +/* + * hashType renamed to typeH to avoid shadowing global declation here: + * wolfssl/wolfcrypt/asn.h line 173 in enum Oid_Types + */ WOLFSSL_API int wc_PBKDF1(byte* output, const byte* passwd, int pLen, const byte* salt, int sLen, int iterations, int kLen, - int hashType); + int typeH); WOLFSSL_API int wc_PBKDF2(byte* output, const byte* passwd, int pLen, const byte* salt, int sLen, int iterations, int kLen, - int hashType); + int typeH); WOLFSSL_API int wc_PKCS12_PBKDF(byte* output, const byte* passwd, int pLen, const byte* salt, int sLen, int iterations, - int kLen, int hashType, int purpose); + int kLen, int typeH, int purpose); #ifdef __cplusplus