generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added buffer length when calling encrypt(). Write the extra two bytes.

Browse Source 
BUG=934
TEST=Run VoE Autotest Encryption with Valgrind.
Review URL: https://webrtc-codereview.appspot.com/930004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2995 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@webrtc.org 2012-10-25 13:58:02 +00:00
parent 8dde197788
commit 512535097e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/voice_engine/channel.cc
View File

@ -187,6 +187,8 @@ Channel::SendPacket(int channel, const void *data, int len)
// Allocate memory for encryption buffer one time only
_encryptionRTPBufferPtr =
new WebRtc_UWord8[kVoiceEngineMaxIpPacketSizeBytes];
memset(_encryptionRTPBufferPtr, 0,
kVoiceEngineMaxIpPacketSizeBytes);
}
// Perform encryption (SRTP or external)

6
webrtc/voice_engine/test/auto_test/standard/encryption_test.cc
View File

@ -28,6 +28,8 @@ void BasicBitInverseEncryption::encrypt(int, unsigned char* in_data,
int i;
for (i = 0; i < bytes_in; i++)
out_data[i] = ~in_data[i];
out_data[bytes_in] = 0;
out_data[bytes_in + 1] = 0;
*bytes_out = bytes_in + 2;
}
@ -46,6 +48,8 @@ void BasicBitInverseEncryption::encrypt_rtcp(int, unsigned char* in_data,
int i;
for (i = 0; i < bytes_in; i++)
out_data[i] = ~in_data[i];
out_data[bytes_in] = 0;
out_data[bytes_in + 1] = 0;
*bytes_out = bytes_in + 2;
}
@ -55,6 +59,8 @@ void BasicBitInverseEncryption::decrypt_rtcp(int, unsigned char* in_data,
int i;
for (i = 0; i < bytes_in; i++)
out_data[i] = ~in_data[i];
out_data[bytes_in] = 0;
out_data[bytes_in + 1] = 0;
*bytes_out = bytes_in + 2;
}