From aaa2c3c194f45402dc334bed4c77ed52e919d84f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 18 May 2016 16:14:31 +0200 Subject: [PATCH] change bctoolbox_ to bctbx_ --- coreapi/bellesip_sal/sal_impl.c | 2 +- coreapi/friendlist.c | 2 +- coreapi/lime.c | 34 ++++++++++++++++----------------- coreapi/vcard.cc | 2 +- mediastreamer2 | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c index 2bf146d97..90083418d 100644 --- a/coreapi/bellesip_sal/sal_impl.c +++ b/coreapi/bellesip_sal/sal_impl.c @@ -62,7 +62,7 @@ void sal_op_set_privacy_from_message(SalOp* op,belle_sip_message_t* msg) { } static void set_tls_properties(Sal *ctx); -void _belle_sip_log(belle_sip_log_level lev, const char *fmt, va_list args) { +void _belle_sip_log(const char *domain, belle_sip_log_level lev, const char *fmt, va_list args) { int ortp_level; switch(lev) { case BELLE_SIP_LOG_FATAL: diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c index 08d8707c7..2c7fa9d51 100644 --- a/coreapi/friendlist.c +++ b/coreapi/friendlist.c @@ -630,7 +630,7 @@ void linphone_friend_list_update_subscriptions(LinphoneFriendList *list, Linphon char *xml_content = create_resource_list_xml(list); if ((address != NULL) && (xml_content != NULL) && (linphone_friend_list_has_subscribe_inactive(list) == TRUE)) { unsigned char digest[16]; - bctoolbox_md5((unsigned char *)xml_content, strlen(xml_content), digest); + bctbx_md5((unsigned char *)xml_content, strlen(xml_content), digest); if ((list->event != NULL) && (list->content_digest != NULL) && (memcmp(list->content_digest, digest, sizeof(digest)) == 0)) { /* The content has not changed, only refresh the event. */ linphone_event_refresh_subscribe(list->event); diff --git a/coreapi/lime.c b/coreapi/lime.c index 4b85139eb..0ff2fa11f 100644 --- a/coreapi/lime.c +++ b/coreapi/lime.c @@ -430,7 +430,7 @@ static int lime_deriveKey(limeKey_t *key) { inputData[54] = 0x00; /* derive the key in a temp buffer */ - bctoolbox_hmacSha256(key->key, 32, inputData, 55, 32, derivedKey); + bctbx_hmacSha256(key->key, 32, inputData, 55, 32, derivedKey); /* overwrite the old key with the derived one */ memcpy(key->key, derivedKey, 32); @@ -469,7 +469,7 @@ int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageL /* AES-GCM : key is 192 bits long, Init Vector 64 bits. 256 bits key given is AES key||IV */ /* tag is 16 bytes long and is set in the 16 first bytes of the encrypted message */ - return bctoolbox_aes_gcm_encrypt_and_tag(key->key, 24, + return bctbx_aes_gcm_encrypt_and_tag(key->key, 24, plainMessage, messageLength, authenticatedData, 28, key->key+24, 8, /* IV is at the end(last 64 bits) of the given key buffer */ @@ -480,20 +480,20 @@ int lime_encryptMessage(limeKey_t *key, uint8_t *plainMessage, uint32_t messageL } int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) { - bctoolbox_aes_gcm_context_t *gcmContext; + bctbx_aes_gcm_context_t *gcmContext; if (*cryptoContext == NULL) { /* first call to the function, allocate a crypto context and initialise it */ /* key contains 192bits of key || 64 bits of Initialisation Vector, no additional data */ - gcmContext = bctoolbox_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTOOLBOX_GCM_ENCRYPT); + gcmContext = bctbx_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTBX_GCM_ENCRYPT); *cryptoContext = gcmContext; } else { /* this is not the first call, get the context */ - gcmContext = (bctoolbox_aes_gcm_context_t *)*cryptoContext; + gcmContext = (bctbx_aes_gcm_context_t *)*cryptoContext; } if (length != 0) { - bctoolbox_aes_gcm_process_chunk(gcmContext, (const uint8_t *)plain, length, (uint8_t *)cipher); + bctbx_aes_gcm_process_chunk(gcmContext, (const uint8_t *)plain, length, (uint8_t *)cipher); } else { /* lenght is 0, finish the stream, no tag to be generated */ - bctoolbox_aes_gcm_finish(gcmContext, NULL, 0); + bctbx_aes_gcm_finish(gcmContext, NULL, 0); *cryptoContext = NULL; } @@ -501,20 +501,20 @@ int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, ch } int lime_decryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) { - bctoolbox_aes_gcm_context_t *gcmContext; + bctbx_aes_gcm_context_t *gcmContext; if (*cryptoContext == NULL) { /* first call to the function, allocate a crypto context and initialise it */ /* key contains 192bits of key || 64 bits of Initialisation Vector, no additional data */ - gcmContext = bctoolbox_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTOOLBOX_GCM_DECRYPT); + gcmContext = bctbx_aes_gcm_context_new(key, 24, NULL, 0, key+24, 8, BCTBX_GCM_DECRYPT); *cryptoContext = gcmContext; } else { /* this is not the first call, get the context */ - gcmContext = (bctoolbox_aes_gcm_context_t *)*cryptoContext; + gcmContext = (bctbx_aes_gcm_context_t *)*cryptoContext; } if (length != 0) { - bctoolbox_aes_gcm_process_chunk(gcmContext, (const unsigned char *)cipher, length, (unsigned char *)plain); + bctbx_aes_gcm_process_chunk(gcmContext, (const unsigned char *)cipher, length, (unsigned char *)plain); } else { /* lenght is 0, finish the stream */ - bctoolbox_aes_gcm_finish(gcmContext, NULL, 0); + bctbx_aes_gcm_finish(gcmContext, NULL, 0); *cryptoContext = NULL; } @@ -536,7 +536,7 @@ int lime_decryptMessage(limeKey_t *key, uint8_t *encryptedMessage, uint32_t mess /* AES-GCM : key is 192 bits long, Init Vector 64 bits. 256 bits key given is AES key||IV */ /* tag is 16 bytes long and is the 16 first bytes of the encrypted message */ - retval = bctoolbox_aes_gcm_decrypt_and_auth(key->key, 24, /* key is 192 bits long */ + retval = bctbx_aes_gcm_decrypt_and_auth(key->key, 24, /* key is 192 bits long */ encryptedMessage+16, messageLength-16, /* encrypted message first 16 bytes store the authentication tag, then is the actual message */ authenticatedData, 28, /* additionnal data needed for authentication */ key->key+24, 8, /* last 8 bytes of key is the initialisation vector */ @@ -628,9 +628,9 @@ int lime_createMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t xmlNewTextChild(msgNode, NULL, (const xmlChar *)"index", sessionIndexHex); /* convert the cipherText to base 64 */ - bctoolbox_base64_encode(NULL, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */ + bctbx_base64_encode(NULL, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */ encryptedMessageb64 = malloc(b64Size+1); /* allocate a buffer of requested size +1 for NULL termination */ - bctoolbox_base64_encode(encryptedMessageb64, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */ + bctbx_base64_encode(encryptedMessageb64, &b64Size, encryptedMessage, encryptedMessageLength); /* b64Size is 0, so it is set to the requested output buffer size */ encryptedMessageb64[b64Size] = '\0'; /* libxml need a null terminated string */ xmlNewTextChild(msgNode, NULL, (const xmlChar *)"text", (const xmlChar *)encryptedMessageb64); free(encryptedMessage); @@ -732,9 +732,9 @@ int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_ /* convert the cipherText from base 64 */ encryptedMessageb64 = xmlNodeListGetString(cacheBuffer, msgChildrenNode->xmlChildrenNode, 1); - bctoolbox_base64_decode(NULL, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64)); /* encryptedMessageLength is 0, so it will be set to the requested buffer length */ + bctbx_base64_decode(NULL, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64)); /* encryptedMessageLength is 0, so it will be set to the requested buffer length */ encryptedMessage = (uint8_t *)malloc(encryptedMessageLength); - bctoolbox_base64_decode(encryptedMessage, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64)); + bctbx_base64_decode(encryptedMessage, &encryptedMessageLength, encryptedMessageb64, strlen((char *)encryptedMessageb64)); xmlFree(encryptedMessageb64); xmlFree(currentZidHex); diff --git a/coreapi/vcard.cc b/coreapi/vcard.cc index 2623c241f..4dea0875e 100644 --- a/coreapi/vcard.cc +++ b/coreapi/vcard.cc @@ -287,7 +287,7 @@ void linphone_vcard_compute_md5_hash(LinphoneVcard *vCard) { return; } text = linphone_vcard_as_vcard4_string(vCard); - bctoolbox_md5((unsigned char *)text, strlen(text), digest); + bctbx_md5((unsigned char *)text, strlen(text), digest); vCard->md5 = (unsigned char *)ms_malloc(sizeof(digest)); memcpy(vCard->md5, digest, sizeof(digest)); } diff --git a/mediastreamer2 b/mediastreamer2 index b46d2cf1c..ba1083047 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b46d2cf1cb9247a7bd2d57ba312d668981b4eed7 +Subproject commit ba1083047f6ec4e812fb3f6c13facb33ce4ab407