abaf4d88d8
The version code is one of the fields included in the attestationApplicationId field of the attestation record (tag 709). It was converted to a 64-bit integer (returned by getLongVersionCode) in Change-ID Ibfffe235bbfcf358b3741abd3f7197fdb063d3f3. This broke the KeyAttestation test as the Signature array size (the 4 bytes read after the 4 bytes that used to be the int32 indicating version code) gets incorrectly read as zero, causing the omission of any signature info in the attestation record produced. This fixes the broken functionality by changing the field type in the native code to int64_t, and the integer value in the attestation record to match. Bug: 71021326 Test: runtest --path cts/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java Change-Id: I5fe53eb75b544f307c0f419029735ca22fe2b595
56 lines
2 KiB
C++
56 lines
2 KiB
C++
/*
|
|
**
|
|
** Copyright 2016, The Android Open Source Project
|
|
**
|
|
** Licensed under the Apache License, Version 2.0 (the "License");
|
|
** you may not use this file except in compliance with the License.
|
|
** You may obtain a copy of the License at
|
|
**
|
|
** http://www.apache.org/licenses/LICENSE-2.0
|
|
**
|
|
** Unless required by applicable law or agreed to in writing, software
|
|
** distributed under the License is distributed on an "AS IS" BASIS,
|
|
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
** See the License for the specific language governing permissions and
|
|
** limitations under the License.
|
|
*/
|
|
|
|
#include "include/keystore/KeyAttestationPackageInfo.h"
|
|
|
|
#include <binder/Parcel.h>
|
|
|
|
namespace android {
|
|
namespace security {
|
|
namespace keymaster {
|
|
|
|
KeyAttestationPackageInfo::KeyAttestationPackageInfo() = default;
|
|
|
|
KeyAttestationPackageInfo::KeyAttestationPackageInfo(const String16& packageName,
|
|
int64_t versionCode,
|
|
SharedSignaturesVector signatures)
|
|
: packageName_(new String16(packageName)), versionCode_(versionCode), signatures_(signatures) {}
|
|
|
|
status_t KeyAttestationPackageInfo::writeToParcel(Parcel* parcel) const {
|
|
auto rc = parcel->writeString16(packageName_);
|
|
if (rc != NO_ERROR) return rc;
|
|
rc = parcel->writeInt64(versionCode_);
|
|
if (rc != NO_ERROR) return rc;
|
|
return parcel->writeParcelableVector(signatures_);
|
|
}
|
|
|
|
status_t KeyAttestationPackageInfo::readFromParcel(const Parcel* parcel) {
|
|
auto rc = parcel->readString16(&packageName_);
|
|
if (rc != NO_ERROR) return rc;
|
|
rc = parcel->readInt64(&versionCode_);
|
|
if (rc != NO_ERROR) return rc;
|
|
|
|
std::unique_ptr<SignaturesVector> temp_vector;
|
|
rc = parcel->readParcelableVector(&temp_vector);
|
|
if (rc != NO_ERROR) return rc;
|
|
signatures_.reset(temp_vector.release());
|
|
return NO_ERROR;
|
|
}
|
|
|
|
} // namespace keymaster
|
|
} // namespace security
|
|
} // namespace android
|