mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change initialization of EVP_CIPHER_CTX to use API function instead of trying to calloc().

Browse Source 
Fix some warnings noted from build output.
This commit is contained in:
Brent Collins 2017-04-10 13:06:04 -05:00 committed by Armin Novak
parent 497ba442be
commit 2dddae738f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/crypto/cipher.c
View File

@ -51,7 +51,7 @@ WINPR_RC4_CTX* winpr_RC4_New_Internal(const BYTE* key, size_t keylen, BOOL overr
return NULL; return NULL;
#if defined(WITH_OPENSSL) #if defined(WITH_OPENSSL)
if (!(ctx = (WINPR_RC4_CTX*) calloc(1, sizeof(EVP_CIPHER_CTX)))) if (!(ctx = EVP_CIPHER_CTX_new()))
return NULL; return NULL;
EVP_CIPHER* evp = EVP_rc4(); EVP_CIPHER* evp = EVP_rc4();
@ -82,12 +82,12 @@ WINPR_RC4_CTX* winpr_RC4_New_Internal(const BYTE* key, size_t keylen, BOOL overr
WINPR_RC4_CTX* winpr_RC4_New_Allow_FIPS(const BYTE* key, size_t keylen) WINPR_RC4_CTX* winpr_RC4_New_Allow_FIPS(const BYTE* key, size_t keylen)
{ {
winpr_RC4_New_Internal(key, keylen, TRUE); return winpr_RC4_New_Internal(key, keylen, TRUE);
} }
WINPR_RC4_CTX* winpr_RC4_New(const BYTE* key, size_t keylen) WINPR_RC4_CTX* winpr_RC4_New(const BYTE* key, size_t keylen)
{ {
winpr_RC4_New_Internal(key, keylen, FALSE); return winpr_RC4_New_Internal(key, keylen, FALSE);
} }
BOOL winpr_RC4_Update(WINPR_RC4_CTX* ctx, size_t length, const BYTE* input, BYTE* output) BOOL winpr_RC4_Update(WINPR_RC4_CTX* ctx, size_t length, const BYTE* input, BYTE* output)
@ -110,7 +110,7 @@ void winpr_RC4_Free(WINPR_RC4_CTX* ctx)
return; return;
#if defined(WITH_OPENSSL) #if defined(WITH_OPENSSL)
EVP_CIPHER_CTX_cleanup((EVP_CIPHER_CTX *) ctx); EVP_CIPHER_CTX_free((EVP_CIPHER_CTX *) ctx);
#elif defined(WITH_MBEDTLS) && defined(MBEDTLS_ARC4_C) #elif defined(WITH_MBEDTLS) && defined(MBEDTLS_ARC4_C)
mbedtls_arc4_free((mbedtls_arc4_context*) ctx); mbedtls_arc4_free((mbedtls_arc4_context*) ctx);
free(ctx); free(ctx);

6
winpr/libwinpr/crypto/hash.c
View File

@ -336,7 +336,7 @@ WINPR_DIGEST_CTX* winpr_Digest_New(void)
} }
#if defined(WITH_OPENSSL) #if defined(WITH_OPENSSL)
BOOL winpr_Digest_Init_Internal(WINPR_DIGEST_CTX* ctx, WINPR_MD_TYPE md, EVP_MD* evp) BOOL winpr_Digest_Init_Internal(WINPR_DIGEST_CTX* ctx, WINPR_MD_TYPE md, const EVP_MD* evp)
{ {
EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx; EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
@ -378,7 +378,7 @@ BOOL winpr_Digest_Init_MD5_Allow_FIPS(WINPR_DIGEST_CTX* ctx)
{ {
#if defined(WITH_OPENSSL) #if defined(WITH_OPENSSL)
EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx; EVP_MD_CTX* mdctx = (EVP_MD_CTX*) ctx;
EVP_MD* evp = EVP_md5(); const EVP_MD* evp = EVP_md5();
EVP_MD_CTX_set_flags(mdctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); EVP_MD_CTX_set_flags(mdctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
winpr_Digest_Init_Internal(ctx, WINPR_MD_MD5, evp); winpr_Digest_Init_Internal(ctx, WINPR_MD_MD5, evp);
#elif defined(WITH_MBEDTLS) #elif defined(WITH_MBEDTLS)
@ -389,7 +389,7 @@ BOOL winpr_Digest_Init_MD5_Allow_FIPS(WINPR_DIGEST_CTX* ctx)
BOOL winpr_Digest_Init(WINPR_DIGEST_CTX* ctx, WINPR_MD_TYPE md) BOOL winpr_Digest_Init(WINPR_DIGEST_CTX* ctx, WINPR_MD_TYPE md)
{ {
#if defined(WITH_OPENSSL) #if defined(WITH_OPENSSL)
EVP_MD* evp = winpr_openssl_get_evp_md(md); const EVP_MD* evp = winpr_openssl_get_evp_md(md);
winpr_Digest_Init_Internal(ctx, md, evp); winpr_Digest_Init_Internal(ctx, md, evp);
#else #else
winpr_Digest_Init_Internal(ctx, md); winpr_Digest_Init_Internal(ctx, md);