|
@@ -381,7 +381,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
byte* key;
|
|
|
#else
|
|
|
- byte key[MAX_KEY_SIZE];
|
|
|
+ byte key[PKCS_MAX_KEY_SIZE];
|
|
|
#endif
|
|
|
|
|
|
(void)input;
|
|
@@ -469,7 +469,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
}
|
|
|
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
- key = (byte*)XMALLOC(MAX_KEY_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
+ key = (byte*)XMALLOC(PKCS_MAX_KEY_SIZE, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
if (key == NULL)
|
|
|
return MEMORY_E;
|
|
|
#endif
|
|
@@ -494,7 +494,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
byte unicodePasswd[MAX_UNICODE_SZ];
|
|
|
|
|
|
if ( (passwordSz * 2 + 2) > (int)sizeof(unicodePasswd)) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -519,7 +519,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
}
|
|
|
#endif /* HAVE_PKCS12 */
|
|
|
default:
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -528,7 +528,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
} /* switch (version) */
|
|
|
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -554,7 +554,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
ret = wc_Des_SetKey(&des, key, desIv, DES_DECRYPTION);
|
|
|
}
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -582,7 +582,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
|
|
|
ret = wc_Des3Init(&des, NULL, INVALID_DEVID);
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -595,7 +595,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
ret = wc_Des3_SetKey(&des, key, desIv, DES_DECRYPTION);
|
|
|
}
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -608,7 +608,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
ret = wc_Des3_CbcDecrypt(&des, input, input, length);
|
|
|
}
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -669,7 +669,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
XFREE(aes, NULL, DYNAMIC_TYPE_AES);
|
|
|
#endif
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -692,7 +692,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
ret = wc_Rc2CbcDecrypt(&rc2, input, input, length);
|
|
|
}
|
|
|
if (ret != 0) {
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -704,7 +704,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
#endif
|
|
|
|
|
|
default:
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|
|
@@ -712,7 +712,7 @@ int wc_CryptKey(const char* password, int passwordSz, byte* salt,
|
|
|
return ALGO_ID_E;
|
|
|
}
|
|
|
|
|
|
- ForceZero(key, MAX_KEY_SIZE);
|
|
|
+ ForceZero(key, PKCS_MAX_KEY_SIZE);
|
|
|
#ifdef WOLFSSL_SMALL_STACK
|
|
|
XFREE(key, NULL, DYNAMIC_TYPE_TMP_BUFFER);
|
|
|
#endif
|