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

Commit e2c59597 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix a couple of regular expressions." am: 9d99ac49 

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



Change-Id: I3acb08aebc1b0db68d93e38d3d67b5f22f2ee7d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8f53c63 9d99ac49

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+25 −23
Original line number Diff line number Diff line
@@ -1919,30 +1919,32 @@ void check_cose_key(const vector<uint8_t>& data, bool testMode) { 


    // The following check assumes that canonical CBOR encoding is used for the COSE_Key.

    if (testMode) {

        EXPECT_THAT(cppbor::prettyPrint(parsedPayload.get()),

                    MatchesRegex("{\n"

        EXPECT_THAT(

                cppbor::prettyPrint(parsedPayload.get()),

                MatchesRegex("\\{\n"

                             "  1 : 2,\n"   // kty: EC2

                             "  3 : -7,\n"  // alg: ES256

                             "  -1 : 1,\n"  // EC id: P256

                             // The regex {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}} matches a

                             // sequence of 32 hexadecimal bytes, enclosed in braces and

                             // separated by commas. In this case, some Ed25519 public key.

                                 "  -2 : {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}},\n"  // pub_x: data

                                 "  -3 : {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}},\n"  // pub_y: data

                             "  -2 : \\{(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}\\},\n"  // pub_x: data

                             "  -3 : \\{(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}\\},\n"  // pub_y: data

                             "  -70000 : null,\n"                                  // test marker

                                 "}"));

                             "\\}"));

    } else {

        EXPECT_THAT(cppbor::prettyPrint(parsedPayload.get()),

                    MatchesRegex("{\n"

        EXPECT_THAT(

                cppbor::prettyPrint(parsedPayload.get()),

                MatchesRegex("\\{\n"

                             "  1 : 2,\n"   // kty: EC2

                             "  3 : -7,\n"  // alg: ES256

                             "  -1 : 1,\n"  // EC id: P256

                             // The regex {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}} matches a

                             // sequence of 32 hexadecimal bytes, enclosed in braces and

                             // separated by commas. In this case, some Ed25519 public key.

                                 "  -2 : {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}},\n"  // pub_x: data

                                 "  -3 : {(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}},\n"  // pub_y: data

                                 "}"));

                             "  -2 : \\{(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}\\},\n"  // pub_x: data

                             "  -3 : \\{(0x[0-9a-f]{2}, ){31}0x[0-9a-f]{2}\\},\n"  // pub_y: data

                             "\\}"));

    }

}