From fe51a7bb48155b85fda941fb3fa2b98d5170572a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Sun, 5 Feb 2017 12:27:51 +0100 Subject: [PATCH] fix compilation errors when compiling without lime --- coreapi/lime.c | 4 ++-- coreapi/lime.h | 4 ++-- mediastreamer2 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coreapi/lime.c b/coreapi/lime.c index 2fb294f5c..19d0fe1fd 100644 --- a/coreapi/lime.c +++ b/coreapi/lime.c @@ -1050,7 +1050,7 @@ void lime_im_encryption_engine_generate_file_transfer_key_cb(LinphoneImEncryptio bool_t lime_is_available() { return FALSE; } int lime_decryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) { return LIME_NOT_ENABLED;} -int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t **output, char **content_type) { return LIME_NOT_ENABLED;} +int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t **output, char **content_type, uint64_t validityTimeSpan) { return LIME_NOT_ENABLED;} int lime_createMultipartMessage(xmlDocPtr cacheBuffer, const char *content_type, uint8_t *message, uint8_t *peerURI, uint8_t **output) { return LIME_NOT_ENABLED;} int lime_encryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher) {return LIME_NOT_ENABLED;} void lime_freeKeys(limeURIKeys_t *associatedKeys){ @@ -1061,7 +1061,7 @@ int lime_getCachedSndKeysByURI(xmlDocPtr cacheBuffer, limeURIKeys_t *associatedK int lime_encryptMessage(limeKey_t *key, const uint8_t *plainMessage, uint32_t messageLength, uint8_t selfZID[12], uint8_t *encryptedMessage) { return LIME_NOT_ENABLED; } -int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associatedKey, uint8_t role) { +int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associatedKey, uint8_t role, uint64_t validityTimeSpan) { return LIME_NOT_ENABLED; } int lime_getCachedRcvKeyByZid(xmlDocPtr cacheBuffer, limeKey_t *associatedKey) { diff --git a/coreapi/lime.h b/coreapi/lime.h index 80565b64b..7574c53d7 100644 --- a/coreapi/lime.h +++ b/coreapi/lime.h @@ -92,7 +92,7 @@ LINPHONE_PUBLIC int lime_getCachedRcvKeyByZid(xmlDocPtr cacheBuffer, limeKey_t * * @return 0 on success, error code otherwise */ -LINPHONE_PUBLIC int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associatedKey, const uint8_t role, const uint64_t validityTimeSpan); +LINPHONE_PUBLIC int lime_setCachedKey(xmlDocPtr cacheBuffer, limeKey_t *associatedKey, const uint8_t role, uint64_t validityTimeSpan); /** * @brief Free all allocated data in the associated keys structure @@ -188,7 +188,7 @@ LINPHONE_PUBLIC int lime_createMultipartMessage(xmlDocPtr cacheBuffer, const cha * @param[in] validityTimeSpan If not 0, update the tag associated to sender to now+validityTimeSpan (in seconds) * @return 0 on success, error code otherwise */ -LINPHONE_PUBLIC int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t **output, char **content_type, const uint64_t validityTimeSpan); +LINPHONE_PUBLIC int lime_decryptMultipartMessage(xmlDocPtr cacheBuffer, uint8_t *message, uint8_t **output, char **content_type, uint64_t validityTimeSpan); /** * @brief given a readable version of error code generated by Lime functions diff --git a/mediastreamer2 b/mediastreamer2 index e72591fbe..dfcc2be74 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e72591fbe1a93407e3f8c80f370acdf36d952565 +Subproject commit dfcc2be743f6119960d33bbdd51d0dff6501f62d