Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 95771641: am e26f9d95: Merge "Adjust minimum size of PKCS#1 RSA padding overhead." into mnc-dev

Browse Source 
* commit '95771641a8fee56ea5ed272762a5cf0f3fd0b915':
  Adjust minimum size of PKCS#1 RSA padding overhead.
This commit is contained in:
Alex Klyubin
2015-06-23 02:53:06 +00:00
committed by Android Git Automerger
parent c95782bf17 95771641a8
commit be8bab11ec
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -624,9 +624,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
// Constraints: // Constraints:
// 1. Key must be authorized for signing without user authentication. // 1. Key must be authorized for signing without user authentication.
// 2. Signature digest must be one of key's authorized digests. // 2. Signature digest must be one of key's authorized digests.
// 3. For RSA keys, the digest output size must not exceed modulus size minus space needed // 3. For RSA keys, the digest output size must not exceed modulus size minus space overhead
// for RSA PKCS#1 signature padding (about 29 bytes: minimum 10 bytes of padding + 15--19 // of RSA PKCS#1 signature padding scheme (about 30 bytes).
// bytes overhead for encoding digest OID and digest value in DER).
// 4. For EC keys, the there is no point in using a digest whose output size is longer than // 4. For EC keys, the there is no point in using a digest whose output size is longer than
// key/field size because the digest will be truncated to that size. // key/field size because the digest will be truncated to that size.
@@ -727,10 +726,12 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
spec.getDigests(), spec.getDigests(),
AndroidKeyStoreBCWorkaroundProvider.getSupportedEcdsaSignatureDigests()); AndroidKeyStoreBCWorkaroundProvider.getSupportedEcdsaSignatureDigests());
// The amount of space available for the digest is less than modulus size because // The amount of space available for the digest is less than modulus size by about
// padding must be at least 10 bytes long, and then there's also the 15--19 // 30 bytes because padding must be at least 11 bytes long (00 || 01 || PS || 00,
// bytes overhead for encoding digest OID and digest value in DER. // where PS must be at least 8 bytes long), and then there's also the 15--19 bytes
int maxDigestOutputSizeBits = keySizeBits - 29 * 8; // overhead (depending the on chosen digest) for encoding digest OID and digest
// value in DER.
int maxDigestOutputSizeBits = keySizeBits - 30 * 8;
int bestKeymasterDigest = -1; int bestKeymasterDigest = -1;
int bestDigestOutputSizeBits = -1; int bestDigestOutputSizeBits = -1;
for (int keymasterDigest : availableKeymasterDigests) { for (int keymasterDigest : availableKeymasterDigests) {