diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-02-15 21:12:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-15 21:12:29 +0000 |
| commit | a24d0252121bdb72b77a1a2fca93adf26f6a522d (patch) | |
| tree | c0c1c2561a93ba4f1e7ed85c2f3efeff161928bb | |
| parent | 2144164526d4f82adcc9cd5a0377d85bed9981aa (diff) | |
| parent | 20fa0e7c2ef8b9ce08a67cd0a734ad1dc9c74849 (diff) | |
| download | base-a24d0252121bdb72b77a1a2fca93adf26f6a522d.tar.gz | |
Merge "Adding framework check for 3DES key size"
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java index aa2917484a05..3dc884eb38ad 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreKeyGeneratorSpi.java @@ -17,7 +17,6 @@ package android.security.keystore; import android.security.Credentials; -import android.security.GateKeeper; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; import android.security.keymaster.KeymasterArguments; @@ -204,7 +203,12 @@ public abstract class AndroidKeyStoreKeyGeneratorSpi extends KeyGeneratorSpi { } } } - + if (mKeymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_3DES) { + if (mKeySizeBits != 168) { + throw new InvalidAlgorithmParameterException( + "3DES key size must be 168 bits."); + } + } if (mKeymasterAlgorithm == KeymasterDefs.KM_ALGORITHM_HMAC) { if (mKeySizeBits < 64) { throw new InvalidAlgorithmParameterException( |