summaryrefslogtreecommitdiffstats
path: root/keystore
Commit message (Collapse)AuthorAgeFilesLines
* Add more examples of generating/importing keys to Javadocs.Alex Klyubin2015-08-112-38/+227
| | | | | | | | | | Based on developer feedback, this updates Android Keystore Javadocs with more examples of generating and importing keys of various algorithms. This also clarifies that key use authorizations apply to secret and private key and do no apply to public keys. Bug: 23102874 Change-Id: If0dc20fda4836fd23b9cd9c92490a04e71b19fc0
* Merge "Raw RSA Cipher relies on keymaster for padding and range checks." ↵Shawn Willden2015-07-301-90/+0
|\ | | | | | | into mnc-dev
| * Raw RSA Cipher relies on keymaster for padding and range checks.Alex Klyubin2015-07-221-90/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Android Keystore's RSA/ECB/NoPadding Cipher implementation rely on the underlying keystore/keymaster to left-pad the input (if necessary) and to reject invalid input. Prior to this change the Cipher implementation attempted to do it itself, but wasn't doing it right anyway. This fixes a regression where Android Keystore's raw RSA Cipher ("RSA/ECB/NoPadding") refused to encrypt plaintexts of the same length (in bytes) as RSA modulus which were nevertheless numerically smaller than the RSA modulus. Bug: 22599805 Change-Id: I591a8115a574eaf8f6075f29b50d93a87532c5eb
* | Keymaster digest/padding NONE no longer means ANY.Alex Klyubin2015-07-285-55/+65
|/ | | | | | | | | | | | 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
* Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-devAlex Klyubin2015-07-224-2/+55
|\
| * Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.Alex Klyubin2015-07-164-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Android Keystore add the KM_MIN_MAC_LENGTH tag to generated and imported HMAC and AES-GCM keys. This tag specifies the minimum length of the MAC/authentication tag authorized to be used for the key. For HMAC keys the minimum MAC length is set to the length of the digest associated with the key (HMAC keys are authorized for exactly one digest). For AES keys the minimum authetication tag length is set to 96 bit. This is the minimum supported by Android Keystore's AES-GCM implementation. Bug: 22337277 Change-Id: Ic6e47cf084734d1592788dc58088889f7fff74eb
* | Merge "KM module may consume less input than provided by finish time." into ↵Alex Klyubin2015-07-211-23/+71
|\ \ | |/ |/| | | mnc-dev
| * KM module may consume less input than provided by finish time.Alex Klyubin2015-07-161-23/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | Keymaster1 HAL permits the implementation of "update" operation to leave some input unconsumed by the time "finish" operation neeeds to be invoked. This needs to be treated as "invalid input" error rather than a "can't happen" exception. This CL was confirmed to fix the issue by the vendor who encountered the issue. Bug: 22512100 Change-Id: Ibb1a37d58f650d03605612559a154ce2416d147c
* | HMAC keys are authorized for exactly one digest.Alex Klyubin2015-07-164-71/+55
|/ | | | | | | | | | This is in preparation for enforcing the minimum length of MACs which in the case of HMAC keys generated or imported by Android Keystore will be set to the length of the digest for which the key is authorized. Bug: 22337277 Change-Id: I0255d5ba184dabfb6b45d8f32ddadeb84ab7fc19
* Fix Android Keystore key factories to obey JCA contract.Alex Klyubin2015-07-132-13/+23
| | | | | | | | | | Android Keystore provider's KeyFactory and SecretKeyFactory implementations were throwing UnsupportedOperationException instead of InvalidKeyException/InvalidKeySpecException from their translateKey/generateKey methods. Bug: 22459811 Change-Id: I6d5a5dc1bed724e858ad324d558b7480b9b848da
* Merge "Reject AlgorithmParameters of wrong type." into mnc-devAlex Klyubin2015-07-082-0/+12
|\
| * Reject AlgorithmParameters of wrong type.Alex Klyubin2015-07-072-0/+12
| | | | | | | | | | | | | | | | | | | | This makes Android Keystore Cipher implementations reject rather than ignore AlgorithmParameters of wrong algorithm type. The danger in not doing so is that a Cipher will produce output that does not actually depend on the provided AlgorithmParameters. Bug: 22330716 Change-Id: Ifa9de2c74f2fe4b738a3731c895059dddd075a13
* | Merge "Support loading AES keys with authorized digests." into mnc-devAlex Klyubin2015-07-071-4/+0
|\ \ | |/ |/|
| * Support loading AES keys with authorized digests.Alex Klyubin2015-07-061-4/+0
| | | | | | | | | | | | | | | | Due to a bug, Android Keystore failed to load AES keys authorized for use with one or more digests. This CL fixes this bug. Bug: 22300737 Change-Id: Ia49e27833dddb526565e4dc4977ed1e352e5836b
* | Avoid IllegalStateException when generating/importing keys.Alex Klyubin2015-07-064-89/+105
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids IllegalStateException when generating/importing keys which require user authentication when the system is not configured to generate/import such keys (e.g., secure lock screen not set up). The documentation states that before generating/importing such keys apps should check (using public API) whether the system is in a suitable state. However, some apps are not doing that and instead catching the IllegalStateException thrown during key generation/import. This is a bad practice because this exception is an undocumented implementation detail and should thus not be depended upon. This CL addresses this issue as follows: 1. Key(Pair)Generator.init now throws a checked InvalidAlgorithmParameterException when the system is in a wrong state. Because in most uses of Key(Pair)Generator .init is immediately followed by .generate, this prevents .generate from encountering this state and does so using a checked exception which is part of public API. 2. Key import rethrows the IllegalStateException as a checked KeyStoreException which is meant to be thrown if the key cannot be imported for any reason. Key(Pair)Generator.generate unfortunately cannot throw any checked exceptions and thus has to continue throwing unchecked exceptions. Bug: 22262809 Change-Id: Ic0f7b7a90e0ba63df9139c79b80a8649d2645d2a
* Merge "KeyChain: annotate with @WorkerThread" into mnc-devRobin Lee2015-07-031-4/+15
|\
| * KeyChain: annotate with @WorkerThreadRobin Lee2015-06-301-4/+15
| | | | | | | | | | | | | | | | Several methods need to be called off the main UI thread. This is the first documentation of that requirement. Bug: 19440165 Change-Id: I0303011c0ded6ec1efa92119c1e02a8a39b14a59
* | Enforce IND-CPA requirement when generating asymmetric keys.Alex Klyubin2015-06-292-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enforces the randomized encryption requirement (IND-CPA), if requested, when generating asymmetric key pairs. Whether randomized encryption is used depends on the encryption padding modes authorized for the key pair. Thus, if randomized encryption is required, the KeyPairGenerator must reject attempts to generate keys authorized for encryption using non-compliant padding schemes. This is similar to the existing check in AndroidKeyStoreImpl during asymmetric key import. Bug: 22179911 Change-Id: I3d85367259c17bd44198a736ace853d0d3567d5e
* | Don't offer crypto ops for public keys of trusted cert entries.Alex Klyubin2015-06-251-8/+51
|/ | | | | | | | | | | | | | | | | | Android Keystore cannot offer crypto operations for public keys of trusted certificate entries (entries without a private key). Prior to this CL it accidentally tried to do so, causing crypto operations on these keys to fail. The fix is for Android Keystore to offer crypto operations only for public keys for which there is a corresponding private key in the keystore. Crypto operations on public keys from trusted certificate entries will be handled by other installed crypto providers. Those providers don't need a private key to carry out these operations on public keys. Bug: 22091725 Bug: 21835320 Change-Id: Ib7d92b067711e4c57128d0db72c08bf288a45ce1
* Support RSA encrypt using private key and PKCS#1 paddding.Alex Klyubin2015-06-252-18/+66
| | | | | | | | | | | | | Some apps such as OpenVPN Connect for some reason generate PKCS#1-padded RSA signatures using Cipher (initialized in Cipher.ENCRYPT_MODE with private key!) instead of using Signature. Unfortunately, RI supports this strange behavior and previous releases of Android Keystore did the same. So, we have to continue supporting this craziness. Bug: 22083023 Change-Id: Ife3950d0d4ceb4e44e08014635312c1252878b69
* Make NONEwithECDSA truncate input when necessary.Alex Klyubin2015-06-248-44/+147
| | | | | | | | | | | | | | | | | | Keymaster's implementation of ECDSA with digest NONE rejects input longer than group size in bytes. RI's NONEwithECDSA accepts inputs of arbitrary length by truncating them to the above size. This CL makes Android Keystore's NONEwithECDSA do the truncation to keep the JCA and Keymaster happy. The change is inside AndroidKeyStoreECDSASignatureSpi$NONE. All other small modifications are for supporting that change by making it possible for AndroidKeyStoreSignatureSpiBase to pass in the signature being verified into KeyStoreCryptoOperationStreamer. This in turn is needed to make it possible for NONEwithECDSA implementation to provide a wrapper streamer which truncates input. Bug: 22030217 Change-Id: I26064f6df37ef8c631d70a36a356aa0b76a9ad29
* Keymaster INT, LONG and DATE tag values are unsigned.Alex Klyubin2015-06-2314-145/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | This CL ensures that Android Keystore framework code complies with signedness of keymaster tags. In particular: * INT tags are unsigned 32-bit numbers, and * LONG and DATE tags are unsigned 64-bit numbers. The ensure compliance, KeymasterArguments and KeyCharacteristics classes through which Android Keystore interacts with Keymaster tags have been modified as follows: * ENUM and INT tags which used to be conflated are now added/queried via separate methods, because ENUM can remain represented as an int data type whereas INT is now represented as a long data type with permitted range being [0; 2^32). * Methods for adding/quering LONG tags have been switched from the long data type to the BigInteger data type and now ensure that the value is in the permitted [0; 2^63). * Methods for adding/querying DATE tags now ensure the Date value is in the permitted range [0; 2^63) ms since Unix epoch. * Methods for adding tags throw an IllegalArgumentException if the tag type is unsuitable for the method. This is to ensure that tags with invalid values cannot be added through similar methods (e.g., INT tag added via an ENUM tag addition method invoked with a negative value). Bug: 22008538 Change-Id: I6eefd5cbb561cc52d27de952691af4d9d5e1af1e
* Merge "Keymaster key validity dates are optional." into mnc-devAlex Klyubin2015-06-234-50/+21
|\
| * Keymaster key validity dates are optional.Alex Klyubin2015-06-234-50/+21
| | | | | | | | | | | | | | | | | | | | | | | | This CL makes Android Keystore framework code add KM_TAG_ACTIVE_DATETIME, KM_TAG_ORIGINATION_EXPIRE_DATETIME, and KM_TAG_USAGE_EXPIRE_DATETIME tags to the authorizations set only if the corresponding time instants were specified through the framework-level API. This is fine because these tags are optional as it turns out. Bug: 18088752 Change-Id: I6a5ae4cadb441e61576231815e6bec6e9248bc72
* | Merge "Don't fail if self-signed certificate can't be signed." into mnc-devAlex Klyubin2015-06-232-4/+14
|\ \
| * | Don't fail if self-signed certificate can't be signed.Alex Klyubin2015-06-232-4/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Android Keystore's KeyPairGenerator fall back to generating a self-signed certificate with an invalid/fake signature when the attempt to generate a self-signed certificate with a valid signature fails. There is a growing number of reasons/authorizations due to which the generated private key cannot be used to sign the self-signed certificate. It's safer for KeyPairGenerator to succeed than to fail. Bug: 22033161 Change-Id: I1ecbd421346166bfd536b5cfbaea169b11f0b1c8
* | Fix typo in Android Keystore KeyFactory exception message.Alex Klyubin2015-06-231-1/+1
|/ | | | | | | | The typo was pointed out by kroot@ in code review of 4ecd092226fbd748b4a26f3bbb5c4d25a3488fff after it was submitted. Bug: 18088752 Change-Id: I50d2fa93e1a2d352fe432e34ce98add82a71c483
* Merge "Adjust minimum size of PKCS#1 RSA padding overhead." into mnc-devAlex Klyubin2015-06-221-7/+8
|\
| * Adjust minimum size of PKCS#1 RSA padding overhead.Alex Klyubin2015-06-221-7/+8
| | | | | | | | | | | | | | | | | | This raises the space overhead estimate by one byte, due to me having originally forgotten that when signing using RSA PKCS#1 padding scheme, the plaintext of the RSA operation needs a leading 0 byte. Bug: 21955742 Change-Id: If78efcd375afd8902a14a2217ddedfea87d4d337
* | Document that RSA OAEP requires digest authorization.Alex Klyubin2015-06-222-9/+11
|/ | | | | | | | RSA encryption/decryption keys used with RSA OAEP padding scheme now require the key to be authorized for the digest used by OAEP. Bug: 21998286 Change-Id: I1f5eb1b30a1b574c45ffcabed6096de8671882d3
* Merge "Fix a bug in Android Keystore updateAAD." into mnc-devAlex Klyubin2015-06-191-1/+1
|\
| * Fix a bug in Android Keystore updateAAD.Alex Klyubin2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | The variant of CipherSpi.engineUpdateAAD which takes ByteBuffers delegated to a byte[]-taking variant of superclass instead of its own class. Bug: 18088752 Change-Id: I3b426bbdca54bbf7f6f3939589da07b24db14d0d
* | Support more KeySpecs in Android Keystore KeyFactory.Alex Klyubin2015-06-181-22/+76
|/ | | | | | | | | | | | This adds support obtaining RSAPublicKeySpec, ECPublicKeySpec, X509EncodedKeySpec from Android Keystore public keys. Using a KeyFactory to obtain such specs is the endorsed way for obtaining algorithm-specific parameters or X.509 encoding of PublicKey instances. Bug: 18088752 Change-Id: I2c653238e3c89d9cfc97bea6c8a0ef0c6d039385
* Use consistent cases for aliases in AndroidKeystoreBCWorkaround.Narayan Kamath2015-06-181-25/+25
| | | | | | | | | | Should be "with" and not "With". Has the side effect of fixing a test that assumes that these names are case-sensitive. While the test must be fixed separately, this is still good for consistency. bug: 21870226 Change-Id: I884b4abdbb18be064210555aec8e0cd16b0d0bcb
* Remove unnecessary PKCS#1 authorization on legacy keys.Alex Klyubin2015-06-172-6/+4
| | | | | | | | | There is no need to authorize PKCS#1 signature padding scheme when NONE padding scheme is authorized. NONE authorizes the use of any padding scheme. Bug: 18088752 Change-Id: I73ccb373d577c988acde372d972092278923c4e4
* Merge "Prefer GCM to CBC or CTR in documentation." into mnc-devAlex Klyubin2015-06-173-23/+23
|\
| * Prefer GCM to CBC or CTR in documentation.Alex Klyubin2015-06-173-23/+23
| | | | | | | | | | Bug: 21786749 Change-Id: If3824d1321ef1d8730d4384717b0c25d43518fe4
* | Merge "Improve documentation for keys requiring user auth." into mnc-devAlex Klyubin2015-06-174-52/+173
|\ \ | |/ |/|
| * Improve documentation for keys requiring user auth.Alex Klyubin2015-06-174-52/+173
| | | | | | | | | | Bug: 18088752 Change-Id: I24eeb33790a74d8d81d10fcdb1eb058d47144c44
* | Merge "Expose AES GCM backed by Android Keystore." into mnc-devAlex Klyubin2015-06-177-11/+617
|\ \
| * | Expose AES GCM backed by Android Keystore.Alex Klyubin2015-06-177-11/+617
| |/ | | | | | | | | | | Bug: 18088752 Bug: 21786749 Change-Id: Ica90491037d2920f7635195894ba18882fc4406d
* | Drop support for P-192 EC keys.Alex Klyubin2015-06-171-10/+9
|/ | | | | | | | The minimum EC keys size is now 224 bit. This is because keymaster 1.0 does not support EC keys smaller than 224 bit. Bug: 18088752 Change-Id: I8010ff2d6ccaeea7dcf86f697aee1d9ebd683cb2
* Harden KeyInfo.Alex Klyubin2015-06-161-6/+8
| | | | | | | This ensures that KeyInfo instances are truly immutable. Bug: 18088752 Change-Id: Ic157d3b928b129a02c3cab9dd20ba9936a005813
* Harden and clean up KeyProtection.Alex Klyubin2015-06-162-17/+17
| | | | | | | | This ensures that instances of this class are immutable and cleans up some flawed logic discovered when writing up CTS tests. Bug: 18088752 Change-Id: If9cc33192ada5a8982a2b200ab24cb18331cf958
* Harden and clean up KeyGenParameterSpec.Alex Klyubin2015-06-162-34/+73
| | | | | | | | This ensures that instances of this class are immutable and cleans up some flawed logic discovered when writing up CTS tests. Bug: 18088752 Change-Id: I7a27dbfc3445599bccabbd26e39535ce988a2ab2
* Merge "Fix Android Keystore key gen for keys requiring user auth." into mnc-devAlex Klyubin2015-06-151-1/+5
|\
| * Fix Android Keystore key gen for keys requiring user auth.Alex Klyubin2015-06-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Android Keystore generates an asymmetric key pair, it needs to create a self-signed certificate for that pair, in order to expose the key pair in the JCA KeyStore abstraction through which keys are later retrieved. The self-signed certificate is normally signed with the private key. This CL avoids using the private key to sign the certificate if the private key can be used only once the user has been authenticated. For such keys, a fake (non-verifying) signature is used on the certificate, same as for cases where the key is not authorized for signing. Bug: 21852844 Change-Id: Id78bc1f51d12950db4e37c1e0da6c60057d4e693
* | Merge "Remove EcIesParameterSpec until it's needed." into mnc-devAlex Klyubin2015-06-151-272/+0
|\ \
| * | Remove EcIesParameterSpec until it's needed.Alex Klyubin2015-06-151-272/+0
| |/ | | | | | | | | | | | | | | | | This class was added in Android M to enable us to expose ECIES. ECIES is not going to happen in Android M. I'm thus removing this unused class until such time when it's needed. Bug: 18088752 Change-Id: I16ab1bbd0b4334419c9a8f29d64661c150aa8d32
* | Document when self-signed certs have invalid signature.Alex Klyubin2015-06-122-1/+9
|/ | | | | | | | | | This updates the Javadocs of Android Keystore to explain what key authorizations are needed for the self-signed cert create at key generation time to have a valid signature. Bug: 18088752 Bug: 21777596 Change-Id: Id02425133f094a0c5a02e96f4c63aab7175cba5b
generated by cgit v1.1 at 2024-04-29 00:52:04 +0000