tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Specify EcCurve when generating keys" am: a172a2309c

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

Change-Id: I3580bb939164f02e0f63593281976f1cac4587c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-05-11 22:54:32 +00:00 committed by Automerger Merge Worker
commit 97a9abddd8
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
security/keymint/aidl/vts/performance/KeyMintBenchmark.cpp
View file

@ -142,6 +142,25 @@ class KeyMintBenchmarkTest {
return Digest::NONE;
}
optional<EcCurve> getCurveFromLength(int keySize) {
switch (keySize) {
case 224:
return EcCurve::P_224;
break;
case 256:
return EcCurve::P_256;
break;
case 384:
return EcCurve::P_384;
break;
case 521:
return EcCurve::P_521;
break;
default:
return {};
}
}
bool GenerateKey(string transform, int keySize, bool sign = false) {
if (transform == key_transform_) {
return true;
@ -184,6 +203,12 @@ class KeyMintBenchmarkTest {
}
if (algorithm == Algorithm::EC) {
authSet.SetDefaultValidity();
std::optional<EcCurve> curve = getCurveFromLength(keySize);
if (!curve) {
std::cerr << "Error: invalid EC-Curve from size " << keySize << std::endl;
return false;
}
authSet.Authorization(TAG_EC_CURVE, curve.value());
}
error_ = GenerateKey(authSet);
return error_ == ErrorCode::OK;