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

(Auto)update libjingle 63293120-> 63352036

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5720 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-03-18 21:39:10 +00:00
parent 08e2dd80a3
commit 8b61011b6f
2 changed files with 72 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
talk/session/media/externalhmac.cc
View File

@ -39,45 +39,53 @@
#include "talk/base/logging.h" #include "talk/base/logging.h"
// The debug module for authentiation
debug_module_t mod_external_hmac = {
0, // Debugging is off by default
(char*)"external-hmac-sha-1" // Printable name for module
};
extern auth_type_t external_hmac;
// Begin test case 0 */ // Begin test case 0 */
uint8_t static const uint8_t kExternalHmacTestCase0Key[20] = {
external_hmac_test_case_0_key[20] = {
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
0x0b, 0x0b, 0x0b, 0x0b 0x0b, 0x0b, 0x0b, 0x0b
}; };
uint8_t static const uint8_t kExternalHmacTestCase0Data[8] = {
external_hmac_test_case_0_data[8] = {
0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65 // "Hi There" 0x48, 0x69, 0x20, 0x54, 0x68, 0x65, 0x72, 0x65 // "Hi There"
}; };
uint8_t static const uint8_t kExternalHmacFakeTag[10] = {
external_hmac_fake_tag[10] = {
0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd 0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd, 0xba, 0xdd
}; };
auth_test_case_t static const auth_test_case_t kExternalHmacTestCase0 = {
external_hmac_test_case_0 = { 20, // Octets in key
20, // Octets in key const_cast<uint8_t*>(kExternalHmacTestCase0Key), // Key
external_hmac_test_case_0_key, // Key 8, // Octets in data
8, // Octets in data const_cast<uint8_t*>(kExternalHmacTestCase0Data), // Data
external_hmac_test_case_0_data, // Data 10, // Octets in tag
10, // Octets in tag const_cast<uint8_t*>(kExternalHmacFakeTag), // Tag
external_hmac_fake_tag, // Tag NULL // Pointer to next
NULL // Pointer to next testcase // testcase
}; };
err_status_t static const char kExternalHmacDescription[] =
external_hmac_alloc(auth_t** a, int key_len, int out_len) { "external hmac sha-1 authentication";
// auth_type_t external_hmac is the hmac metaobject
static const auth_type_t external_hmac = {
external_hmac_alloc,
external_hmac_dealloc,
(auth_init_func) external_hmac_init,
(auth_compute_func) external_hmac_compute,
(auth_update_func) external_hmac_update,
(auth_start_func) external_hmac_start,
const_cast<char*>(kExternalHmacDescription),
0, // Instance count.
const_cast<auth_test_case_t*>(&kExternalHmacTestCase0),
NULL, // No debugging module.
EXTERNAL_HMAC_SHA1
};
err_status_t external_hmac_alloc(auth_t** a, int key_len, int out_len) {
uint8_t* pointer; uint8_t* pointer;
// Check key length - note that we don't support keys larger // Check key length - note that we don't support keys larger
@ -90,42 +98,37 @@ external_hmac_alloc(auth_t** a, int key_len, int out_len) {
return err_status_bad_param; return err_status_bad_param;
// Allocate memory for auth and hmac_ctx_t structures. // Allocate memory for auth and hmac_ctx_t structures.
pointer = reinterpret_cast<uint8_t*>( pointer = new uint8_t[(sizeof(external_hmac_ctx_t) + sizeof(auth_t))];
malloc(sizeof(external_hmac_ctx_t) + sizeof(auth_t)));
if (pointer == NULL) if (pointer == NULL)
return err_status_alloc_fail; return err_status_alloc_fail;
// Set pointers // Set pointers
*a = (auth_t *)pointer; *a = (auth_t *)pointer;
(*a)->type = &external_hmac; // |external_hmac| is const and libsrtp expects |type| to be non-const.
// const conversion is required. |external_hmac| is constant because we don't
// want to increase global count in Chrome.
(*a)->type = const_cast<auth_type_t*>(&external_hmac);
(*a)->state = pointer + sizeof(auth_t); (*a)->state = pointer + sizeof(auth_t);
(*a)->out_len = out_len; (*a)->out_len = out_len;
(*a)->key_len = key_len; (*a)->key_len = key_len;
(*a)->prefix_len = 0; (*a)->prefix_len = 0;
// Increment global count of all hmac uses.
external_hmac.ref_count++;
return err_status_ok; return err_status_ok;
} }
err_status_t err_status_t external_hmac_dealloc(auth_t* a) {
external_hmac_dealloc(auth_t* a) {
// Zeroize entire state // Zeroize entire state
memset((uint8_t *)a, 0, sizeof(external_hmac_ctx_t) + sizeof(auth_t)); memset((uint8_t *)a, 0, sizeof(external_hmac_ctx_t) + sizeof(auth_t));
// Free memory // Free memory
free(a); delete[] a;
// Decrement global count of all hmac uses.
external_hmac.ref_count--;
return err_status_ok; return err_status_ok;
} }
err_status_t err_status_t external_hmac_init(external_hmac_ctx_t* state,
external_hmac_init(external_hmac_ctx_t* state, const uint8_t* key,
const uint8_t* key, int key_len) { int key_len) {
if (key_len > HMAC_KEY_LENGTH) if (key_len > HMAC_KEY_LENGTH)
return err_status_bad_param; return err_status_bad_param;
@ -135,47 +138,30 @@ external_hmac_init(external_hmac_ctx_t* state,
return err_status_ok; return err_status_ok;
} }
err_status_t err_status_t external_hmac_start(external_hmac_ctx_t* state) {
external_hmac_start(external_hmac_ctx_t* state) {
return err_status_ok; return err_status_ok;
} }
err_status_t err_status_t external_hmac_update(external_hmac_ctx_t* state,
external_hmac_update(external_hmac_ctx_t* state, const uint8_t* message, const uint8_t* message,
int msg_octets) { int msg_octets) {
return err_status_ok; return err_status_ok;
} }
err_status_t err_status_t external_hmac_compute(external_hmac_ctx_t* state,
external_hmac_compute(external_hmac_ctx_t* state, const void* message, const void* message,
int msg_octets, int tag_len, uint8_t* result) { int msg_octets,
memcpy(result, external_hmac_fake_tag, tag_len); int tag_len,
uint8_t* result) {
memcpy(result, kExternalHmacFakeTag, tag_len);
return err_status_ok; return err_status_ok;
} }
char external_hmac_description[] = "external hmac sha-1 authentication"; err_status_t external_crypto_init() {
// |external_hmac| is const. const_cast is required as libsrtp expects
// auth_type_t external_hmac is the hmac metaobject // non-const.
auth_type_t
external_hmac = {
(auth_alloc_func) external_hmac_alloc,
(auth_dealloc_func) external_hmac_dealloc,
(auth_init_func) external_hmac_init,
(auth_compute_func) external_hmac_compute,
(auth_update_func) external_hmac_update,
(auth_start_func) external_hmac_start,
(char *) external_hmac_description,
(int) 0, /* instance count */
(auth_test_case_t *) &external_hmac_test_case_0,
(debug_module_t *) &mod_external_hmac,
(auth_type_id_t) EXTERNAL_HMAC_SHA1
};
err_status_t
external_crypto_init() {
err_status_t status = crypto_kernel_replace_auth_type( err_status_t status = crypto_kernel_replace_auth_type(
&external_hmac, EXTERNAL_HMAC_SHA1); const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1);
if (status) { if (status) {
LOG(LS_ERROR) << "Error in replacing default auth module, error: " LOG(LS_ERROR) << "Error in replacing default auth module, error: "
<< status; << status;

32
talk/session/media/externalhmac.h
View File

@ -64,29 +64,27 @@ typedef struct {
int key_length; int key_length;
} external_hmac_ctx_t; } external_hmac_ctx_t;
err_status_t err_status_t external_hmac_alloc(auth_t** a, int key_len, int out_len);
external_hmac_alloc(auth_t** a, int key_len, int out_len);
err_status_t err_status_t external_hmac_dealloc(auth_t* a);
external_hmac_dealloc(auth_t* a);
err_status_t err_status_t external_hmac_init(external_hmac_ctx_t* state,
external_hmac_init(external_hmac_ctx_t* state, const uint8_t* key,
const uint8_t* key, int key_len); int key_len);
err_status_t err_status_t external_hmac_start(external_hmac_ctx_t* state);
external_hmac_start(external_hmac_ctx_t* state);
err_status_t err_status_t external_hmac_update(external_hmac_ctx_t* state,
external_hmac_update(external_hmac_ctx_t* state, const uint8_t* message, const uint8_t* message,
int msg_octets); int msg_octets);
err_status_t err_status_t external_hmac_compute(external_hmac_ctx_t* state,
external_hmac_compute(external_hmac_ctx_t* state, const void* message, const void* message,
int msg_octets, int tag_len, uint8_t* result); int msg_octets,
int tag_len,
uint8_t* result);
err_status_t err_status_t external_crypto_init();
external_crypto_init();
#endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) #endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
#endif // TALK_SESSION_MEDIA_EXTERNAL_HMAC_H_ #endif // TALK_SESSION_MEDIA_EXTERNAL_HMAC_H_