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

Commit 4135f16e authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "secure_element: Check for support of basic channel in VTS tests" am: 6ec1d545 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2419541



Change-Id: I0c4c4b1b39d4a8478921475c8ed92603cc8dab78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5047dd5c 6ec1d545

secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp

+29 −9
Original line number Diff line number Diff line
@@ -106,6 +106,15 @@ class SecureElementAidl : public ::testing::TestWithParam<std::string> { 


        EXPECT_OK(secure_element_->init(secure_element_callback_));

        secure_element_callback_->expectCallbackHistory({true});



        // Check if the basic channel is supported by the bound SE.

        std::vector<uint8_t> basic_channel_response;

        auto status =

                secure_element_->openBasicChannel(kSelectableAid, 0x00, &basic_channel_response);

        if (status.isOk()) {

            basic_channel_supported_ = true;

            secure_element_->closeChannel(0);

        }

    }



    void TearDown() override {
@@ -143,6 +152,7 @@ class SecureElementAidl : public ::testing::TestWithParam<std::string> { 


    std::shared_ptr<ISecureElement> secure_element_;

    std::shared_ptr<MySecureElementCallback> secure_element_callback_;

    bool basic_channel_supported_{false};

};



TEST_P(SecureElementAidl, init) {
@@ -159,14 +169,18 @@ TEST_P(SecureElementAidl, reset) { 
    LogicalChannelResponse logical_channel_response;



    // reset called after init shall succeed.

    if (basic_channel_supported_) {

        EXPECT_OK(secure_element_->openBasicChannel(kSelectableAid, 0x00, &basic_channel_response));

    }

    EXPECT_OK(secure_element_->openLogicalChannel(kSelectableAid, 0x00, &logical_channel_response));



    EXPECT_OK(secure_element_->reset());

    secure_element_callback_->expectCallbackHistory({true, false, true});



    // All opened channels must be closed.

    if (basic_channel_supported_) {

        EXPECT_NE(transmit(0), 0x9000);

    }

    EXPECT_NE(transmit(logical_channel_response.channelNumber), 0x9000);

}
@@ -190,6 +204,10 @@ TEST_P(SecureElementAidl, getAtr) { 
TEST_P(SecureElementAidl, openBasicChannel) {

    std::vector<uint8_t> response;



    if (!basic_channel_supported_) {

        return;

    }



    // openBasicChannel called with an invalid AID shall fail.

    EXPECT_ERR(secure_element_->openBasicChannel(kNonSelectableAid, 0x00, &response));
@@ -199,7 +217,7 @@ TEST_P(SecureElementAidl, openBasicChannel) { 
    EXPECT_OK(secure_element_->openBasicChannel(kSelectableAid, 0x00, &response));

    EXPECT_GE(response.size(), 2u);



    // tramsmit called on the basic channel should succeed.

    // transmit called on the basic channel should succeed.

    EXPECT_EQ(transmit(0), 0x9000);



    // openBasicChannel called a second time shall fail.
@@ -225,7 +243,7 @@ TEST_P(SecureElementAidl, openLogicalChannel) { 
    EXPECT_GE(response.channelNumber, 1u);

    EXPECT_LE(response.channelNumber, 19u);



    // tramsmit called on the logical channel should succeed.

    // transmit called on the logical channel should succeed.

    EXPECT_EQ(transmit(response.channelNumber), 0x9000);

}
@@ -239,17 +257,19 @@ TEST_P(SecureElementAidl, closeChannel) { 
    EXPECT_ERR(secure_element_->closeChannel(1));



    // closeChannel called on basic channel closes the basic channel.

    if (basic_channel_supported_) {

        EXPECT_OK(secure_element_->openBasicChannel(kSelectableAid, 0x00, &basic_channel_response));

        EXPECT_OK(secure_element_->closeChannel(0));



    // tramsmit called on the basic channel should fail.

        // transmit called on the basic channel should fail.

        EXPECT_NE(transmit(0), 0x9000);

    }



    // closeChannel called on logical channel closes the logical channel.

    EXPECT_OK(secure_element_->openLogicalChannel(kSelectableAid, 0x00, &logical_channel_response));

    EXPECT_OK(secure_element_->closeChannel(logical_channel_response.channelNumber));



    // tramsmit called on the basic channel should fail.

    // transmit called on the logical channel should fail.

    EXPECT_NE(transmit(logical_channel_response.channelNumber), 0x9000);

}