Port to binderized keymaster HAL
This patch ports keystore to the HIDL based binderized keymaster HAL.
Keystore has no more dependencies on legacy keymaster headers, and
therefore data structures, constant declarations, or enums. All
keymaster related data structures and enums used by keystore are the
once defined by the HIDL based keymaster HAL definition. In the process
of porting, keystore underwent some changes:
* Keystore got a new implementation of AuthorizationSet that is fully
based on the new HIDL data structures. Key parameters are now either
organised as AuthorizationSets or hidl_vec<KeyParameter>. (Formerly,
this was a mixture of keymaster's AuthorizationSet,
std::vec<keymaster_key_param_t>, and keymaster_key_param_set_t.) The
former is used for memory management and provides algorithms for
assembling, joining, and subtracting sets of parameters. The latter
is used as wire format for the HAL IPC; it can wrap the memory owned
by an AuthorizationSet for this purpose. The AuthorizationSet is
accompanied by a new implementation of type safe functions for
creating and accessing tagged key parameters,
Authorizations (keystore/keymaster_tags.h).
* A new type (KSSReturnCode) was introduced that wraps keystore service
response codes. Keystore has two sets of error codes. ErrorCode
errors are less than 0 and use 0 as success value. ResponseCode
errors are greater than zero and use 1 as success value. This patch
changes ResponseCode to be an enum class so that is no longer
assignable to int without a cast. The new return type can only be
initialized by ResponseCode or ErrorCode and when accessed as int32_t,
which happens on serialization when the response is send to a client,
the success values are coalesced onto 1 as expected by the
clients. KSSreturnCode is also comparable to ResponseCode and
ErrorCode, and the predicate isOk() returns true if it was initialized
with either ErrorCode::OK (0) or ReponseCode::NO_ERROR (1).
* A bug was fixed, that caused the keystore verify function to return
success, regardless of the input, internal errors, or lack of
permissions.
* The marshalling code in IKeystoreService.cpp was rewritten. For data
structures that are known to keymaster, the client facing side of
keystore uses HIDL based data structures as (target) source
for (un)marshaling to avoid further conversion. hidl_vecs are used to
wrap parcel memory without copying and taking ownership where
possible.
* Explicit use of malloc is reduced (malloc was required by the C nature
of the old HAL). The new implementations avoid explicit use of
malloc/new and waive the use of pointers for return values. Instead,
functions return by value objects that take ownership of secondary
memory allocations where required.
Test: runtest --path=cts/tests/tests/keystore/src/android/keystore/cts
Bug: 32020919
Change-Id: I59d3a0f4a6bdf6bb3bbf791ad8827c463effa286
2016-10-13 19:43:45 +02:00
|
|
|
/*
|
|
|
|
|
**
|
|
|
|
|
** 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.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef LEGACY_KEYMASTER_DEVICE_WRAPPER_H_
|
|
|
|
|
#define LEGACY_KEYMASTER_DEVICE_WRAPPER_H_
|
|
|
|
|
|
|
|
|
|
#include <android/hardware/keymaster/3.0/IKeymasterDevice.h>
|
2017-02-17 20:29:42 +01:00
|
|
|
#include <hidl/Status.h>
|
2017-03-28 02:39:16 +02:00
|
|
|
#include <hidl/MQDescriptor.h>
|
Port to binderized keymaster HAL
This patch ports keystore to the HIDL based binderized keymaster HAL.
Keystore has no more dependencies on legacy keymaster headers, and
therefore data structures, constant declarations, or enums. All
keymaster related data structures and enums used by keystore are the
once defined by the HIDL based keymaster HAL definition. In the process
of porting, keystore underwent some changes:
* Keystore got a new implementation of AuthorizationSet that is fully
based on the new HIDL data structures. Key parameters are now either
organised as AuthorizationSets or hidl_vec<KeyParameter>. (Formerly,
this was a mixture of keymaster's AuthorizationSet,
std::vec<keymaster_key_param_t>, and keymaster_key_param_set_t.) The
former is used for memory management and provides algorithms for
assembling, joining, and subtracting sets of parameters. The latter
is used as wire format for the HAL IPC; it can wrap the memory owned
by an AuthorizationSet for this purpose. The AuthorizationSet is
accompanied by a new implementation of type safe functions for
creating and accessing tagged key parameters,
Authorizations (keystore/keymaster_tags.h).
* A new type (KSSReturnCode) was introduced that wraps keystore service
response codes. Keystore has two sets of error codes. ErrorCode
errors are less than 0 and use 0 as success value. ResponseCode
errors are greater than zero and use 1 as success value. This patch
changes ResponseCode to be an enum class so that is no longer
assignable to int without a cast. The new return type can only be
initialized by ResponseCode or ErrorCode and when accessed as int32_t,
which happens on serialization when the response is send to a client,
the success values are coalesced onto 1 as expected by the
clients. KSSreturnCode is also comparable to ResponseCode and
ErrorCode, and the predicate isOk() returns true if it was initialized
with either ErrorCode::OK (0) or ReponseCode::NO_ERROR (1).
* A bug was fixed, that caused the keystore verify function to return
success, regardless of the input, internal errors, or lack of
permissions.
* The marshalling code in IKeystoreService.cpp was rewritten. For data
structures that are known to keymaster, the client facing side of
keystore uses HIDL based data structures as (target) source
for (un)marshaling to avoid further conversion. hidl_vecs are used to
wrap parcel memory without copying and taking ownership where
possible.
* Explicit use of malloc is reduced (malloc was required by the C nature
of the old HAL). The new implementations avoid explicit use of
malloc/new and waive the use of pointers for return values. Instead,
functions return by value objects that take ownership of secondary
memory allocations where required.
Test: runtest --path=cts/tests/tests/keystore/src/android/keystore/cts
Bug: 32020919
Change-Id: I59d3a0f4a6bdf6bb3bbf791ad8827c463effa286
2016-10-13 19:43:45 +02:00
|
|
|
|
|
|
|
|
struct keymaster2_device;
|
|
|
|
|
typedef struct keymaster2_device keymaster2_device_t;
|
|
|
|
|
|
|
|
|
|
namespace android {
|
|
|
|
|
namespace keystore {
|
|
|
|
|
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::ErrorCode;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::IKeymasterDevice;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::KeyCharacteristics;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::KeyFormat;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::KeyParameter;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::KeyPurpose;
|
|
|
|
|
using ::android::hardware::keymaster::V3_0::Tag;
|
|
|
|
|
using ::android::hardware::Return;
|
|
|
|
|
using ::android::hardware::Void;
|
|
|
|
|
using ::android::hardware::hidl_vec;
|
|
|
|
|
using ::android::hardware::hidl_string;
|
|
|
|
|
using ::android::sp;
|
|
|
|
|
|
|
|
|
|
class LegacyKeymasterDeviceWrapper : public IKeymasterDevice {
|
|
|
|
|
public:
|
2019-01-04 22:34:17 +01:00
|
|
|
explicit LegacyKeymasterDeviceWrapper(keymaster2_device_t* dev);
|
Port to binderized keymaster HAL
This patch ports keystore to the HIDL based binderized keymaster HAL.
Keystore has no more dependencies on legacy keymaster headers, and
therefore data structures, constant declarations, or enums. All
keymaster related data structures and enums used by keystore are the
once defined by the HIDL based keymaster HAL definition. In the process
of porting, keystore underwent some changes:
* Keystore got a new implementation of AuthorizationSet that is fully
based on the new HIDL data structures. Key parameters are now either
organised as AuthorizationSets or hidl_vec<KeyParameter>. (Formerly,
this was a mixture of keymaster's AuthorizationSet,
std::vec<keymaster_key_param_t>, and keymaster_key_param_set_t.) The
former is used for memory management and provides algorithms for
assembling, joining, and subtracting sets of parameters. The latter
is used as wire format for the HAL IPC; it can wrap the memory owned
by an AuthorizationSet for this purpose. The AuthorizationSet is
accompanied by a new implementation of type safe functions for
creating and accessing tagged key parameters,
Authorizations (keystore/keymaster_tags.h).
* A new type (KSSReturnCode) was introduced that wraps keystore service
response codes. Keystore has two sets of error codes. ErrorCode
errors are less than 0 and use 0 as success value. ResponseCode
errors are greater than zero and use 1 as success value. This patch
changes ResponseCode to be an enum class so that is no longer
assignable to int without a cast. The new return type can only be
initialized by ResponseCode or ErrorCode and when accessed as int32_t,
which happens on serialization when the response is send to a client,
the success values are coalesced onto 1 as expected by the
clients. KSSreturnCode is also comparable to ResponseCode and
ErrorCode, and the predicate isOk() returns true if it was initialized
with either ErrorCode::OK (0) or ReponseCode::NO_ERROR (1).
* A bug was fixed, that caused the keystore verify function to return
success, regardless of the input, internal errors, or lack of
permissions.
* The marshalling code in IKeystoreService.cpp was rewritten. For data
structures that are known to keymaster, the client facing side of
keystore uses HIDL based data structures as (target) source
for (un)marshaling to avoid further conversion. hidl_vecs are used to
wrap parcel memory without copying and taking ownership where
possible.
* Explicit use of malloc is reduced (malloc was required by the C nature
of the old HAL). The new implementations avoid explicit use of
malloc/new and waive the use of pointers for return values. Instead,
functions return by value objects that take ownership of secondary
memory allocations where required.
Test: runtest --path=cts/tests/tests/keystore/src/android/keystore/cts
Bug: 32020919
Change-Id: I59d3a0f4a6bdf6bb3bbf791ad8827c463effa286
2016-10-13 19:43:45 +02:00
|
|
|
virtual ~LegacyKeymasterDeviceWrapper();
|
|
|
|
|
|
|
|
|
|
// Methods from ::android::hardware::keymaster::V3_0::IKeymasterDevice follow.
|
|
|
|
|
Return<void> getHardwareFeatures(getHardwareFeatures_cb _hidl_cb);
|
|
|
|
|
Return<ErrorCode> addRngEntropy(const hidl_vec<uint8_t>& data) override;
|
|
|
|
|
Return<void> generateKey(const hidl_vec<KeyParameter>& keyParams,
|
|
|
|
|
generateKey_cb _hidl_cb) override;
|
|
|
|
|
Return<void> getKeyCharacteristics(const hidl_vec<uint8_t>& keyBlob,
|
|
|
|
|
const hidl_vec<uint8_t>& clientId,
|
|
|
|
|
const hidl_vec<uint8_t>& appData,
|
|
|
|
|
getKeyCharacteristics_cb _hidl_cb) override;
|
|
|
|
|
Return<void> importKey(const hidl_vec<KeyParameter>& params, KeyFormat keyFormat,
|
|
|
|
|
const hidl_vec<uint8_t>& keyData, importKey_cb _hidl_cb) override;
|
|
|
|
|
Return<void> exportKey(KeyFormat exportFormat, const hidl_vec<uint8_t>& keyBlob,
|
|
|
|
|
const hidl_vec<uint8_t>& clientId, const hidl_vec<uint8_t>& appData,
|
|
|
|
|
exportKey_cb _hidl_cb) override;
|
|
|
|
|
Return<void> attestKey(const hidl_vec<uint8_t>& keyToAttest,
|
|
|
|
|
const hidl_vec<KeyParameter>& attestParams,
|
|
|
|
|
attestKey_cb _hidl_cb) override;
|
|
|
|
|
Return<void> upgradeKey(const hidl_vec<uint8_t>& keyBlobToUpgrade,
|
|
|
|
|
const hidl_vec<KeyParameter>& upgradeParams,
|
|
|
|
|
upgradeKey_cb _hidl_cb) override;
|
|
|
|
|
Return<ErrorCode> deleteKey(const hidl_vec<uint8_t>& keyBlob) override;
|
|
|
|
|
Return<ErrorCode> deleteAllKeys() override;
|
2017-01-23 22:21:11 +01:00
|
|
|
Return<ErrorCode> destroyAttestationIds() override;
|
Port to binderized keymaster HAL
This patch ports keystore to the HIDL based binderized keymaster HAL.
Keystore has no more dependencies on legacy keymaster headers, and
therefore data structures, constant declarations, or enums. All
keymaster related data structures and enums used by keystore are the
once defined by the HIDL based keymaster HAL definition. In the process
of porting, keystore underwent some changes:
* Keystore got a new implementation of AuthorizationSet that is fully
based on the new HIDL data structures. Key parameters are now either
organised as AuthorizationSets or hidl_vec<KeyParameter>. (Formerly,
this was a mixture of keymaster's AuthorizationSet,
std::vec<keymaster_key_param_t>, and keymaster_key_param_set_t.) The
former is used for memory management and provides algorithms for
assembling, joining, and subtracting sets of parameters. The latter
is used as wire format for the HAL IPC; it can wrap the memory owned
by an AuthorizationSet for this purpose. The AuthorizationSet is
accompanied by a new implementation of type safe functions for
creating and accessing tagged key parameters,
Authorizations (keystore/keymaster_tags.h).
* A new type (KSSReturnCode) was introduced that wraps keystore service
response codes. Keystore has two sets of error codes. ErrorCode
errors are less than 0 and use 0 as success value. ResponseCode
errors are greater than zero and use 1 as success value. This patch
changes ResponseCode to be an enum class so that is no longer
assignable to int without a cast. The new return type can only be
initialized by ResponseCode or ErrorCode and when accessed as int32_t,
which happens on serialization when the response is send to a client,
the success values are coalesced onto 1 as expected by the
clients. KSSreturnCode is also comparable to ResponseCode and
ErrorCode, and the predicate isOk() returns true if it was initialized
with either ErrorCode::OK (0) or ReponseCode::NO_ERROR (1).
* A bug was fixed, that caused the keystore verify function to return
success, regardless of the input, internal errors, or lack of
permissions.
* The marshalling code in IKeystoreService.cpp was rewritten. For data
structures that are known to keymaster, the client facing side of
keystore uses HIDL based data structures as (target) source
for (un)marshaling to avoid further conversion. hidl_vecs are used to
wrap parcel memory without copying and taking ownership where
possible.
* Explicit use of malloc is reduced (malloc was required by the C nature
of the old HAL). The new implementations avoid explicit use of
malloc/new and waive the use of pointers for return values. Instead,
functions return by value objects that take ownership of secondary
memory allocations where required.
Test: runtest --path=cts/tests/tests/keystore/src/android/keystore/cts
Bug: 32020919
Change-Id: I59d3a0f4a6bdf6bb3bbf791ad8827c463effa286
2016-10-13 19:43:45 +02:00
|
|
|
Return<void> begin(KeyPurpose purpose, const hidl_vec<uint8_t>& key,
|
|
|
|
|
const hidl_vec<KeyParameter>& inParams, begin_cb _hidl_cb) override;
|
|
|
|
|
Return<void> update(uint64_t operationHandle, const hidl_vec<KeyParameter>& inParams,
|
|
|
|
|
const hidl_vec<uint8_t>& input, update_cb _hidl_cb) override;
|
|
|
|
|
Return<void> finish(uint64_t operationHandle, const hidl_vec<KeyParameter>& inParams,
|
|
|
|
|
const hidl_vec<uint8_t>& input, const hidl_vec<uint8_t>& signature,
|
|
|
|
|
finish_cb _hidl_cb) override;
|
|
|
|
|
Return<ErrorCode> abort(uint64_t operationHandle) override;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
keymaster2_device_t* keymaster_device_;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
sp<IKeymasterDevice> makeSoftwareKeymasterDevice();
|
|
|
|
|
|
|
|
|
|
} // namespace keystore
|
|
|
|
|
} // namespace android
|
|
|
|
|
|
|
|
|
|
#endif // LEGACY_KEYMASTER_DEVICE_WRAPPER_H_
|
