commit 6c44cad429721ebaf2216d412aa7f9417936cd70
author David Drysdale <drysdale@google.com> Mon Dec 13 16:01:21 2021 +0000
committer David Drysdale <drysdale@google.com> Mon Dec 13 16:01:21 2021 +0000
tree fa3393fd62968f2ffe893d773adfb95a47e5c8c1
parent e36d8b7e8f59cf47bf887679fd67b1e6e0a44966

Revert "keystore2: cope with new curve25519 enum"

Revert "Advertise support of KeyMint V2"

Revert submission 1900930-version-bump

Reason for revert: Broken build on sc-qpr1-dev-plus-aosp, b/210450339
Reverted Changes:
I42a9b854f:keystore2: cope with new curve25519 enum
I167d568d6:Bump keystore2 AIDL API version 1->2
I3a16d072e:Advertise support of KeyMint V2
Ibf2325329:KeyMint HAL: add curve 25519, bump version

Change-Id: I7db3a5941e86d4e85b1e74a595137c798079f646

keystore2/aidl/android/security/metrics/EcCurve.aidl

diff --git a/keystore2/aidl/android/security/metrics/EcCurve.aidl b/keystore2/aidl/android/security/metrics/EcCurve.aidl
index 7b1a5a2..b190d83 100644
--- a/keystore2/aidl/android/security/metrics/EcCurve.aidl
+++ b/keystore2/aidl/android/security/metrics/EcCurve.aidl
@@ -29,5 +29,4 @@
     P_256 = 2,
     P_384 = 3,
     P_521 = 4,
-    CURVE_25519 = 5,
 }
\ No newline at end of file

keystore2/src/km_compat/km_compat_type_conversion.h

diff --git a/keystore2/src/km_compat/km_compat_type_conversion.h b/keystore2/src/km_compat/km_compat_type_conversion.h
index 33248a4..de09477 100644
--- a/keystore2/src/km_compat/km_compat_type_conversion.h
+++ b/keystore2/src/km_compat/km_compat_type_conversion.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#include <optional>
-
-#include <aidl/android/hardware/security/keymint/EcCurve.h>
 #include <aidl/android/hardware/security/keymint/ErrorCode.h>
 #include <keymasterV4_1/keymaster_tags.h>
 #include <keymint_support/keymint_tags.h>
@@ -281,7 +278,7 @@
     }
 }
 
-static std::optional<V4_0::EcCurve> convert(KMV1::EcCurve e) {
+static V4_0::EcCurve convert(KMV1::EcCurve e) {
     switch (e) {
     case KMV1::EcCurve::P_224:
         return V4_0::EcCurve::P_224;
@@ -291,11 +288,7 @@
         return V4_0::EcCurve::P_384;
     case KMV1::EcCurve::P_521:
         return V4_0::EcCurve::P_521;
-    case KMV1::EcCurve::CURVE_25519:
-        // KeyMaster did not support curve 25519
-        return std::nullopt;
     }
-    return std::nullopt;
 }
 
 static KMV1::EcCurve convert(V4_0::EcCurve e) {
@@ -497,9 +490,7 @@
         break;
     case KMV1::Tag::EC_CURVE:
         if (auto v = KMV1::authorizationValue(KMV1::TAG_EC_CURVE, kp)) {
-            if (auto curve = convert(v->get())) {
-                return V4_0::makeKeyParameter(V4_0::TAG_EC_CURVE, curve.value());
-            }
+            return V4_0::makeKeyParameter(V4_0::TAG_EC_CURVE, convert(v->get()));
         }
         break;
     case KMV1::Tag::RSA_PUBLIC_EXPONENT:

keystore2/src/metrics_store.rs

diff --git a/keystore2/src/metrics_store.rs b/keystore2/src/metrics_store.rs
index 0b29b25..741d65e 100644
--- a/keystore2/src/metrics_store.rs
+++ b/keystore2/src/metrics_store.rs
@@ -287,7 +287,6 @@
                     EcCurve::P_256 => MetricsEcCurve::P_256,
                     EcCurve::P_384 => MetricsEcCurve::P_384,
                     EcCurve::P_521 => MetricsEcCurve::P_521,
-                    EcCurve::CURVE_25519 => MetricsEcCurve::CURVE_25519,
                     _ => MetricsEcCurve::EC_CURVE_UNSPECIFIED,
                 }
             }