Skip to content

fixed for updateAAD vts failure#22

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
subrahmanyaman merged 1 commit into from
Jan 1, 2022
Merged

fixed for updateAAD vts failure #22

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
4 changes: 3 additions & 1 deletion Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1766,6 +1766,8 @@ private void finishAesDesOperation(KMOperationState op){
if (op.getPurpose() == KMType.DECRYPT && (len < (short) (op.getMacLength() / 8))) {
KMException.throwIt(KMError.INVALID_INPUT_LENGTH);
}
// update aad if there is any
updateAAD(op, KMType.INVALID_VALUE, (byte) 0x01);
if(op.isAesGcmUpdateAllowed()){
op.setAesGcmUpdateComplete();
}
Expand DownExpand Up@@ -2206,7 +2208,7 @@ private void updateAAD(KMOperationState op, short associatedData, byte finish) {
if (!op.isAesGcmUpdateAllowed()) {
KMException.throwIt(KMError.INVALID_TAG);
}
aData = KMByteTag.cast(tmpVariables[1]).getValue();
aData = KMByteTag.cast(tag).getValue();
}
}
try {
Expand Down