master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

old openssl lib fixes

Browse Source
This commit is contained in:
mom040267 2014-09-21 06:12:15 +00:00
parent 32b1b98e1a
commit 5c66dd79a2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -584,7 +584,7 @@ SYSTEM=`uname`
if [ "${SYSTEM}" = "SunOS" ] ; then
# Solaris ? is this you ?!
OSCFLAGS="${OSCFLAGS} -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -DNO_GETDOMAINNAME"
OSCFLAGS="${OSCFLAGS} -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -DTURN_NO_GETDOMAINNAME"
fi
#########################

2
src/apps/relay/mainrelay.c
View File

@ -1728,7 +1728,7 @@ static void init_oauth_server_name(void) {
static void init_domain(void)
{
#if !defined(NO_GETDOMAINNAME)
#if !defined(TURN_NO_GETDOMAINNAME)
getdomainname(turn_params.domain,sizeof(turn_params.domain)-1);
#endif
}

16
src/client/ns_turn_msg.c
View File

@ -116,14 +116,16 @@ int stun_calculate_hmac(const u08bits *buf, size_t len, const u08bits *key, size
ERR_clear_error();
UNUSED_ARG(shatype);
#if !defined(OPENSSL_NO_SHA256) && defined(SSL_TXT_SHA256)
if(shatype == SHATYPE_SHA256) {
#if !defined(OPENSSL_NO_SHA256) && defined(SSL_TXT_SHA256)
if (!HMAC(EVP_sha256(), key, keylen, buf, len, hmac, hmac_len)) {
return -1;
}
} else
#else
fprintf(stderr,"SHA256 is not supported\n");
return -1;
#endif
} else
if (!HMAC(EVP_sha1(), key, keylen, buf, len, hmac, hmac_len)) {
return -1;
}
@ -150,17 +152,19 @@ int stun_produce_integrity_key_str(u08bits *uname, u08bits *realm, u08bits *upwd
strncpy((s08bits*)str+ulen+1+rlen+1,(s08bits*)upwd,sz-ulen-1-rlen-1);
str[strl]=0;
#if !defined(OPENSSL_NO_SHA256) && defined(SSL_TXT_SHA256)
if(shatype == SHATYPE_SHA256) {
#if !defined(OPENSSL_NO_SHA256) && defined(SSL_TXT_SHA256)
unsigned int keylen = 0;
EVP_MD_CTX ctx;
EVP_DigestInit(&ctx,EVP_sha256());
EVP_DigestUpdate(&ctx,str,strl);
EVP_DigestFinal(&ctx,key,&keylen);
EVP_MD_CTX_cleanup(&ctx);
} else
#else
fprintf(stderr,"SHA256 is not supported\n");
return -1;
#endif
{
} else {
MD5_CTX ctx;
MD5_Init(&ctx);
MD5_Update(&ctx,str,strl);