Add CFG_RSA_PUB_EXPONENT_3 #6790
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jforissier
reviewed
Apr 17, 2024
core/tee/tee_svc_cryp.c
Outdated
| return TEE_ERROR_BAD_PARAMETERS; | ||
|
|
||
| crypto_bignum_bn2bin(e, bin_key); | ||
|
|
||
| if (!(bin_key[n - 1] & 1)) /* key must be odd */ | ||
| return TEE_ERROR_BAD_PARAMETERS; | ||
|
|
||
| #if defined(CFG_RSA_PUB_EXPONENT_3) |
There was a problem hiding this comment.
if (IS_ENABLED(CFG_RSA_PUB_EXPONENT_3)) {
There was a problem hiding this comment.
How about something less patched up like:
if (n <= 3) {
uint32_t min_key = 65537;
uint32_t key = 0;
size_t m = 0;
if (IS_ENABLED(CFG_RSA_PUB_EXPONENT_3))
min_key = 3;
for (m = 0; m < n; m++) {
key <<= 8;
key |= bin_key[m];
}
if (key < min_key)
return TEE_ERROR_BAD_PARAMETERS;
}There was a problem hiding this comment.
That does look cleaner, I'll update the PR to do this instead.
etienne-lms
reviewed
Apr 17, 2024
samitolvanen
force-pushed
the
optee-rsaexp3
branch
from
4f3db83
to
6395899
Compare
Turns out I didn't have |
jforissier
approved these changes
Apr 18, 2024
When generating RSA key pairs, OP-TEE currently enforces a minimum public exponent size of 65537 per NIST SP800-56B recommendations. However, AOSP KeyMint VTS (EncryptionOperationsTest.RsaNoPaddingSuccess [1]) requires implementations to support public exponent 3 for backwards compatibility. Add CFG_RSA_PUB_EXPONENT_3 to allow public exponents >= 3. Link: https://android.googlesource.com/platform/hardware/interfaces/+/refs/heads/main/security/keymint/aidl/vts/functional/KeyMintTest.cpp#5258 [1] Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
samitolvanen
force-pushed
the
optee-rsaexp3
branch
from
6395899
to
c5765f8
Compare
etienne-lms
reviewed
Apr 24, 2024
|
Etienne's tag added and commit merged manually. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When generating RSA keypairs, OP-TEE currently enforces a minimum public exponent size of 65537 per NIST SP800-56B recommendations. However, AOSP KeyMint VTS (EncryptionOperationsTest.RsaNoPaddingSuccess) requires implementations to support public exponent 3 for backwards compatibility. Add
CFG_RSA_PUB_EXPONENT_3to optionally allow public exponents >= 3.