From 274857a1a4e45c580ca5e6ae54c53b0f9e9b9b19 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 7 Jun 2023 20:16:13 +0200 Subject: [PATCH] Use nullptr instead of null --- src/core/system_parameters/gnss_crypto.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/system_parameters/gnss_crypto.cc b/src/core/system_parameters/gnss_crypto.cc index 0faa6d096..89fdc9e01 100644 --- a/src/core/system_parameters/gnss_crypto.cc +++ b/src/core/system_parameters/gnss_crypto.cc @@ -27,7 +27,7 @@ #include #if USE_OPENSSL_3 #include -#define OPENSSL_ENGINE NULL +#define OPENSSL_ENGINE nullptr #else #include #include @@ -196,14 +196,14 @@ std::vector Gnss_Crypto::computeCMAC_AES(const std::vector& ke std::vector mac(EVP_MAX_MD_SIZE); // CMAC-AES output size 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); OSSL_PARAM params[4]; 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[2] = OSSL_PARAM_construct_octet_string("aad", NULL, 0); // Set AAD to NULL + params[1] = OSSL_PARAM_construct_octet_string("iv", nullptr, 0); // Set IV to nullptr + params[2] = OSSL_PARAM_construct_octet_string("aad", nullptr, 0); // Set AAD to nullptr params[3] = OSSL_PARAM_construct_end(); // Set AES-128 CMAC cipher and key