feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

global declaration being shadowed in pwdbased.h

Browse Source
This commit is contained in:
kaleb-himes
2015-01-28 10:38:10 -07:00
parent 14eaa69eae
commit 7dba293fbb
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfssl/wolfcrypt/pwdbased.h
View File

@ -33,16 +33,19 @@
extern "C" { extern "C" {
#endif #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, WOLFSSL_API int wc_PBKDF1(byte* output, const byte* passwd, int pLen,
const byte* salt, int sLen, int iterations, int kLen, 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, WOLFSSL_API int wc_PBKDF2(byte* output, const byte* passwd, int pLen,
const byte* salt, int sLen, int iterations, int kLen, 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, WOLFSSL_API int wc_PKCS12_PBKDF(byte* output, const byte* passwd, int pLen,
const byte* salt, int sLen, int iterations, const byte* salt, int sLen, int iterations,
int kLen, int hashType, int purpose); int kLen, int typeH, int purpose);
#ifdef __cplusplus #ifdef __cplusplus