From e851edc776c8db104285acaabfd21abbb807a9ba Mon Sep 17 00:00:00 2001 From: BKSSM Venkateswarlu Date: Tue, 18 Aug 2020 19:16:51 +0530 Subject: [PATCH] Code Indentation --- HAL/keymaster/4.1/CborConverter.cpp | 4 +- .../4.1/JavacardKeymaster4Device.cpp | 72 +++++++++---------- .../4.1/JavacardOperationContext.cpp | 30 ++++---- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/HAL/keymaster/4.1/CborConverter.cpp b/HAL/keymaster/4.1/CborConverter.cpp index ce594c30..4d7041fd 100644 --- a/HAL/keymaster/4.1/CborConverter.cpp +++ b/HAL/keymaster/4.1/CborConverter.cpp @@ -245,7 +245,7 @@ bool CborConverter::getMultiBinaryArray(const std::unique_ptr& item, const } bool CborConverter::getBinaryArray(const std::unique_ptr& item, const uint32_t pos, -::android::hardware::hidl_vec& value) { + ::android::hardware::hidl_vec& value) { bool ret = false; std::unique_ptr strItem(nullptr); getItemAtPos(item, pos, strItem); @@ -259,7 +259,7 @@ ::android::hardware::hidl_vec& value) { } bool CborConverter::getBinaryArray(const std::unique_ptr& item, const uint32_t pos, -::android::hardware::hidl_string& value) { + ::android::hardware::hidl_string& value) { std::vector vec; std::string str; if(!getBinaryArray(item, pos, vec)) { diff --git a/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp b/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp index 861dcfda..fa89ad8c 100644 --- a/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp +++ b/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp @@ -300,8 +300,8 @@ keyFormat, std::vector& wrappedKeyDescription) { keymaster_key_blob_t keyMaterial = {keyData, keyDataLen}; keymaster_error_t error = parse_wrapped_key(KeymasterKeyBlob(keyMaterial), &kmIv, &kmTransitKey, - &kmSecureKey, &kmTag, &authSet, - &kmKeyFormat, &kmWrappedKeyDescription); + &kmSecureKey, &kmTag, &authSet, + &kmKeyFormat, &kmWrappedKeyDescription); if (error != KM_ERROR_OK) return legacy_enum_conversion(error); blob2Vec(kmIv.data, kmIv.data_length, iv); blob2Vec(kmTransitKey.key_material, kmTransitKey.key_material_size, transitKey); @@ -348,7 +348,7 @@ ErrorCode constructApduMessage(Instruction& ins, std::vector& inputData } uint16_t getStatus(std::vector& inputData) { - //Last two bytes are the status SW0SW1 + //Last two bytes are the status SW0SW1 return (inputData.at(inputData.size()-2) << 8) | (inputData.at(inputData.size()-1)); } @@ -391,7 +391,7 @@ Return setBootParams() { std::vector verifiedBootKeyHash(32, 0); return JavacardKeymaster4Device::setBootParams(GetOsVersion(), GetOsPatchlevel(), verifiedBootKey, verifiedBootKeyHash, - KM_VERIFIED_BOOT_UNVERIFIED, 0/*deviceLocked*/); + KM_VERIFIED_BOOT_UNVERIFIED, 0/*deviceLocked*/); } ErrorCode sendData(Instruction ins, std::vector& inData, std::vector& response) { @@ -425,7 +425,7 @@ ErrorCode sendData(Instruction ins, std::vector& inData, std::vector& keyParams, KeyFormat keyFormat, const hidl_vec& -keyData) { + keyData) { cppbor::Array array; cppbor::Array subArray; std::unique_ptr item; @@ -489,7 +489,7 @@ keyData) { } ErrorCode JavacardKeymaster4Device::setBootParams(uint32_t osVersion, uint32_t osPatchLevel, const std::vector& verifiedBootKey, -std::vector& verifiedBootKeyHash, keymaster_verified_boot_t kmVerifiedBoot, bool deviceLocked) { + std::vector& verifiedBootKeyHash, keymaster_verified_boot_t kmVerifiedBoot, bool deviceLocked) { cppbor::Array array; std::vector apdu; std::vector response; @@ -729,7 +729,7 @@ Return JavacardKeymaster4Device::generateKey(const hidl_vec& hidl_vec updatedParams(keyParams); if(!findTag(keyParams, Tag::CREATION_DATETIME) && - !findTag(keyParams, Tag::ACTIVE_DATETIME)) { + !findTag(keyParams, Tag::ACTIVE_DATETIME)) { //Add CREATION_DATETIME in HAL, as secure element is not having clock. size_t size = keyParams.size(); updatedParams.resize(size+1); @@ -749,7 +749,7 @@ Return JavacardKeymaster4Device::generateKey(const hidl_vec& true); if (item != nullptr) { if(!cborConverter_.getBinaryArray(item, 1, keyBlob) || - !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { + !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { //Clear the buffer. keyBlob.setToExternal(nullptr, 0); keyCharacteristics.softwareEnforced.setToExternal(nullptr, 0); @@ -763,20 +763,20 @@ Return JavacardKeymaster4Device::generateKey(const hidl_vec& } Return JavacardKeymaster4Device::importKey(const hidl_vec& keyParams, KeyFormat keyFormat, const hidl_vec& keyData, importKey_cb _hidl_cb) { - cppbor::Array array; - std::unique_ptr item; - hidl_vec keyBlob; - std::vector cborOutData; - ErrorCode errorCode = ErrorCode::UNKNOWN_ERROR; - KeyCharacteristics keyCharacteristics; + cppbor::Array array; + std::unique_ptr item; + hidl_vec keyBlob; + std::vector cborOutData; + ErrorCode errorCode = ErrorCode::UNKNOWN_ERROR; + KeyCharacteristics keyCharacteristics; cppbor::Array subArray; if(keyFormat != KeyFormat::PKCS8 && keyFormat != KeyFormat::RAW) { _hidl_cb(ErrorCode::UNSUPPORTED_KEY_FORMAT, keyBlob, keyCharacteristics); return Void(); } - cborConverter_.addKeyparameters(array, keyParams); - array.add(static_cast(KeyFormat::RAW)); //javacard accepts only RAW. + cborConverter_.addKeyparameters(array, keyParams); + array.add(static_cast(KeyFormat::RAW)); //javacard accepts only RAW. if(ErrorCode::OK != (errorCode = prepareCborArrayFromKeyData(keyParams, keyFormat, keyData, subArray))) { _hidl_cb(errorCode, keyBlob, keyCharacteristics); return Void(); @@ -785,27 +785,27 @@ Return JavacardKeymaster4Device::importKey(const hidl_vec& k cppbor::Bstr bstr(encodedArray.begin(), encodedArray.end()); array.add(bstr); - std::vector cborData = array.encode(); + std::vector cborData = array.encode(); - errorCode = sendData(Instruction::INS_IMPORT_KEY_CMD, cborData, cborOutData); + errorCode = sendData(Instruction::INS_IMPORT_KEY_CMD, cborData, cborOutData); - if((errorCode == ErrorCode::OK) && (cborOutData.size() > 2)) { - //Skip last 2 bytes in cborData, it contains status. - std::tie(item, errorCode) = cborConverter_.decodeData(std::vector(cborOutData.begin(), cborOutData.end()-2), - true); - if (item != nullptr) { + if((errorCode == ErrorCode::OK) && (cborOutData.size() > 2)) { + //Skip last 2 bytes in cborData, it contains status. + std::tie(item, errorCode) = cborConverter_.decodeData(std::vector(cborOutData.begin(), cborOutData.end()-2), + true); + if (item != nullptr) { if(!cborConverter_.getBinaryArray(item, 1, keyBlob) || - !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { + !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { //Clear the buffer. keyBlob.setToExternal(nullptr, 0); keyCharacteristics.softwareEnforced.setToExternal(nullptr, 0); keyCharacteristics.hardwareEnforced.setToExternal(nullptr, 0); errorCode = ErrorCode::UNKNOWN_ERROR; } - } - } - _hidl_cb(errorCode, keyBlob, keyCharacteristics); - return Void(); + } + } + _hidl_cb(errorCode, keyBlob, keyCharacteristics); + return Void(); } Return JavacardKeymaster4Device::importWrappedKey(const hidl_vec& wrappedKeyData, const hidl_vec& wrappingKeyBlob, const hidl_vec& maskingKey, const hidl_vec& unwrappingParams, uint64_t passwordSid, uint64_t biometricSid, importWrappedKey_cb _hidl_cb) { @@ -824,7 +824,7 @@ Return JavacardKeymaster4Device::importWrappedKey(const hidl_vec& std::vector wrappedKeyDescription; if(ErrorCode::OK != (errorCode = parseWrappedKey(wrappedKeyData, iv, transitKey, secureKey, - tag, authList, keyFormat, wrappedKeyDescription))) { + tag, authList, keyFormat, wrappedKeyDescription))) { _hidl_cb(errorCode, keyBlob, keyCharacteristics); return Void(); } @@ -850,7 +850,7 @@ Return JavacardKeymaster4Device::importWrappedKey(const hidl_vec& true); if (item != nullptr) { if(!cborConverter_.getBinaryArray(item, 1, keyBlob) || - !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { + !cborConverter_.getKeyCharacteristics(item, 2, keyCharacteristics)) { //Clear the buffer. keyBlob.setToExternal(nullptr, 0); keyCharacteristics.softwareEnforced.setToExternal(nullptr, 0); @@ -899,9 +899,9 @@ Return JavacardKeymaster4Device::exportKey(KeyFormat exportFormat, const h //Check if keyblob is corrupted getKeyCharacteristics(keyBlob, clientId, appData, - [&](ErrorCode error, KeyCharacteristics /*keyCharacteristics*/) { - errorCode = error; - }); + [&](ErrorCode error, KeyCharacteristics /*keyCharacteristics*/) { + errorCode = error; + }); if(errorCode != ErrorCode::OK) { _hidl_cb(errorCode, resultKeyBlob); @@ -1088,7 +1088,7 @@ Return JavacardKeymaster4Device::begin(KeyPurpose purpose, const hidl_vec< /* keyCharacteristics.hardwareEnforced is required to store algorithm, digest and padding values in operationInfo * structure. To retrieve keyCharacteristics.hardwareEnforced, parse the keyBlob. */ - /* TODO if keyBlob is corrupted it crashes in cbor */ + /* TODO if keyBlob is corrupted it crashes in cbor */ std::tie(blobItem, errorCode) = cborConverter_.decodeData(std::vector(keyBlob), false); if(blobItem != nullptr) { @@ -1182,7 +1182,7 @@ Return JavacardKeymaster4Device::update(uint64_t operationHandle, const hi //cipher text and finally copy it to the output. getBinaryArray function appends the new cipher text //at the end of the tempOut(std::vector). if((outParams.size() == 0 && !cborConverter_.getKeyParameters(item, 2, outParams)) || - !cborConverter_.getBinaryArray(item, 3, tempOut)) { + !cborConverter_.getBinaryArray(item, 3, tempOut)) { outParams.setToExternal(nullptr, 0); tempOut.clear(); errorCode = ErrorCode::UNKNOWN_ERROR; @@ -1293,7 +1293,7 @@ Return JavacardKeymaster4Device::finish(uint64_t operationHandle, const hi //the cipher text and finally copy it to the output. getBinaryArray function appends the new cipher //text at the end of the tempOut(std::vector). if((outParams.size() == 0 && !cborConverter_.getKeyParameters(item, keyParamPos, outParams)) || - !cborConverter_.getBinaryArray(item, outputPos, tempOut)) { + !cborConverter_.getBinaryArray(item, outputPos, tempOut)) { outParams.setToExternal(nullptr, 0); tempOut.clear(); errorCode = ErrorCode::UNKNOWN_ERROR; diff --git a/HAL/keymaster/4.1/JavacardOperationContext.cpp b/HAL/keymaster/4.1/JavacardOperationContext.cpp index d9d05d35..6b43790e 100644 --- a/HAL/keymaster/4.1/JavacardOperationContext.cpp +++ b/HAL/keymaster/4.1/JavacardOperationContext.cpp @@ -35,8 +35,8 @@ enum class Operation { }; inline ErrorCode hidlParamSet2OperatinInfo(const hidl_vec& params, OperationInfo& info) { - for(int i = 0; i < params.size(); i++) { - const KeyParameter ¶m = params[i]; + for(int i = 0; i < params.size(); i++) { + const KeyParameter ¶m = params[i]; switch(param.tag) { case Tag::ALGORITHM: info.alg = static_cast(param.f.integer); @@ -53,11 +53,12 @@ inline ErrorCode hidlParamSet2OperatinInfo(const hidl_vec& params, default: continue; } - } + } return ErrorCode::OK; } -ErrorCode OperationContext::setOperationInfo(uint64_t operationHandle, KeyPurpose purpose, Algorithm alg, const hidl_vec& params) { +ErrorCode OperationContext::setOperationInfo(uint64_t operationHandle, KeyPurpose purpose, Algorithm alg, + const hidl_vec& params) { ErrorCode errorCode = ErrorCode::OK; OperationData data; if(ErrorCode::OK != (errorCode = hidlParamSet2OperatinInfo(params, data.info))) { @@ -78,7 +79,8 @@ ErrorCode OperationContext::clearOperationData(uint64_t operHandle) { return ErrorCode::OK; } -ErrorCode OperationContext::validateInputData(uint64_t operHandle, Operation opr, const std::vector& actualInput, std::vector& input) { +ErrorCode OperationContext::validateInputData(uint64_t operHandle, Operation opr, + const std::vector& actualInput, std::vector& input) { ErrorCode errorCode = ErrorCode::OK; OperationData& oprData = operationTable[operHandle]; @@ -126,7 +128,8 @@ ErrorCode OperationContext::validateInputData(uint64_t operHandle, Operation opr return errorCode; } -ErrorCode OperationContext::update(uint64_t operHandle, const std::vector& actualInput, sendDataToSE_cb cb) { +ErrorCode OperationContext::update(uint64_t operHandle, const std::vector& actualInput, + sendDataToSE_cb cb) { ErrorCode errorCode = ErrorCode::OK; std::vector input; @@ -143,20 +146,20 @@ ErrorCode OperationContext::update(uint64_t operHandle, const std::vector newInput(first, end); if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, newInput.data(), newInput.size(), - Operation::Update, cb))) { + Operation::Update, cb))) { return errorCode; } } if(extraData > 0) { std::vector finalInput(input.cend()-extraData, input.cend()); if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, finalInput.data(), finalInput.size(), - Operation::Update, cb))) { + Operation::Update, cb))) { return errorCode; } } } else { if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, input.data(), input.size(), - Operation::Update, cb))) { + Operation::Update, cb))) { return errorCode; } } @@ -180,20 +183,20 @@ ErrorCode OperationContext::finish(uint64_t operHandle, const std::vector newInput(first, end); if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, newInput.data(), newInput.size(), - Operation::Update, cb))) { + Operation::Update, cb))) { return errorCode; } } if(extraData > 0) { std::vector finalInput(input.cend()-extraData, input.cend()); if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, finalInput.data(), finalInput.size(), - Operation::Finish, cb, true))) { + Operation::Finish, cb, true))) { return errorCode; } } } else { if(ErrorCode::OK != (errorCode = handleInternalUpdate(operHandle, input.data(), input.size(), - Operation::Finish, cb, true))) { + Operation::Finish, cb, true))) { return errorCode; } } @@ -201,7 +204,8 @@ ErrorCode OperationContext::finish(uint64_t operHandle, const std::vector& out) { +ErrorCode OperationContext::getBlockAlignedData(uint64_t operHandle, uint8_t* input, size_t input_len, + Operation opr, std::vector& out) { int dataToSELen = 0; int inputConsumed = 0;/*Length of the data consumed from input */ int blockSize = 0;