b4834ae3fa
The code in question talks to KeyStore which returns error codes which are a mix of keystore and keymaster error codes. To better match the layering of KeyStore on top of keystore and keymaster, this CL renames KeymasterException into KeyStoreException. It also adds human-readable error messages to exceptions raised by keystore rather than keymaster (e.g., key not found). Bug: 18088752 Change-Id: I4cd1235e16518c9f2e8c5557a457774c6e687b88
64 lines
2.2 KiB
Java
64 lines
2.2 KiB
Java
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package android.security;
|
|
|
|
import android.security.keymaster.KeyCharacteristics;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
|
|
/**
|
|
* @hide
|
|
*/
|
|
public abstract class KeymasterUtils {
|
|
private KeymasterUtils() {}
|
|
|
|
public static Integer getInt(KeyCharacteristics keyCharacteristics, int tag) {
|
|
if (keyCharacteristics.hwEnforced.containsTag(tag)) {
|
|
return keyCharacteristics.hwEnforced.getInt(tag, -1);
|
|
} else if (keyCharacteristics.swEnforced.containsTag(tag)) {
|
|
return keyCharacteristics.swEnforced.getInt(tag, -1);
|
|
} else {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
public static List<Integer> getInts(KeyCharacteristics keyCharacteristics, int tag) {
|
|
List<Integer> result = new ArrayList<Integer>();
|
|
result.addAll(keyCharacteristics.hwEnforced.getInts(tag));
|
|
result.addAll(keyCharacteristics.swEnforced.getInts(tag));
|
|
return result;
|
|
}
|
|
|
|
public static Date getDate(KeyCharacteristics keyCharacteristics, int tag) {
|
|
Date result = keyCharacteristics.hwEnforced.getDate(tag, null);
|
|
if (result == null) {
|
|
result = keyCharacteristics.swEnforced.getDate(tag, null);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public static boolean getBoolean(KeyCharacteristics keyCharacteristics, int tag) {
|
|
if (keyCharacteristics.hwEnforced.containsTag(tag)) {
|
|
return keyCharacteristics.hwEnforced.getBoolean(tag, false);
|
|
} else {
|
|
return keyCharacteristics.swEnforced.getBoolean(tag, false);
|
|
}
|
|
}
|
|
}
|