diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-07-21 13:38:48 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-07-28 13:00:56 -0600 |
| commit | e4928a2912297751108c7045ce3343ec63edcc01 (patch) | |
| tree | abd65971cc8d06e43eebc57bf70232b45c30ea72 /keystore/java/android/security/keystore/KeyProperties.java | |
| parent | 350662197542d406df58aa65afddc9e23f9309d3 (diff) | |
| download | frameworks_base-e4928a2912297751108c7045ce3343ec63edcc01.zip frameworks_base-e4928a2912297751108c7045ce3343ec63edcc01.tar.gz frameworks_base-e4928a2912297751108c7045ce3343ec63edcc01.tar.bz2 | |
Keymaster digest/padding NONE no longer means ANY.
This adjusts the public API documentation to no longer say that
digest/padding NONE means any digest/padding. This also changes the
implementation of legacy key generation and import to explicitly
list which digests/paddings the generated/imported key is authorized
for. Previously, such keys were simply authorized for digest NONE and
padding NONE.
Bug: 22556114
Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca
Diffstat (limited to 'keystore/java/android/security/keystore/KeyProperties.java')
| -rw-r--r-- | keystore/java/android/security/keystore/KeyProperties.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/keystore/java/android/security/keystore/KeyProperties.java b/keystore/java/android/security/keystore/KeyProperties.java index 2b49297..d6b1cf1 100644 --- a/keystore/java/android/security/keystore/KeyProperties.java +++ b/keystore/java/android/security/keystore/KeyProperties.java @@ -364,9 +364,6 @@ public abstract class KeyProperties { /** * No encryption padding. - * - * <p><b>NOTE</b>: If a key is authorized to be used with no padding, then it can be used with - * any padding scheme, both for encryption and signing. */ public static final String ENCRYPTION_PADDING_NONE = "NoPadding"; @@ -513,9 +510,6 @@ public abstract class KeyProperties { /** * No digest: sign/authenticate the raw message. - * - * <p><b>NOTE</b>: If a key is authorized to be used with no digest, then it can be used with - * any digest. */ public static final String DIGEST_NONE = "NONE"; |