34abaaefcb
- The docs said that IdentityCredential.createEphemeralKey() returned data encoded PKCS#8 which is wrong. It's supposed to be in DER format which is also what the VTS tests and credstore expects. - Clarify that createEphemeralKeyPair(), setReaderEphemeralPublicKey(), and createAuthChallenge() are all optional. - Avoid passing an invalid profile ID in the IdentityCredentialTests. verifyOneProfileAndEntryPass test. - Update requirements for which tags must be present in the attestation for CredentialKey as well as the requirements on expiration date and the issuer name. Update default implementation to satisfy these requirements. Update VTS tests to carefully verify these requrements are met. - Clarify requirements for X.509 cert for AuthenticationKey. Add VTS test to verify. - Mandate that TAG_IDENTITY_CREDENTIAL_KEY must not be set for test credentials. Add VTS test to verify this. - Make default implementation pretend to be implemented in a trusted environment and streamline VTS tests to not special-case for the default implementation. - Switch to using the attestation extension parser from the KM 4.1 support library instead of the one from system/keymaster. The latter one did not support the latest attestation extension and thus would fail for pretty much anything that wasn't the default HAL impl. - Fix a couple of bugs in keymaster::V4_1::parse_attestation_record(): - Report root_of_trust.security_level - Add support for Tag::IDENTITY_CREDENTIAL_KEY - Fix how EMacKey is calculated. - Add test vectors to verify how EMacKey and DeviceMac is calculated. Test: atest VtsHalIdentityTargetTest Test: atest android.security.identity.cts Bug: 171745570 Change-Id: I2f8bd772de078556733f769cec2021918d1d7de6
127 lines
4.9 KiB
C++
127 lines
4.9 KiB
C++
/*
|
|
* Copyright 2019, 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.
|
|
*/
|
|
|
|
#ifndef ANDROID_HARDWARE_IDENTITY_IDENTITYCREDENTIAL_H
|
|
#define ANDROID_HARDWARE_IDENTITY_IDENTITYCREDENTIAL_H
|
|
|
|
#include <aidl/android/hardware/identity/BnIdentityCredential.h>
|
|
#include <aidl/android/hardware/keymaster/HardwareAuthToken.h>
|
|
#include <aidl/android/hardware/keymaster/VerificationToken.h>
|
|
#include <android/hardware/identity/support/IdentityCredentialSupport.h>
|
|
|
|
#include <map>
|
|
#include <set>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <cppbor/cppbor.h>
|
|
|
|
namespace aidl::android::hardware::identity {
|
|
|
|
using ::aidl::android::hardware::keymaster::HardwareAuthToken;
|
|
using ::aidl::android::hardware::keymaster::VerificationToken;
|
|
using ::std::map;
|
|
using ::std::set;
|
|
using ::std::string;
|
|
using ::std::vector;
|
|
|
|
class IdentityCredential : public BnIdentityCredential {
|
|
public:
|
|
IdentityCredential(const vector<uint8_t>& credentialData)
|
|
: credentialData_(credentialData),
|
|
numStartRetrievalCalls_(0),
|
|
authChallenge_(0),
|
|
expectedDeviceNameSpacesSize_(0) {}
|
|
|
|
// Parses and decrypts credentialData_, return a status code from
|
|
// IIdentityCredentialStore. Must be called right after construction.
|
|
int initialize();
|
|
|
|
// Methods from IIdentityCredential follow.
|
|
ndk::ScopedAStatus deleteCredential(vector<uint8_t>* outProofOfDeletionSignature) override;
|
|
ndk::ScopedAStatus createEphemeralKeyPair(vector<uint8_t>* outKeyPair) override;
|
|
ndk::ScopedAStatus setReaderEphemeralPublicKey(const vector<uint8_t>& publicKey) override;
|
|
ndk::ScopedAStatus createAuthChallenge(int64_t* outChallenge) override;
|
|
ndk::ScopedAStatus setRequestedNamespaces(
|
|
const vector<RequestNamespace>& requestNamespaces) override;
|
|
ndk::ScopedAStatus setVerificationToken(const VerificationToken& verificationToken) override;
|
|
ndk::ScopedAStatus startRetrieval(
|
|
const vector<SecureAccessControlProfile>& accessControlProfiles,
|
|
const HardwareAuthToken& authToken, const vector<uint8_t>& itemsRequest,
|
|
const vector<uint8_t>& signingKeyBlob, const vector<uint8_t>& sessionTranscript,
|
|
const vector<uint8_t>& readerSignature, const vector<int32_t>& requestCounts) override;
|
|
ndk::ScopedAStatus startRetrieveEntryValue(
|
|
const string& nameSpace, const string& name, int32_t entrySize,
|
|
const vector<int32_t>& accessControlProfileIds) override;
|
|
ndk::ScopedAStatus retrieveEntryValue(const vector<uint8_t>& encryptedContent,
|
|
vector<uint8_t>* outContent) override;
|
|
ndk::ScopedAStatus finishRetrieval(vector<uint8_t>* outMac,
|
|
vector<uint8_t>* outDeviceNameSpaces) override;
|
|
ndk::ScopedAStatus generateSigningKeyPair(vector<uint8_t>* outSigningKeyBlob,
|
|
Certificate* outSigningKeyCertificate) override;
|
|
|
|
private:
|
|
// Set by constructor
|
|
vector<uint8_t> credentialData_;
|
|
int numStartRetrievalCalls_;
|
|
|
|
// Set by initialize()
|
|
string docType_;
|
|
bool testCredential_;
|
|
vector<uint8_t> storageKey_;
|
|
vector<uint8_t> credentialPrivKey_;
|
|
|
|
// Set by createEphemeralKeyPair()
|
|
vector<uint8_t> ephemeralPublicKey_;
|
|
|
|
// Set by setReaderEphemeralPublicKey()
|
|
vector<uint8_t> readerPublicKey_;
|
|
|
|
// Set by createAuthChallenge()
|
|
uint64_t authChallenge_;
|
|
|
|
// Set by setRequestedNamespaces()
|
|
vector<RequestNamespace> requestNamespaces_;
|
|
|
|
// Set by setVerificationToken().
|
|
VerificationToken verificationToken_;
|
|
|
|
// Set at startRetrieval() time.
|
|
map<int32_t, int> profileIdToAccessCheckResult_;
|
|
vector<uint8_t> signingKeyBlob_;
|
|
vector<uint8_t> sessionTranscript_;
|
|
vector<uint8_t> itemsRequest_;
|
|
vector<int32_t> requestCountsRemaining_;
|
|
map<string, set<string>> requestedNameSpacesAndNames_;
|
|
cppbor::Map deviceNameSpacesMap_;
|
|
cppbor::Map currentNameSpaceDeviceNameSpacesMap_;
|
|
|
|
// Calculated at startRetrieval() time.
|
|
size_t expectedDeviceNameSpacesSize_;
|
|
|
|
// Set at startRetrieveEntryValue() time.
|
|
string currentNameSpace_;
|
|
string currentName_;
|
|
size_t entryRemainingBytes_;
|
|
vector<uint8_t> entryValue_;
|
|
vector<uint8_t> entryAdditionalData_;
|
|
|
|
size_t calcDeviceNameSpacesSize();
|
|
};
|
|
|
|
} // namespace aidl::android::hardware::identity
|
|
|
|
#endif // ANDROID_HARDWARE_IDENTITY_IDENTITYCREDENTIAL_H
|