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

am fba667fc: am bb15653d: Merge "Add support for specifying which key types are supported"

Browse source 
* commit 'fba667fca3fce012bc5d4703f0e2d4f3ef06cfb6':
  Add support for specifying which key types are supported
This commit is contained in:
Kenny Root 2014-05-07 19:37:18 +00:00 committed by Android Git Automerger
commit 3080ea76d2
1 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
keystore/keystore.cpp
View file

@ -1779,7 +1779,7 @@ public:
return ::SYSTEM_ERROR;
}
if (device->common.module->module_api_version >= KEYMASTER_MODULE_API_VERSION_0_2) {
if (isKeyTypeSupported(device, TYPE_DSA)) {
rc = device->generate_keypair(device, TYPE_DSA, &dsa_params, &data, &dataLength);
} else {
isFallback = true;
@ -1797,7 +1797,7 @@ public:
}
ec_params.field_size = keySize;
if (device->common.module->module_api_version >= KEYMASTER_MODULE_API_VERSION_0_2) {
if (isKeyTypeSupported(device, TYPE_EC)) {
rc = device->generate_keypair(device, TYPE_EC, &ec_params, &data, &dataLength);
} else {
isFallback = true;
@ -2321,6 +2321,33 @@ private:
return false;
}
bool isKeyTypeSupported(const keymaster_device_t* device, keymaster_keypair_t keyType) {
const int32_t device_api = device->common.module->module_api_version;
if (device_api == KEYMASTER_MODULE_API_VERSION_0_2) {
switch (keyType) {
case TYPE_RSA:
case TYPE_DSA:
case TYPE_EC:
return true;
default:
return false;
}
} else if (device_api >= KEYMASTER_MODULE_API_VERSION_0_3) {
switch (keyType) {
case TYPE_RSA:
return true;
case TYPE_DSA:
return device->flags & KEYMASTER_SUPPORTS_DSA;
case TYPE_EC:
return device->flags & KEYMASTER_SUPPORTS_EC;
default:
return false;
}
} else {
return keyType == TYPE_RSA;
}
}
::KeyStore* mKeyStore;
};