Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a07ed48 authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Switch to new NG AndroidKeymaster3Device 

Test: VtsHalKeymasterV3_0TargetTest
Bug: 67358942
Change-Id: Idc7ac599c359b3af2e4866b9eb446a05e96132a0
parent b17178a1

keymaster/3.0/default/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcrypto \

    libkeymaster_portable \

    libkeymaster_staging \

    libpuresoftkeymasterdevice \

    libkeymaster3device \

    libhidlbase \

    libhidltransport \

    libutils \

keymaster/3.0/default/KeymasterDevice.cpp

+36 −675

File changed.

Preview size limit exceeded, changes collapsed.

keymaster/3.0/default/KeymasterDevice.h

+0 −64
Original line number Diff line number Diff line
@@ -18,78 +18,14 @@ 
#ifndef HIDL_GENERATED_android_hardware_keymaster_V3_0_KeymasterDevice_H_

#define HIDL_GENERATED_android_hardware_keymaster_V3_0_KeymasterDevice_H_



#include <hardware/keymaster2.h>



#include <android/hardware/keymaster/3.0/IKeymasterDevice.h>

#include <hidl/Status.h>



#include <hidl/MQDescriptor.h>

namespace android {

namespace hardware {

namespace keymaster {

namespace V3_0 {

namespace implementation {



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::Return;

using ::android::hardware::Void;

using ::android::hardware::hidl_vec;

using ::android::hardware::hidl_string;

using ::android::sp;



class KeymasterDevice : public IKeymasterDevice {

  public:

    KeymasterDevice(keymaster2_device_t* dev, uint32_t hardware_version, bool hardware_supports_ec,

                    bool hardware_supports_all_digests)

        : keymaster_device_(dev), hardware_version_(hardware_version),

          hardware_supports_ec_(hardware_supports_ec),

          hardware_supports_all_digests_(hardware_supports_all_digests) {}

    virtual ~KeymasterDevice();



    // 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;

    Return<ErrorCode> destroyAttestationIds() override;

    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_;

    uint32_t hardware_version_;

    bool hardware_supports_ec_;

    bool hardware_supports_all_digests_;

};



extern "C" IKeymasterDevice* HIDL_FETCH_IKeymasterDevice(const char* name);



}  // namespace implementation