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

Commit 30c4aad3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5667572 from 104213b6 to qt-c2f2-release

Change-Id: I2dd0cc2badf99172c610f1b32d02b3dc7dfaa6b1
parents b2d889da 104213b6
Loading
Loading
Loading
Loading
+10 −10
Original line number Original line Diff line number Diff line
@@ -3286,16 +3286,6 @@ enum DiagnosticFloatSensorIndex : int32_t {
 * the message is decoded.
 * the message is decoded.
 */
 */
enum VmsMessageType : int32_t {
enum VmsMessageType : int32_t {
    /**
     * A notification indicating that the sender has been reset.
     *
     * The receiving party must reset its internal state and respond to the
     * sender with a START_SESSION message as acknowledgement.
     *
     * This message type uses enum VmsStartSessionMessageIntegerValuesIndex.
     */
    START_SESSION = 17,

    /**
    /**
     * A request from the subscribers to the VMS service to subscribe to a layer.
     * A request from the subscribers to the VMS service to subscribe to a layer.
     *
     *
@@ -3412,6 +3402,16 @@ enum VmsMessageType : int32_t {
     */
     */
    PUBLISHER_INFORMATION_RESPONSE = 16,
    PUBLISHER_INFORMATION_RESPONSE = 16,


    /**
     * A notification indicating that the sender has been reset.
     *
     * The receiving party must reset its internal state and respond to the
     * sender with a START_SESSION message as acknowledgement.
     *
     * This message type uses enum VmsStartSessionMessageIntegerValuesIndex.
     */
    START_SESSION = 17,

    LAST_VMS_MESSAGE_TYPE = START_SESSION,
    LAST_VMS_MESSAGE_TYPE = START_SESSION,
};
};


+0 −22
Original line number Original line Diff line number Diff line
@@ -4218,28 +4218,6 @@ TEST_F(AttestationTest, RsaAttestationRequiresAppId) {
                        &cert_chain));
                        &cert_chain));
}
}


/*
 * AttestationTest.RsaAttestationRequiresCorrectAppId
 *
 * Verifies that attesting to RSA requires the correct app ID.
 */
TEST_F(AttestationTest, RsaAttestationRequiresCorrectAppId) {
    ASSERT_EQ(ErrorCode::OK,
              GenerateKey(AuthorizationSetBuilder()
                                  .Authorization(TAG_NO_AUTH_REQUIRED)
                                  .RsaSigningKey(2048, 65537)
                                  .Digest(Digest::NONE)
                                  .Padding(PaddingMode::NONE)
                                  .Authorization(TAG_APPLICATION_ID, HidlBuf("lol"))));

    hidl_vec<hidl_vec<uint8_t>> cert_chain;
    EXPECT_EQ(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING,
              AttestKey(AuthorizationSetBuilder()
                                .Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge"))
                                .Authorization(TAG_APPLICATION_ID, HidlBuf("heh")),
                        &cert_chain));
}

/*
/*
 * AttestationTest.EcAttestation
 * AttestationTest.EcAttestation
 *
 *