diff options
| author | David Drysdale <drysdale@google.com> | 2021-12-13 16:36:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-13 16:36:59 +0000 |
| commit | 4df4387267ec816d06f275731fd13faec60370de (patch) | |
| tree | a0323e5f8d2f479dfbe548fad95bee55786ca1d9 /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | a7ee9f53ed5703c6c8c31e182aa7ff5f7b3aeac8 (diff) | |
| parent | f121b2c2bbce897b4537a4978064fed00e07db6e (diff) | |
Merge "Revert "KeyMint HAL: add curve 25519, bump version"" am: 391a772300 am: f121b2c2bb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1918632
Change-Id: I2cb8d4e77e93be8c0bfa84abf31190a30005f4b2
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintTest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index 161531d8f8..dc14771a14 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp @@ -6618,7 +6618,7 @@ INSTANTIATE_KEYMINT_AIDL_TEST(TransportLimitTest); typedef KeyMintAidlTestBase KeyAgreementTest; -static int EcdhCurveToOpenSslCurveName(EcCurve curve) { +int CurveToOpenSslCurveName(EcCurve curve) { switch (curve) { case EcCurve::P_224: return NID_secp224r1; @@ -6628,8 +6628,6 @@ static int EcdhCurveToOpenSslCurveName(EcCurve curve) { return NID_secp384r1; case EcCurve::P_521: return NID_secp521r1; - case EcCurve::CURVE_25519: - return NID_X25519; } } @@ -6651,7 +6649,7 @@ TEST_P(KeyAgreementTest, Ecdh) { for (auto localCurve : ValidCurves()) { // Generate EC key locally (with access to private key material) auto ecKey = EC_KEY_Ptr(EC_KEY_new()); - int curveName = EcdhCurveToOpenSslCurveName(localCurve); + int curveName = CurveToOpenSslCurveName(localCurve); auto group = EC_GROUP_Ptr(EC_GROUP_new_by_curve_name(curveName)); ASSERT_NE(group, nullptr); ASSERT_EQ(EC_KEY_set_group(ecKey.get(), group.get()), 1); |