mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-10-30 22:56:22 +00:00
Code Issues Releases Wiki Activity

Use nullptr instead of null

Browse Source
This commit is contained in:
Carles Fernandez 2023-06-07 20:16:13 +02:00
parent 94d1df62c0
commit 274857a1a4
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/system_parameters/gnss_crypto.cc
View File

@ -27,7 +27,7 @@
#include <openssl/pem.h> #include <openssl/pem.h>
#if USE_OPENSSL_3 #if USE_OPENSSL_3
#include <openssl/evp.h> #include <openssl/evp.h>
#define OPENSSL_ENGINE NULL #define OPENSSL_ENGINE nullptr
#else #else
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/sha.h> #include <openssl/sha.h>
@ -196,14 +196,14 @@ std::vector<uint8_t> Gnss_Crypto::computeCMAC_AES(const std::vector<uint8_t>& ke
std::vector<uint8_t> mac(EVP_MAX_MD_SIZE); // CMAC-AES output size std::vector<uint8_t> mac(EVP_MAX_MD_SIZE); // CMAC-AES output size
EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new(); EVP_CIPHER_CTX* ctx = EVP_CIPHER_CTX_new();
EVP_MAC* cmac = EVP_MAC_fetch(NULL, "CMAC-AES", NULL); EVP_MAC* cmac = EVP_MAC_fetch(nullptr, "CMAC-AES", nullptr);
EVP_MAC_CTX* cmacCtx = EVP_MAC_CTX_new(cmac); EVP_MAC_CTX* cmacCtx = EVP_MAC_CTX_new(cmac);
OSSL_PARAM params[4]; OSSL_PARAM params[4];
params[0] = OSSL_PARAM_construct_utf8_string("key", (char*)key.data(), key.size()); params[0] = OSSL_PARAM_construct_utf8_string("key", (char*)key.data(), key.size());
params[1] = OSSL_PARAM_construct_octet_string("iv", NULL, 0); // Set IV to NULL params[1] = OSSL_PARAM_construct_octet_string("iv", nullptr, 0); // Set IV to nullptr
params[2] = OSSL_PARAM_construct_octet_string("aad", NULL, 0); // Set AAD to NULL params[2] = OSSL_PARAM_construct_octet_string("aad", nullptr, 0); // Set AAD to nullptr
params[3] = OSSL_PARAM_construct_end(); params[3] = OSSL_PARAM_construct_end();
// Set AES-128 CMAC cipher and key // Set AES-128 CMAC cipher and key