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

return type compatibility AES_set_encrypt/decrypt_key

Browse Source
This commit is contained in:
Takashi Kojo
2017-04-02 14:02:44 +09:00
committed by Jacob Barthelmeh
parent 31fe154d1c
commit f5913d875f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@ -19567,7 +19567,7 @@ void wolfSSL_AES_decrypt(const unsigned char* input, unsigned char* output,
* bits size of key in bits * bits size of key in bits
* aes AES structure to initialize * aes AES structure to initialize
*/ */
void wolfSSL_AES_set_encrypt_key(const unsigned char *key, const int bits, int wolfSSL_AES_set_encrypt_key(const unsigned char *key, const int bits,
AES_KEY *aes) AES_KEY *aes)
{ {
typedef char aes_test[sizeof(AES_KEY) >= sizeof(Aes) ? 1 : -1]; typedef char aes_test[sizeof(AES_KEY) >= sizeof(Aes) ? 1 : -1];
@ -19577,13 +19577,15 @@ void wolfSSL_AES_set_encrypt_key(const unsigned char *key, const int bits,
if (key == NULL || aes == NULL) { if (key == NULL || aes == NULL) {
WOLFSSL_MSG("Null argument passed in"); WOLFSSL_MSG("Null argument passed in");
return; return -1;
} }
XMEMSET(aes, 0, sizeof(AES_KEY)); XMEMSET(aes, 0, sizeof(AES_KEY));
if (wc_AesSetKey((Aes*)aes, key, ((bits)/8), NULL, AES_ENCRYPTION) != 0) { if (wc_AesSetKey((Aes*)aes, key, ((bits)/8), NULL, AES_ENCRYPTION) != 0) {
WOLFSSL_MSG("Error in setting AES key"); WOLFSSL_MSG("Error in setting AES key");
return -1;
} }
return 0;
} }
@ -19593,7 +19595,7 @@ void wolfSSL_AES_set_encrypt_key(const unsigned char *key, const int bits,
* bits size of key in bits * bits size of key in bits
* aes AES structure to initialize * aes AES structure to initialize
*/ */
void wolfSSL_AES_set_decrypt_key(const unsigned char *key, const int bits, int wolfSSL_AES_set_decrypt_key(const unsigned char *key, const int bits,
AES_KEY *aes) AES_KEY *aes)
{ {
typedef char aes_test[sizeof(AES_KEY) >= sizeof(Aes) ? 1 : -1]; typedef char aes_test[sizeof(AES_KEY) >= sizeof(Aes) ? 1 : -1];
@ -19603,13 +19605,15 @@ void wolfSSL_AES_set_decrypt_key(const unsigned char *key, const int bits,
if (key == NULL || aes == NULL) { if (key == NULL || aes == NULL) {
WOLFSSL_MSG("Null argument passed in"); WOLFSSL_MSG("Null argument passed in");
return; return -1;
} }
XMEMSET(aes, 0, sizeof(AES_KEY)); XMEMSET(aes, 0, sizeof(AES_KEY));
if (wc_AesSetKey((Aes*)aes, key, ((bits)/8), NULL, AES_DECRYPTION) != 0) { if (wc_AesSetKey((Aes*)aes, key, ((bits)/8), NULL, AES_DECRYPTION) != 0) {
WOLFSSL_MSG("Error in setting AES key"); WOLFSSL_MSG("Error in setting AES key");
return -1;
} }
return 0;
} }

4
wolfssl/openssl/aes.h
View File

@ -54,9 +54,9 @@ typedef struct WOLFSSL_AES_KEY {
} WOLFSSL_AES_KEY; } WOLFSSL_AES_KEY;
typedef WOLFSSL_AES_KEY AES_KEY; typedef WOLFSSL_AES_KEY AES_KEY;
WOLFSSL_API void wolfSSL_AES_set_encrypt_key WOLFSSL_API int wolfSSL_AES_set_encrypt_key
(const unsigned char *, const int bits, AES_KEY *); (const unsigned char *, const int bits, AES_KEY *);
WOLFSSL_API void wolfSSL_AES_set_decrypt_key WOLFSSL_API int wolfSSL_AES_set_decrypt_key
(const unsigned char *, const int bits, AES_KEY *); (const unsigned char *, const int bits, AES_KEY *);
WOLFSSL_API void wolfSSL_AES_cbc_encrypt WOLFSSL_API void wolfSSL_AES_cbc_encrypt
(const unsigned char *in, unsigned char* out, size_t len, (const unsigned char *in, unsigned char* out, size_t len,