Merge "Add attestation API to Android KeyStore." into nyc-dev (ea46bb2c) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

api/system-current.txt

+2 −0

api/test-current.txt

+2 −0

core/java/android/security/IKeystoreService.aidl

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package android.security;
	import android.security.keymaster.ExportResult;		import android.security.keymaster.ExportResult;
	import android.security.keymaster.KeyCharacteristics;		import android.security.keymaster.KeyCharacteristics;
	import android.security.keymaster.KeymasterArguments;		import android.security.keymaster.KeymasterArguments;
			import android.security.keymaster.KeymasterCertificateChain;
	import android.security.keymaster.KeymasterBlob;		import android.security.keymaster.KeymasterBlob;
	import android.security.keymaster.OperationResult;		import android.security.keymaster.OperationResult;
	import android.security.KeystoreArguments;		import android.security.KeystoreArguments;
	@@ -74,4 +75,5 @@ interface IKeystoreService {
	int addAuthToken(in byte[] authToken);		int addAuthToken(in byte[] authToken);
	int onUserAdded(int userId, int parentId);		int onUserAdded(int userId, int parentId);
	int onUserRemoved(int userId);		int onUserRemoved(int userId);
			int attestKey(String alias, in KeymasterArguments params, out KeymasterCertificateChain chain);
	}		}

core/java/android/security/keymaster/KeymasterCertificateChain.aidl

0 → 100644

+20 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2016 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.keymaster;

			/* @hide */
			parcelable KeymasterCertificateChain;

Original line number	Original line	Diff line number	Diff line
	@@ -34045,6 +34045,7 @@ package android.security.keystore {

	public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {		public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
	method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();		method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
			method public byte[] getAttestationChallenge();
	method public java.lang.String[] getBlockModes();		method public java.lang.String[] getBlockModes();
	method public java.util.Date getCertificateNotAfter();		method public java.util.Date getCertificateNotAfter();
	method public java.util.Date getCertificateNotBefore();		method public java.util.Date getCertificateNotBefore();
	@@ -34069,6 +34070,7 @@ package android.security.keystore {
	ctor public KeyGenParameterSpec.Builder(java.lang.String, int);		ctor public KeyGenParameterSpec.Builder(java.lang.String, int);
	method public android.security.keystore.KeyGenParameterSpec build();		method public android.security.keystore.KeyGenParameterSpec build();
	method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);		method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);
			method public android.security.keystore.KeyGenParameterSpec.Builder setAttestationChallenge(byte[]);
	method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);		method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);

Original line number	Original line	Diff line number	Diff line
	@@ -36528,6 +36528,7 @@ package android.security.keystore {

	public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {		public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
	method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();		method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
			method public byte[] getAttestationChallenge();
	method public java.lang.String[] getBlockModes();		method public java.lang.String[] getBlockModes();
	method public java.util.Date getCertificateNotAfter();		method public java.util.Date getCertificateNotAfter();
	method public java.util.Date getCertificateNotBefore();		method public java.util.Date getCertificateNotBefore();
	@@ -36552,6 +36553,7 @@ package android.security.keystore {
	ctor public KeyGenParameterSpec.Builder(java.lang.String, int);		ctor public KeyGenParameterSpec.Builder(java.lang.String, int);
	method public android.security.keystore.KeyGenParameterSpec build();		method public android.security.keystore.KeyGenParameterSpec build();
	method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);		method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);
			method public android.security.keystore.KeyGenParameterSpec.Builder setAttestationChallenge(byte[]);
	method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);		method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);

Original line number	Original line	Diff line number	Diff line
	@@ -34060,6 +34060,7 @@ package android.security.keystore {

	public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {		public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec {
	method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();		method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
			method public byte[] getAttestationChallenge();
	method public java.lang.String[] getBlockModes();		method public java.lang.String[] getBlockModes();
	method public java.util.Date getCertificateNotAfter();		method public java.util.Date getCertificateNotAfter();
	method public java.util.Date getCertificateNotBefore();		method public java.util.Date getCertificateNotBefore();
	@@ -34084,6 +34085,7 @@ package android.security.keystore {
	ctor public KeyGenParameterSpec.Builder(java.lang.String, int);		ctor public KeyGenParameterSpec.Builder(java.lang.String, int);
	method public android.security.keystore.KeyGenParameterSpec build();		method public android.security.keystore.KeyGenParameterSpec build();
	method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);		method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec);
			method public android.security.keystore.KeyGenParameterSpec.Builder setAttestationChallenge(byte[]);
	method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);		method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date);
	method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);		method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date);