Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: I41cd58617d6df6de7942a541fb6dc9519c70bef0
Merged-In: I41cd58617d6df6de7942a541fb6dc9519c70bef0
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp
index bb0356b..684f69c 100644
--- a/keystore-engine/android_engine.cpp
+++ b/keystore-engine/android_engine.cpp
@@ -59,7 +59,7 @@
long /* argl */,
void* /* argp */) {
char *key_id = reinterpret_cast<char *>(*from_d);
- if (key_id != NULL) {
+ if (key_id != nullptr) {
*from_d = strdup(key_id);
}
return 1;
@@ -95,12 +95,12 @@
ensure_keystore_engine();
const char *key_id = rsa_get_key_id(rsa);
- if (key_id == NULL) {
+ if (key_id == nullptr) {
ALOGE("key had no key_id!");
return 0;
}
- uint8_t* reply = NULL;
+ uint8_t* reply = nullptr;
size_t reply_len;
int32_t ret = g_keystore_backend->sign(key_id, in, len, &reply, &reply_len);
if (ret < 0) {
@@ -109,7 +109,7 @@
} else if (ret != 0) {
ALOGW("Error during sign from keystore: %d", ret);
return 0;
- } else if (reply_len == 0 || reply == NULL) {
+ } else if (reply_len == 0 || reply == nullptr) {
ALOGW("No valid signature returned");
return 0;
}
@@ -149,21 +149,21 @@
ensure_keystore_engine();
const char *key_id = ecdsa_get_key_id(ec_key);
- if (key_id == NULL) {
+ if (key_id == nullptr) {
ALOGE("key had no key_id!");
return 0;
}
size_t ecdsa_size = ECDSA_size(ec_key);
- uint8_t* reply = NULL;
+ uint8_t* reply = nullptr;
size_t reply_len;
int32_t ret = g_keystore_backend->sign(
key_id, digest, digest_len, &reply, &reply_len);
if (ret < 0) {
ALOGW("There was an error during ecdsa_sign: could not connect");
return 0;
- } else if (reply_len == 0 || reply == NULL) {
+ } else if (reply_len == 0 || reply == nullptr) {
ALOGW("No valid signature returned");
return 0;
} else if (reply_len > ecdsa_size) {
@@ -186,13 +186,13 @@
public:
KeystoreEngine()
: rsa_index_(RSA_get_ex_new_index(0 /* argl */,
- NULL /* argp */,
- NULL /* new_func */,
+ nullptr /* argp */,
+ nullptr /* new_func */,
key_id_dup,
key_id_free)),
ec_key_index_(EC_KEY_get_ex_new_index(0 /* argl */,
- NULL /* argp */,
- NULL /* new_func */,
+ nullptr /* argp */,
+ nullptr /* new_func */,
key_id_dup,
key_id_free)),
engine_(ENGINE_new()) {
@@ -278,31 +278,31 @@
* KeyStore and operate on the key named |key_id|. */
static EVP_PKEY *wrap_rsa(const char *key_id, const RSA *public_rsa) {
Unique_RSA rsa(RSA_new_method(g_keystore_engine->engine()));
- if (rsa.get() == NULL) {
- return NULL;
+ if (rsa.get() == nullptr) {
+ return nullptr;
}
char *key_id_copy = strdup(key_id);
- if (key_id_copy == NULL) {
- return NULL;
+ if (key_id_copy == nullptr) {
+ return nullptr;
}
if (!RSA_set_ex_data(rsa.get(), g_keystore_engine->rsa_ex_index(),
key_id_copy)) {
free(key_id_copy);
- return NULL;
+ return nullptr;
}
rsa->n = BN_dup(public_rsa->n);
rsa->e = BN_dup(public_rsa->e);
- if (rsa->n == NULL || rsa->e == NULL) {
- return NULL;
+ if (rsa->n == nullptr || rsa->e == nullptr) {
+ return nullptr;
}
Unique_EVP_PKEY result(EVP_PKEY_new());
- if (result.get() == NULL ||
+ if (result.get() == nullptr ||
!EVP_PKEY_assign_RSA(result.get(), rsa.get())) {
- return NULL;
+ return nullptr;
}
OWNERSHIP_TRANSFERRED(rsa);
@@ -314,30 +314,30 @@
* KeyStore and operate on the key named |key_id|. */
static EVP_PKEY *wrap_ecdsa(const char *key_id, const EC_KEY *public_ecdsa) {
Unique_EC_KEY ec(EC_KEY_new_method(g_keystore_engine->engine()));
- if (ec.get() == NULL) {
- return NULL;
+ if (ec.get() == nullptr) {
+ return nullptr;
}
if (!EC_KEY_set_group(ec.get(), EC_KEY_get0_group(public_ecdsa)) ||
!EC_KEY_set_public_key(ec.get(), EC_KEY_get0_public_key(public_ecdsa))) {
- return NULL;
+ return nullptr;
}
char *key_id_copy = strdup(key_id);
- if (key_id_copy == NULL) {
- return NULL;
+ if (key_id_copy == nullptr) {
+ return nullptr;
}
if (!EC_KEY_set_ex_data(ec.get(), g_keystore_engine->ec_key_ex_index(),
key_id_copy)) {
free(key_id_copy);
- return NULL;
+ return nullptr;
}
Unique_EVP_PKEY result(EVP_PKEY_new());
- if (result.get() == NULL ||
+ if (result.get() == nullptr ||
!EVP_PKEY_assign_EC_KEY(result.get(), ec.get())) {
- return NULL;
+ return nullptr;
}
OWNERSHIP_TRANSFERRED(ec);
@@ -359,22 +359,22 @@
ensure_keystore_engine();
- uint8_t *pubkey = NULL;
+ uint8_t *pubkey = nullptr;
size_t pubkey_len;
int32_t ret = g_keystore_backend->get_pubkey(key_id, &pubkey, &pubkey_len);
if (ret < 0) {
ALOGW("could not contact keystore");
- return NULL;
- } else if (ret != 0 || pubkey == NULL) {
+ return nullptr;
+ } else if (ret != 0 || pubkey == nullptr) {
ALOGW("keystore reports error: %d", ret);
- return NULL;
+ return nullptr;
}
const uint8_t *inp = pubkey;
- Unique_EVP_PKEY pkey(d2i_PUBKEY(NULL, &inp, pubkey_len));
- if (pkey.get() == NULL) {
+ Unique_EVP_PKEY pkey(d2i_PUBKEY(nullptr, &inp, pubkey_len));
+ if (pkey.get() == nullptr) {
ALOGW("Cannot convert pubkey");
- return NULL;
+ return nullptr;
}
EVP_PKEY *result;
@@ -391,7 +391,7 @@
}
default:
ALOGE("Unsupported key type %d", EVP_PKEY_type(pkey->type));
- result = NULL;
+ result = nullptr;
}
return result;
diff --git a/keystore-engine/keystore_backend_binder.cpp b/keystore-engine/keystore_backend_binder.cpp
index dce8242..9f02fb5 100644
--- a/keystore-engine/keystore_backend_binder.cpp
+++ b/keystore-engine/keystore_backend_binder.cpp
@@ -42,7 +42,7 @@
sp<IBinder> binder = sm->getService(String16(keystore_service_name));
sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
- if (service == NULL) {
+ if (service == nullptr) {
ALOGE("could not contact keystore");
return -1;
}
@@ -65,7 +65,7 @@
sp<IBinder> binder = sm->getService(String16(keystore_service_name));
sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
- if (service == NULL) {
+ if (service == nullptr) {
ALOGE("could not contact keystore");
return -1;
}
diff --git a/keystore-engine/keystore_backend_hidl.cpp b/keystore-engine/keystore_backend_hidl.cpp
index 9a84e67..30cf890 100644
--- a/keystore-engine/keystore_backend_hidl.cpp
+++ b/keystore-engine/keystore_backend_hidl.cpp
@@ -33,13 +33,13 @@
int32_t KeystoreBackendHidl::sign(
const char *key_id, const uint8_t* in, size_t len, uint8_t** reply,
size_t* reply_len) {
- if (key_id == NULL || in == NULL || reply == NULL || reply_len == NULL) {
+ if (key_id == nullptr || in == nullptr || reply == nullptr || reply_len == nullptr) {
ALOGE("Null pointer argument passed");
return -1;
}
sp<IKeystore> service = IKeystore::tryGetService();
- if (service == NULL) {
+ if (service == nullptr) {
ALOGE("could not contact keystore HAL");
return -1;
}
@@ -63,13 +63,13 @@
int32_t KeystoreBackendHidl::get_pubkey(
const char *key_id, uint8_t** pubkey, size_t* pubkey_len) {
- if (key_id == NULL || pubkey == NULL || pubkey_len == NULL) {
+ if (key_id == nullptr || pubkey == nullptr || pubkey_len == nullptr) {
ALOGE("Null pointer argument passed");
return -1;
}
sp<IKeystore> service = IKeystore::tryGetService();
- if (service == NULL) {
+ if (service == nullptr) {
ALOGE("could not contact keystore HAL");
return -1;
}