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

Commit df62d41e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Provide alternate SE RoT provisioning path."

parents 7da30bd9 0f89bc12

trusty/keymaster/include/trusty_keymaster/TrustyKeyMintDevice.h

+8 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ namespace aidl::android::hardware::security::keymint::trusty { 
using ::keymaster::TrustyKeymaster;

using ::keymaster::TrustyKeymaster;

using ::ndk::ScopedAStatus;

using ::ndk::ScopedAStatus;

using secureclock::TimeStampToken;

using secureclock::TimeStampToken;

using ::std::array;

using ::std::optional;

using ::std::optional;

using ::std::shared_ptr;

using ::std::shared_ptr;

using ::std::vector;

using ::std::vector;
@@ -77,8 +78,13 @@ class TrustyKeyMintDevice : public BnKeyMintDevice { 
                               const optional<TimeStampToken>& timestampToken) override;

                               const optional<TimeStampToken>& timestampToken) override;

    ScopedAStatus earlyBootEnded() override;

    ScopedAStatus earlyBootEnded() override;





    ScopedAStatus convertStorageKeyToEphemeral(const std::vector<uint8_t>& storageKeyBlob,

    ScopedAStatus convertStorageKeyToEphemeral(const vector<uint8_t>& storageKeyBlob,

                                               std::vector<uint8_t>* ephemeralKeyBlob) override;

                                               vector<uint8_t>* ephemeralKeyBlob) override;



    ScopedAStatus getRootOfTrustChallenge(array<uint8_t, 16>* challenge) override;

    ScopedAStatus getRootOfTrust(const array<uint8_t, 16>& challenge,

                                 vector<uint8_t>* rootOfTrust) override;

    ScopedAStatus sendRootOfTrust(const vector<uint8_t>& rootOfTrust) override;





  protected:

  protected:

    std::shared_ptr<TrustyKeymaster> impl_;

    std::shared_ptr<TrustyKeymaster> impl_;

trusty/keymaster/keymint/TrustyKeyMintDevice.cpp

+14 −1
Original line number Original line Diff line number Diff line
@@ -306,7 +306,7 @@ ScopedAStatus TrustyKeyMintDevice::earlyBootEnded() { 
}

}





ScopedAStatus TrustyKeyMintDevice::convertStorageKeyToEphemeral(

ScopedAStatus TrustyKeyMintDevice::convertStorageKeyToEphemeral(

        const std::vector<uint8_t>& storageKeyBlob, std::vector<uint8_t>* ephemeralKeyBlob) {

        const vector<uint8_t>& storageKeyBlob, vector<uint8_t>* ephemeralKeyBlob) {

    keymaster::ExportKeyRequest request(impl_->message_version());

    keymaster::ExportKeyRequest request(impl_->message_version());

    request.SetKeyMaterial(storageKeyBlob.data(), storageKeyBlob.size());

    request.SetKeyMaterial(storageKeyBlob.data(), storageKeyBlob.size());

    request.key_format = KM_KEY_FORMAT_RAW;

    request.key_format = KM_KEY_FORMAT_RAW;
@@ -321,4 +321,17 @@ ScopedAStatus TrustyKeyMintDevice::convertStorageKeyToEphemeral( 
    return ScopedAStatus::ok();

    return ScopedAStatus::ok();

}

}





ScopedAStatus TrustyKeyMintDevice::getRootOfTrustChallenge(array<uint8_t, 16>* /* challenge */) {

    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);

}



ScopedAStatus TrustyKeyMintDevice::getRootOfTrust(const array<uint8_t, 16>& /* challenge */,

                                                  vector<uint8_t>* /* rootOfTrust */) {

    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);

}



ScopedAStatus TrustyKeyMintDevice::sendRootOfTrust(const vector<uint8_t>& /* rootOfTrust */) {

    return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED);

}



}  // namespace aidl::android::hardware::security::keymint::trusty
 
}  // namespace aidl::android::hardware::security::keymint::trusty