Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: 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 f9e7be0..79b0ec3 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;
}
@@ -66,7 +66,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;
}
diff --git a/keystore/KeyStore.cpp b/keystore/KeyStore.cpp
index f197d91..3a8861e 100644
--- a/keystore/KeyStore.cpp
+++ b/keystore/KeyStore.cpp
@@ -263,7 +263,7 @@
bool KeyStore::isEmpty(uid_t userId) const {
const UserState* userState = getUserState(userId);
- if (userState == NULL) {
+ if (userState == nullptr) {
return true;
}
@@ -274,7 +274,7 @@
bool result = true;
struct dirent* file;
- while ((file = readdir(dir)) != NULL) {
+ while ((file = readdir(dir)) != nullptr) {
// We only care about files.
if (file->d_type != DT_REG) {
continue;
@@ -487,7 +487,7 @@
}
struct dirent* file;
- while ((file = readdir(dir)) != NULL) {
+ while ((file = readdir(dir)) != nullptr) {
// We only care about files.
if (file->d_type != DT_REG) {
continue;
@@ -504,7 +504,7 @@
size_t extra = decode_key_length(p, plen);
char* match = (char*)malloc(extra + 1);
- if (match != NULL) {
+ if (match != nullptr) {
decode_key(match, p, plen);
matches->push(android::String16(match, extra));
free(match);
@@ -531,7 +531,7 @@
ResponseCode KeyStore::importKey(const uint8_t* key, size_t keyLen, const char* filename,
uid_t userId, int32_t flags) {
- Unique_PKCS8_PRIV_KEY_INFO pkcs8(d2i_PKCS8_PRIV_KEY_INFO(NULL, &key, keyLen));
+ Unique_PKCS8_PRIV_KEY_INFO pkcs8(d2i_PKCS8_PRIV_KEY_INFO(nullptr, &key, keyLen));
if (!pkcs8.get()) {
return ResponseCode::SYSTEM_ERROR;
}
@@ -584,7 +584,7 @@
return ResponseCode::SYSTEM_ERROR;
}
- Blob keyBlob(&blob[0], blob.size(), NULL, 0, TYPE_KEYMASTER_10);
+ Blob keyBlob(&blob[0], blob.size(), nullptr, 0, TYPE_KEYMASTER_10);
keyBlob.setEncrypted(flags & KEYSTORE_FLAG_ENCRYPTED);
keyBlob.setSecurityLevel(securityLevel);
@@ -651,7 +651,7 @@
}
}
- return NULL;
+ return nullptr;
}
const UserState* KeyStore::getUserStateByUid(uid_t uid) const {
@@ -705,19 +705,19 @@
ResponseCode KeyStore::importBlobAsKey(Blob* blob, const char* filename, uid_t userId) {
// We won't even write to the blob directly with this BIO, so const_cast is okay.
Unique_BIO b(BIO_new_mem_buf(const_cast<uint8_t*>(blob->getValue()), blob->getLength()));
- if (b.get() == NULL) {
+ if (b.get() == nullptr) {
ALOGE("Problem instantiating BIO");
return ResponseCode::SYSTEM_ERROR;
}
- Unique_EVP_PKEY pkey(PEM_read_bio_PrivateKey(b.get(), NULL, NULL, NULL));
- if (pkey.get() == NULL) {
+ Unique_EVP_PKEY pkey(PEM_read_bio_PrivateKey(b.get(), nullptr, nullptr, nullptr));
+ if (pkey.get() == nullptr) {
ALOGE("Couldn't read old PEM file");
return ResponseCode::SYSTEM_ERROR;
}
Unique_PKCS8_PRIV_KEY_INFO pkcs8(EVP_PKEY2PKCS8(pkey.get()));
- int len = i2d_PKCS8_PRIV_KEY_INFO(pkcs8.get(), NULL);
+ int len = i2d_PKCS8_PRIV_KEY_INFO(pkcs8.get(), nullptr);
if (len < 0) {
ALOGE("Couldn't measure PKCS#8 length");
return ResponseCode::SYSTEM_ERROR;
@@ -797,7 +797,7 @@
}
struct dirent* file;
- while ((file = readdir(dir)) != NULL) {
+ while ((file = readdir(dir)) != nullptr) {
// We only care about files.
if (file->d_type != DT_REG) {
continue;
@@ -821,7 +821,7 @@
// Rename the file into user directory.
DIR* otherdir = opendir(otherUser->getUserDirName());
- if (otherdir == NULL) {
+ if (otherdir == nullptr) {
ALOGW("couldn't open user directory for rename");
continue;
}
diff --git a/keystore/KeystoreArguments.cpp b/keystore/KeystoreArguments.cpp
index fe53c29..6b29e78 100644
--- a/keystore/KeystoreArguments.cpp
+++ b/keystore/KeystoreArguments.cpp
@@ -39,7 +39,7 @@
sp<KeystoreArg> arg = new KeystoreArg(in->readInplace(inSize), inSize);
args.push_back(arg);
} else {
- args.push_back(NULL);
+ args.push_back(nullptr);
}
}
}
diff --git a/keystore/auth_token_table.cpp b/keystore/auth_token_table.cpp
index 3c51c70..063da70 100644
--- a/keystore/auth_token_table.cpp
+++ b/keystore/auth_token_table.cpp
@@ -148,7 +148,7 @@
HardwareAuthenticatorType auth_type,
const AuthorizationSet& key_info,
const HardwareAuthToken** found) {
- Entry* newest_match = NULL;
+ Entry* newest_match = nullptr;
for (auto& entry : entries_)
if (entry.SatisfiesAuth(sids, auth_type) && entry.is_newer_than(newest_match))
newest_match = &entry;
diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 9d035c8..dcdaac0 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -84,7 +84,7 @@
std::pair<KeyStoreServiceReturnCode, bool> hadFactoryResetSinceIdRotation() {
struct stat sbuf;
if (stat(kTimestampFilePath, &sbuf) == 0) {
- double diff_secs = difftime(time(NULL), sbuf.st_ctime);
+ double diff_secs = difftime(time(nullptr), sbuf.st_ctime);
return {ResponseCode::NO_ERROR, diff_secs < kIdRotationPeriod};
}
@@ -194,7 +194,7 @@
String8 name8(name);
String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, targetUid, ::TYPE_GENERIC));
- Blob keyBlob(&item[0], item.size(), NULL, 0, ::TYPE_GENERIC);
+ Blob keyBlob(&item[0], item.size(), nullptr, 0, ::TYPE_GENERIC);
keyBlob.setEncrypted(flags & KEYSTORE_FLAG_ENCRYPTED);
*aidl_return =
@@ -462,10 +462,10 @@
return Status::ok();
} else if (args->size() == 1) {
const sp<KeystoreArg>& expArg = args->itemAt(0);
- if (expArg != NULL) {
+ if (expArg != nullptr) {
Unique_BIGNUM pubExpBn(BN_bin2bn(
- reinterpret_cast<const unsigned char*>(expArg->data()), expArg->size(), NULL));
- if (pubExpBn.get() == NULL) {
+ reinterpret_cast<const unsigned char*>(expArg->data()), expArg->size(), nullptr));
+ if (pubExpBn.get() == nullptr) {
ALOGI("Could not convert public exponent to BN");
*aidl_return = static_cast<int32_t>(ResponseCode::SYSTEM_ERROR);
return Status::ok();
@@ -508,7 +508,7 @@
const uint8_t* ptr = &data[0];
- Unique_PKCS8_PRIV_KEY_INFO pkcs8(d2i_PKCS8_PRIV_KEY_INFO(NULL, &ptr, data.size()));
+ Unique_PKCS8_PRIV_KEY_INFO pkcs8(d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, data.size()));
if (!pkcs8.get()) {
*aidl_return = static_cast<int32_t>(ResponseCode::SYSTEM_ERROR);
return Status::ok();
@@ -537,7 +537,7 @@
int import_result;
auto rc = importKey(name, KeymasterArguments(params.hidl_data()),
static_cast<int32_t>(KeyFormat::PKCS8), data, targetUid, flags,
- /*outCharacteristics*/ NULL, &import_result);
+ /*outCharacteristics*/ nullptr, &import_result);
if (!KeyStoreServiceReturnCode(import_result).isOk()) {
ALOGW("importKey failed: %d", int32_t(import_result));
@@ -806,7 +806,7 @@
String8 name8(name);
String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
- Blob keyBlob(&hidlKeyBlob[0], hidlKeyBlob.size(), NULL, 0, ::TYPE_KEYMASTER_10);
+ Blob keyBlob(&hidlKeyBlob[0], hidlKeyBlob.size(), nullptr, 0, ::TYPE_KEYMASTER_10);
keyBlob.setSecurityLevel(securityLevel);
keyBlob.setCriticalToDeviceEncryption(flags & KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION);
if (isAuthenticationBound(params.getParameters()) &&
@@ -874,7 +874,7 @@
return Status::ok();
}
auto kc_buf = kc_stream.str();
- Blob charBlob(reinterpret_cast<const uint8_t*>(kc_buf.data()), kc_buf.size(), NULL, 0,
+ Blob charBlob(reinterpret_cast<const uint8_t*>(kc_buf.data()), kc_buf.size(), nullptr, 0,
::TYPE_KEY_CHARACTERISTICS);
charBlob.setSecurityLevel(securityLevel);
charBlob.setEncrypted(flags & KEYSTORE_FLAG_ENCRYPTED);
@@ -1037,7 +1037,7 @@
// Write the key:
String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
- Blob ksBlob(&keyBlob[0], keyBlob.size(), NULL, 0, ::TYPE_KEYMASTER_10);
+ Blob ksBlob(&keyBlob[0], keyBlob.size(), nullptr, 0, ::TYPE_KEYMASTER_10);
ksBlob.setSecurityLevel(securityLevel);
ksBlob.setCriticalToDeviceEncryption(flags & KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION);
if (isAuthenticationBound(params.getParameters()) &&
@@ -1112,7 +1112,7 @@
}
auto kcBuf = kcStream.str();
- Blob charBlob(reinterpret_cast<const uint8_t*>(kcBuf.data()), kcBuf.size(), NULL, 0,
+ Blob charBlob(reinterpret_cast<const uint8_t*>(kcBuf.data()), kcBuf.size(), nullptr, 0,
::TYPE_KEY_CHARACTERISTICS);
charBlob.setSecurityLevel(securityLevel);
charBlob.setEncrypted(flags & KEYSTORE_FLAG_ENCRYPTED);
@@ -1676,7 +1676,7 @@
uid_t callingUid = IPCThreadState::self()->getCallingUid();
sp<IBinder> binder = defaultServiceManager()->getService(String16("permission"));
- if (binder == 0) {
+ if (binder == nullptr) {
*aidl_return =
static_cast<int32_t>(KeyStoreServiceReturnCode(ErrorCode::CANNOT_ATTEST_IDS));
return Status::ok();
@@ -1816,7 +1816,7 @@
String8 filename(
mKeyStore->getKeyNameForUidWithDir(wrappedKeyAlias8, callingUid, ::TYPE_KEYMASTER_10));
- Blob ksBlob(&keyBlob[0], keyBlob.size(), NULL, 0, ::TYPE_KEYMASTER_10);
+ Blob ksBlob(&keyBlob[0], keyBlob.size(), nullptr, 0, ::TYPE_KEYMASTER_10);
ksBlob.setSecurityLevel(securityLevel);
if (containsTag(keyCharacteristics.hardwareEnforced, Tag::USER_SECURE_ID)) {
@@ -1851,7 +1851,7 @@
}
auto kcBuf = kcStream.str();
- Blob charBlob(reinterpret_cast<const uint8_t*>(kcBuf.data()), kcBuf.size(), NULL, 0,
+ Blob charBlob(reinterpret_cast<const uint8_t*>(kcBuf.data()), kcBuf.size(), nullptr, 0,
::TYPE_KEY_CHARACTERISTICS);
charBlob.setSecurityLevel(securityLevel);
diff --git a/keystore/keyblob_utils.cpp b/keystore/keyblob_utils.cpp
index 3616822..6c2fac9 100644
--- a/keystore/keyblob_utils.cpp
+++ b/keystore/keyblob_utils.cpp
@@ -48,7 +48,7 @@
uint8_t* add_softkey_header(uint8_t* key_blob, size_t key_blob_length) {
if (key_blob_length < sizeof(SOFT_KEY_MAGIC)) {
- return NULL;
+ return nullptr;
}
memcpy(key_blob, SOFT_KEY_MAGIC, sizeof(SOFT_KEY_MAGIC));
diff --git a/keystore/keystore_cli.cpp b/keystore/keystore_cli.cpp
index 1e100fc..d5a8afa 100644
--- a/keystore/keystore_cli.cpp
+++ b/keystore/keystore_cli.cpp
@@ -31,7 +31,7 @@
using android::security::IKeystoreService;
static const char* responses[] = {
- NULL,
+ nullptr,
/* [NO_ERROR] = */ "No error",
/* [LOCKED] = */ "Locked",
/* [UNINITIALIZED] = */ "Uninitialized",
@@ -218,7 +218,7 @@
sp<IBinder> binder = sm->getService(String16("android.security.keystore"));
sp<IKeystoreService> service = interface_cast<IKeystoreService>(binder);
- if (service == NULL) {
+ if (service == nullptr) {
fprintf(stderr, "%s: error: could not connect to keystore service\n", argv[0]);
return 1;
}
diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index bf04209..157417f 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -496,7 +496,7 @@
sp<android::IServiceManager> sm = android::defaultServiceManager();
sp<android::IBinder> binder = sm->getService(String16("android.security.keystore"));
sp<IKeystoreService> service = android::interface_cast<IKeystoreService>(binder);
- if (service == NULL) {
+ if (service == nullptr) {
printf("error: could not connect to keystore service.\n");
return 1;
}
diff --git a/keystore/keystore_get.cpp b/keystore/keystore_get.cpp
index cf67fa4..fec36c4 100644
--- a/keystore/keystore_get.cpp
+++ b/keystore/keystore_get.cpp
@@ -29,7 +29,7 @@
sp<android::security::IKeystoreService> service =
interface_cast<android::security::IKeystoreService>(binder);
- if (service == NULL) {
+ if (service == nullptr) {
return -1;
}
diff --git a/keystore/keystore_get_wifi_hidl.cpp b/keystore/keystore_get_wifi_hidl.cpp
index 79639b6..155201f 100644
--- a/keystore/keystore_get_wifi_hidl.cpp
+++ b/keystore/keystore_get_wifi_hidl.cpp
@@ -34,13 +34,13 @@
using android::system::wifi::keystore::V1_0::IKeystore;
ssize_t keystore_get(const char *key, size_t keyLength, uint8_t** value) {
- if (key == NULL || keyLength == 0 || value == NULL) {
+ if (key == nullptr || keyLength == 0 || value == 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;
}
diff --git a/keystore/keystore_keymaster_enforcement.h b/keystore/keystore_keymaster_enforcement.h
index e114ea9..e7515a1 100644
--- a/keystore/keystore_keymaster_enforcement.h
+++ b/keystore/keystore_keymaster_enforcement.h
@@ -39,7 +39,7 @@
}
bool activation_date_valid(uint64_t activation_date) const override {
- time_t now = time(NULL);
+ time_t now = time(nullptr);
if (now == static_cast<time_t>(-1)) {
// Failed to obtain current time -- fail safe: activation_date hasn't yet occurred.
return false;
@@ -57,7 +57,7 @@
}
bool expiration_date_passed(uint64_t expiration_date) const override {
- time_t now = time(NULL);
+ time_t now = time(nullptr);
if (now == static_cast<time_t>(-1)) {
// Failed to obtain current time -- fail safe: expiration_date has passed.
return true;
diff --git a/keystore/permissions.cpp b/keystore/permissions.cpp
index 1ba91d9..40be938 100644
--- a/keystore/permissions.cpp
+++ b/keystore/permissions.cpp
@@ -119,7 +119,7 @@
static bool keystore_selinux_check_access(uid_t uid, perm_t perm, pid_t spid) {
audit_data ad;
- char* sctx = NULL;
+ char* sctx = nullptr;
const char* selinux_class = "keystore_key";
const char* str_perm = get_perm_label(perm);
diff --git a/keystore/tests/auth_token_table_test.cpp b/keystore/tests/auth_token_table_test.cpp
index 511a78d..29aa71e 100644
--- a/keystore/tests/auth_token_table_test.cpp
+++ b/keystore/tests/auth_token_table_test.cpp
@@ -79,7 +79,7 @@
.Authorization(TAG_USER_SECURE_ID, rsid);
// Use timeout == 0 to indicate tags that require auth per operation.
if (timeout != 0) builder.Authorization(TAG_AUTH_TIMEOUT, timeout);
- return builder;
+ return std::move(builder);
}
// Tests obviously run so fast that a real-time clock with a one-second granularity rarely changes
diff --git a/keystore/user_state.cpp b/keystore/user_state.cpp
index 5f9cd5f..b70de4c 100644
--- a/keystore/user_state.cpp
+++ b/keystore/user_state.cpp
@@ -155,7 +155,7 @@
if (length > SALT_SIZE && rawBlob.info == SALT_SIZE) {
salt = (uint8_t*)&rawBlob + length - SALT_SIZE;
} else {
- salt = NULL;
+ salt = nullptr;
}
uint8_t passwordKey[MASTER_KEY_SIZE_BYTES];
generateKeyFromPassword(passwordKey, MASTER_KEY_SIZE_BYTES, pw, salt);
@@ -166,7 +166,7 @@
}
if (response == ResponseCode::NO_ERROR && masterKeyBlob.getLength() == MASTER_KEY_SIZE_BYTES) {
// If salt was missing, generate one and write a new master key file with the salt.
- if (salt == NULL) {
+ if (salt == nullptr) {
if (!generateSalt(entropy)) {
return ResponseCode::SYSTEM_ERROR;
}
@@ -209,7 +209,7 @@
}
struct dirent* file;
- while ((file = readdir(dir)) != NULL) {
+ while ((file = readdir(dir)) != nullptr) {
// skip . and ..
if (!strcmp(".", file->d_name) || !strcmp("..", file->d_name)) {
continue;
@@ -224,7 +224,7 @@
void UserState::generateKeyFromPassword(uint8_t* key, ssize_t keySize, const android::String8& pw,
uint8_t* salt) {
size_t saltSize;
- if (salt != NULL) {
+ if (salt != nullptr) {
saltSize = SALT_SIZE;
} else {
// Pre-gingerbread used this hardwired salt, readMasterKey will rewrite these when found