From 8fb1bc18bad99b2de79783848b41d07da01315a7 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 01 九月 2021 17:04:05 +0800 Subject: [PATCH] 采用纯oc sdk解决版本适配问题；解决呼叫不能截屏问题 --- Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/bctoolbox.framework/Headers/crypto.h | 54 ++++++++++++++++++++++++------------------------------ 1 files changed, 24 insertions(+), 30 deletions(-) diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/bctoolbox.framework/Headers/crypto.h b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/bctoolbox.framework/Headers/crypto.h index 4b8374a..6945cf4 100755 --- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/bctoolbox.framework/Headers/crypto.h +++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/bctoolbox.framework/Headers/crypto.h @@ -1,21 +1,21 @@ /* - * Copyright (c) 2016-2020 Belledonne Communications SARL. - * - * This file is part of bctoolbox. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ +crypto.h +Copyright (C) 2017 Belledonne Communications SARL + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ #ifndef BCTBX_CRYPTO_H #define BCTBX_CRYPTO_H @@ -1047,8 +1047,8 @@ * @Brief Conclude a AES-GCM encryption stream, generate tag if requested, free resources * * @param[in/out] context a context already initialized using bctbx_aes_gcm_context_new - * @param[out] tag a buffer to hold the authentication tag. Can be NULL if tagLength is 0 - * @param[in] tagLength length of requested authentication tag, max 16 + * @param[out] tag a buffer to hold the authentication tag. Can be NULL if tagLength is 0 + * @param[in] tagLength length of reqested authentication tag, max 16 * * @return 0 on success, crypto library error code otherwise */ @@ -1127,28 +1127,22 @@ /** * @brief encrypt the file in input buffer for linphone encrypted file transfer * - * This function must be called with NULL in the plain text to conclude the encryption. - * At this last call, if a cipher buffer is provided with non 0 length, it will get an authentication tag of the requested size (max 16) - * - * @param[in/out] cryptoContext a context already initialized using bctbx_aes_gcm_context_new (created if NULL) + * @param[in/out] cryptoContext a context already initialized using bctbx_aes_gcm_context_new * @param[in] key encryption key * @param[in] length buffer size * @param[in] plain buffer holding the input data - * @param[out] cipher buffer to store the output data (cipher or authentication tag) + * @param[out] cipher buffer to store the output data */ BCTBX_PUBLIC int bctbx_aes_gcm_encryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher); /** * @brief decrypt the file in input buffer for linphone encrypted file transfer * - * This function must be called with NULL in the cipher text to conclude the encryption. - * At this last call, if a plain buffer is provided with non 0 length, it will get the authentication tag of length bytes (max 16) - * * @param[in/out] cryptoContext a context already initialized using bctbx_aes_gcm_context_new * @param[in] key encryption key - * @param[in] length input buffer size - * @param[out] plain buffer holding the output data (plain text or tag) - * @param[in] cipher buffer to store the input data. WARNING: size must be a multiple of 16 bytes + * @param[in] length buffer size + * @param[out] plain buffer holding the output data + * @param[int] cipher buffer to store the input data */ BCTBX_PUBLIC int bctbx_aes_gcm_decryptFile(void **cryptoContext, unsigned char *key, size_t length, char *plain, char *cipher); -- Gitblit v1.8.0