Skip to content

RSA OAEP New VTS issue fix #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdwivedi merged 1 commit into from
Jul 18, 2022
Merged

RSA OAEP New VTS issue fix #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2632,30 +2632,31 @@ private void authorizePadding(KMOperationState op) {
KMException.throwIt(KMError.UNSUPPORTED_DIGEST);
}
}
//TODO d to verify whether javacard support MGF1 = SHA1 or is it equal to the OAEP scheme
// digest. There is no way to define any other digest.
if(param == KMType.RSA_OAEP){
if (param == KMType.RSA_OAEP) {
short mgfDigest = KMKeyParameters.findTag(KMType.ENUM_ARRAY_TAG,
KMType.RSA_OAEP_MGF_DIGEST, data[KEY_PARAMETERS]);
if(mgfDigest != KMType.INVALID_VALUE) {
if(KMEnumArrayTag.cast(mgfDigest).length() != 1) {
if (mgfDigest != KMType.INVALID_VALUE) {
if (KMEnumArrayTag.cast(mgfDigest).length() != 1) {
KMException.throwIt(KMError.INVALID_ARGUMENT);
}
mgfDigest = KMEnumArrayTag.cast(mgfDigest).get((short) 0);
if (mgfDigest == KMType.DIGEST_NONE) {
KMException.throwIt(KMError.UNSUPPORTED_MGF_DIGEST);
}
if (!KMEnumArrayTag
.contains(KMType.RSA_OAEP_MGF_DIGEST, mgfDigest, data[HW_PARAMETERS])) {
KMException.throwIt(KMError.INCOMPATIBLE_MGF_DIGEST);
}
if (mgfDigest != KMType.SHA1 && mgfDigest != KMType.SHA2_256) {
KMException.throwIt(KMError.UNSUPPORTED_MGF_DIGEST);
}
op.setMgfDigest((byte) mgfDigest);

} else {
op.setMgfDigest(KMType.SHA1);
mgfDigest = KMType.SHA1;
}
short mgfDigestHwParams = KMKeyParameters.findTag(KMType.ENUM_ARRAY_TAG,
KMType.RSA_OAEP_MGF_DIGEST, data[HW_PARAMETERS]);
if ((mgfDigestHwParams != KMType.INVALID_VALUE) &&
(!KMEnumArrayTag.cast(mgfDigestHwParams).contains(mgfDigest))) {
KMException.throwIt(KMError.INCOMPATIBLE_MGF_DIGEST);
}
if (mgfDigest != KMType.SHA1 && mgfDigest != KMType.SHA2_256) {
KMException.throwIt(KMError.UNSUPPORTED_MGF_DIGEST);
}
op.setMgfDigest((byte) mgfDigest);
}
op.setPadding((byte) param);
break;
Expand Down