From 49cfb7e5370b9c117843418968629bdde2daab2d Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Tue, 28 Jan 2020 17:37:00 -0500 Subject: [PATCH] crypto: add some missing newlines Change-Id: I6bc6b512fe6e841703229d45333421532ecebb83 --- crypto/ext4crypt/Keymaster.cpp | 4 ++-- crypto/ext4crypt/Keymaster3.cpp | 4 ++-- crypto/fde/cryptfs.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crypto/ext4crypt/Keymaster.cpp b/crypto/ext4crypt/Keymaster.cpp index 3c21aa26..1e981b94 100644 --- a/crypto/ext4crypt/Keymaster.cpp +++ b/crypto/ext4crypt/Keymaster.cpp @@ -229,7 +229,7 @@ KeymasterOperation Keymaster::begin(keymaster_purpose_t purpose, const std::stri keymaster_key_param_set_t outParams_set; auto error = mDevice->begin(purpose, &keyBlob, &inParams, &outParams_set, &mOpHandle); if (error != KM_ERROR_OK) { - LOG(ERROR) << "begin failed, code " << error; + LOG(ERROR) << "begin failed, code " << error << "\n"; return KeymasterOperation(nullptr, mOpHandle); } outParams->Clear(); @@ -244,7 +244,7 @@ KeymasterOperation Keymaster::begin(keymaster_purpose_t purpose, const std::stri keymaster_operation_handle_t mOpHandle; auto error = mDevice->begin(purpose, &keyBlob, &inParams, nullptr, &mOpHandle); if (error != KM_ERROR_OK) { - LOG(ERROR) << "begin failed, code " << error; + LOG(ERROR) << "begin failed, code " << error << "\n"; return KeymasterOperation(nullptr, mOpHandle); } return KeymasterOperation(mDevice, mOpHandle); diff --git a/crypto/ext4crypt/Keymaster3.cpp b/crypto/ext4crypt/Keymaster3.cpp index 7862044e..d53096e6 100644 --- a/crypto/ext4crypt/Keymaster3.cpp +++ b/crypto/ext4crypt/Keymaster3.cpp @@ -181,11 +181,11 @@ KeymasterOperation Keymaster::begin(KeyPurpose purpose, const std::string& key, auto error = mDevice->begin(purpose, keyBlob, inParams.hidl_data(), hidlCb); if (!error.isOk()) { - LOG(ERROR) << "begin failed: " << error.description(); + LOG(ERROR) << "begin failed: " << error.description() << "\n"; return KeymasterOperation(ErrorCode::UNKNOWN_ERROR); } if (km_error != ErrorCode::OK) { - LOG(ERROR) << "begin failed, code " << int32_t(km_error); + LOG(ERROR) << "begin failed, code " << int32_t(km_error) << "\n"; return KeymasterOperation(km_error); } return KeymasterOperation(mDevice, mOpHandle); diff --git a/crypto/fde/cryptfs.cpp b/crypto/fde/cryptfs.cpp index 83522968..792708e8 100644 --- a/crypto/fde/cryptfs.cpp +++ b/crypto/fde/cryptfs.cpp @@ -256,7 +256,7 @@ static int get_keymaster_hw_fde_passwd(const char* passwd, unsigned char* newpw, if (should_use_keymaster()) { if (scrypt_keymaster(passwd, salt, newpw, (void*)ftr)) { - SLOGE("scrypt failed"); + SLOGE("scrypt failed\n"); } else { rc = 0; } @@ -293,7 +293,7 @@ static int verify_and_update_hw_fde_passwd(const char *passwd, ++crypt_ftr->failed_decrypt_count; if (ascii_passwd_updated) { - SLOGI("Ascii password was updated"); + SLOGI("Ascii password was updated\n"); } else { /* Code in else part would execute only once: * When device is upgraded from L->M release. @@ -412,7 +412,7 @@ static int keymaster_sign_object(struct crypt_mnt_ftr *ftr, // so) because we really should be using a proper deterministic // RSA padding function, such as PKCS1. memcpy(to_sign + 1, object, min((size_t)RSA_KEY_SIZE_BYTES - 1, object_size)); - SLOGI("Signing safely-padded object"); + SLOGI("Signing safely-padded object\n"); break; default: SLOGE("Unknown KDF type %d", ftr->kdf_type); @@ -930,8 +930,8 @@ static int load_crypto_mapping_table(struct crypt_mnt_ftr *crypt_ftr, crypt_ftr->crypto_type_name, master_key_ascii, real_blk_name, extra_params); - SLOGI("target_type = %s", tgt->target_type); - SLOGI("real_blk_name = %s, extra_params = %s", real_blk_name, extra_params); + SLOGI("target_type = %s\n", tgt->target_type); + SLOGI("real_blk_name = %s, extra_params = %s\n", real_blk_name, extra_params); #else convert_key_to_hex_ascii(master_key, crypt_ftr->keysize, master_key_ascii); strlcpy(tgt->target_type, "crypt", DM_MAX_TYPE_NAME); @@ -1342,7 +1342,7 @@ static int test_mount_hw_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr, #ifndef CONFIG_HW_DISK_ENCRYPT_PERF if (create_crypto_blk_dev(crypt_ftr, (unsigned char*)&key_index, real_blkdev, crypto_blkdev, label, 0)) { - SLOGE("Error creating decrypted block device"); + SLOGE("Error creating decrypted block device\n"); rc = -1; goto errout; } @@ -1350,7 +1350,7 @@ static int test_mount_hw_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr, } else { if (create_crypto_blk_dev(crypt_ftr, decrypted_master_key, real_blkdev, crypto_blkdev, label, 0)) { - SLOGE("Error creating decrypted block device"); + SLOGE("Error creating decrypted block device\n"); rc = -1; goto errout; } @@ -1439,7 +1439,7 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr, if (rc == 0 && memcmp(scrypted_intermediate_key, crypt_ftr->scrypted_intermediate_key, sizeof(scrypted_intermediate_key)) == 0) { - SLOGI("Password matches"); + SLOGI("Password matches\n"); rc = 0; } else { /* Try mounting the file system anyway, just in case the problem's with @@ -1454,7 +1454,7 @@ static int test_mount_encrypted_fs(struct crypt_mnt_ftr* crypt_ftr, rc = -1; } else { /* Success! */ - SLOGI("Password did not match but decrypted drive mounted - continue"); + SLOGI("Password did not match but decrypted drive mounted - continue\n"); umount(tmp_mount_point); rc = 0; }