From 2fc214d5b59aa60daa729fc14871f3671f2827f6 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Fri, 24 Apr 2015 04:49:43 +0000 Subject: [PATCH] compilation warning fixed --- src/client/ns_turn_msg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/ns_turn_msg.c b/src/client/ns_turn_msg.c index 251352ae..fbc0e0a4 100644 --- a/src/client/ns_turn_msg.c +++ b/src/client/ns_turn_msg.c @@ -2090,7 +2090,7 @@ int convert_oauth_key_data(const oauth_key_data *oakd0, oauth_key *key, char *er key->as_rs_alg = A256GCM; key->auth_key_size = 0; key->auth_key[0] = 0; - } else if(oakd->as_rs_alg[0]) + } else #endif { if(err_msg) { @@ -2100,6 +2100,8 @@ int convert_oauth_key_data(const oauth_key_data *oakd0, oauth_key *key, char *er return -1; } +#if !defined(TURN_NO_GCM) + key->auth_key_size = calculate_auth_key_length(key->as_rs_alg); if(key->auth_key_size) { if(calculate_key(key->ikm_key,key->ikm_key_size,key->auth_key,key->auth_key_size)<0) { @@ -2111,6 +2113,7 @@ int convert_oauth_key_data(const oauth_key_data *oakd0, oauth_key *key, char *er if(calculate_key(key->ikm_key,key->ikm_key_size,key->as_rs_key,key->as_rs_key_size)<0) { return -1; } +#endif } return 0;