p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!31651 Fix code warnings 

Merge pull request !31651 from jxlang910/master
This commit is contained in:
i-robot 2022-03-22 03:24:13 +00:00 committed by Gitee
parent d9930ac399 ebfe9e8c54
commit 6234ff6700
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/fl/armour/secure_protocol/encrypt.cc
View File

@ -118,7 +118,7 @@ int AESEncrypt::evp_aes_encrypt(const uint8_t *data, const int len, const uint8_
EVP_CIPHER_CTX_free(ctx);
return -1;
}
EVP_CIPHER_CTX_set_padding(ctx, EVP_PADDING_PKCS7);
(void)EVP_CIPHER_CTX_set_padding(ctx, EVP_PADDING_PKCS7);
} else if (aes_mode_ == AES_CTR) {
switch (priv_key_len_) {
case KEY_LENGTH_16:

4
mindspore/ccsrc/fl/armour/secure_protocol/encrypt.h
View File

@ -33,9 +33,9 @@ enum AES_MODE {
AES_CBC = 0,
AES_CTR = 1,
};
class SymmetricEncrypt : Encrypt {};
class SymmetricEncrypt : public Encrypt {};
class AESEncrypt : SymmetricEncrypt {
class AESEncrypt : public SymmetricEncrypt {
public:
AESEncrypt(const uint8_t *key, int key_len, const uint8_t *ivec, int ivec_len, AES_MODE mode);
~AESEncrypt();

5
mindspore/ccsrc/fl/armour/secure_protocol/key_agreement.cc
View File

@ -15,6 +15,7 @@
*/
#include "fl/armour/secure_protocol/key_agreement.h"
#include "fl/server/common.h"
namespace mindspore {
namespace armour {
@ -128,8 +129,8 @@ int PrivateKey::Exchange(PublicKey *peerPublicKey, int key_len, const unsigned c
EVP_PKEY_CTX_free(ctx);
return -1;
}
if (!PKCS5_PBKDF2_HMAC(reinterpret_cast<char *>(secret), len, salt, salt_len, ITERATION, EVP_sha256(), key_len,
exchangeKey)) {
if (!PKCS5_PBKDF2_HMAC(reinterpret_cast<char *>(secret), SizeToInt(len), salt, salt_len, ITERATION, EVP_sha256(),
key_len, exchangeKey)) {
OPENSSL_free(secret);
EVP_PKEY_CTX_free(ctx);
return -1;

2
mindspore/ccsrc/fl/armour/secure_protocol/masking.cc
View File

@ -52,7 +52,7 @@ int Masking::GetMasking(std::vector<float> *noise, int noise_len, const uint8_t
for (int i = 0; i < noise_len; i++) {
auto value = *(reinterpret_cast<int32_t *>(encrypt_data.data()) + i);
noise->emplace_back(static_cast<float>(value) / INT32_MAX);
(void)noise->emplace_back(static_cast<float>(value) / INT32_MAX);
}
return 0;
}