diff --git a/daemon/src/sip/sdes_negotiator.cpp b/daemon/src/sip/sdes_negotiator.cpp index a8eed12a7dc671daaef40ff38a78b0e962ab01ab..53dea5e741b9c1bbada5a3b9067e985fc5d53bbd 100644 --- a/daemon/src/sip/sdes_negotiator.cpp +++ b/daemon/src/sip/sdes_negotiator.cpp @@ -91,7 +91,6 @@ std::vector<CryptoAttribute *> SdesNegotiator::parse() // Take each line from the vector // and parse its content - std::vector<CryptoAttribute *> cryptoAttributeVector; for (std::vector<std::string>::iterator iter = remoteAttribute_.begin(); diff --git a/daemon/src/sip/sdes_negotiator.h b/daemon/src/sip/sdes_negotiator.h index 416f940b011eecd97d00e196a44e07cb146e688f..c6d575da1d224ded4fe91c0735b2b84081f6eba1 100644 --- a/daemon/src/sip/sdes_negotiator.h +++ b/daemon/src/sip/sdes_negotiator.h @@ -62,7 +62,7 @@ enum KeyMethod { }; struct CryptoSuiteDefinition { - char * name; + const char *name; int masterKeyLength; int masterSaltLength; int srtpLifetime; @@ -81,9 +81,9 @@ struct CryptoSuiteDefinition { * as defined in RFC4568 (6.2) */ static const CryptoSuiteDefinition CryptoSuites[] = { - { (char*) "AES_CM_128_HMAC_SHA1_80", 128, 112, 48, 31, AESCounterMode, 128, HMACSHA1, 80, 80, 160, 160 }, - { (char*) "AES_CM_128_HMAC_SHA1_32", 128, 112, 48, 31, AESCounterMode, 128, HMACSHA1, 32, 80, 160, 160 }, - { (char*) "F8_128_HMAC_SHA1_80", 128, 112, 48, 31, AESF8Mode, 128, HMACSHA1, 80, 80, 160, 160 } + { "AES_CM_128_HMAC_SHA1_80", 128, 112, 48, 31, AESCounterMode, 128, HMACSHA1, 80, 80, 160, 160 }, + { "AES_CM_128_HMAC_SHA1_32", 128, 112, 48, 31, AESCounterMode, 128, HMACSHA1, 32, 80, 160, 160 }, + { "F8_128_HMAC_SHA1_80", 128, 112, 48, 31, AESF8Mode, 128, HMACSHA1, 80, 80, 160, 160 } };