mirrors/coturn
1
0
Fork 0
mirror of https://github.com/coturn/coturn.git synced 2025-11-05 01:10:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #471 from FeralInteractive/leak-fix

Browse Source 
Fix a memory leak when an SHATYPE isn't supported
This commit is contained in:
Mészáros Mihály 2020-02-12 07:48:33 +01:00 committed by GitHub
commit d35b5e8457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/client/ns_turn_msg.c
View File

@ -154,6 +154,8 @@ int stun_calculate_hmac(const uint8_t *buf, size_t len, const uint8_t *key, size
int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd, hmackey_t key, SHATYPE shatype) int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd, hmackey_t key, SHATYPE shatype)
{ {
int ret;
ERR_clear_error(); ERR_clear_error();
UNUSED_ARG(shatype); UNUSED_ARG(shatype);
@ -188,9 +190,10 @@ int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd
EVP_DigestFinal(ctx,key,&keylen); EVP_DigestFinal(ctx,key,&keylen);
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
#endif #endif
ret = 0;
#else #else
fprintf(stderr,"SHA256 is not supported\n"); fprintf(stderr,"SHA256 is not supported\n");
return -1; ret = -1;
#endif #endif
} else if(shatype == SHATYPE_SHA384) { } else if(shatype == SHATYPE_SHA384) {
#if !defined(OPENSSL_NO_SHA384) && defined(SHA384_DIGEST_LENGTH) #if !defined(OPENSSL_NO_SHA384) && defined(SHA384_DIGEST_LENGTH)
@ -209,9 +212,10 @@ int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd
EVP_DigestFinal(ctx,key,&keylen); EVP_DigestFinal(ctx,key,&keylen);
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
#endif #endif
ret = 0;
#else #else
fprintf(stderr,"SHA384 is not supported\n"); fprintf(stderr,"SHA384 is not supported\n");
return -1; ret = -1;
#endif #endif
} else if(shatype == SHATYPE_SHA512) { } else if(shatype == SHATYPE_SHA512) {
#if !defined(OPENSSL_NO_SHA512) && defined(SHA512_DIGEST_LENGTH) #if !defined(OPENSSL_NO_SHA512) && defined(SHA512_DIGEST_LENGTH)
@ -230,20 +234,22 @@ int stun_produce_integrity_key_str(uint8_t *uname, uint8_t *realm, uint8_t *upwd
EVP_DigestFinal(ctx,key,&keylen); EVP_DigestFinal(ctx,key,&keylen);
EVP_MD_CTX_free(ctx); EVP_MD_CTX_free(ctx);
#endif #endif
ret = 0;
#else #else
fprintf(stderr,"SHA512 is not supported\n"); fprintf(stderr,"SHA512 is not supported\n");
return -1; ret = -1;
#endif #endif
} else { } else {
MD5_CTX ctx; MD5_CTX ctx;
MD5_Init(&ctx); MD5_Init(&ctx);
MD5_Update(&ctx,str,strl); MD5_Update(&ctx,str,strl);
MD5_Final(key,&ctx); MD5_Final(key,&ctx);
ret = 0;
} }
free(str); free(str);
return 0; return ret;
} }
#define PWD_SALT_SIZE (8) #define PWD_SALT_SIZE (8)