Skip to content

Javacard km 41 aosp upmerge 0630#78

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 2 commits into from
Jun 16, 2022
Merged

Javacard km 41 aosp upmerge 0630 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e143151
As per VTS, zero length input on AES/DES with PADDING_NONE Should ret…
subrahmanyaman Jun 15, 2022
bb191d3
Merge pull request #160 from subrahmanyaman/aes_des_no_pad_0_input
mdwivedi Jun 15, 2022
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
22 changes: 21 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@@ -1984,7 +1984,20 @@ private void finishAesDesOperation(KMOperationState op) {
KMByteBlob.cast(data[OUTPUT_DATA]).getStartOff());
} catch (CryptoException e) {
if (e.getReason() == CryptoException.ILLEGAL_USE) {
KMException.throwIt(KMError.INVALID_INPUT_LENGTH);
// As per VTS, zero length input on AES/DES with PADDING_NONE Should return a zero length
// output. But JavaCard fails with CryptoException.ILLEGAL_USE if no input data is
// provided via update() method. So ignore this exception in case if all below conditions
// are satisfied and simply return empty output.
// 1. padding mode is PADDING_NONE.
// 2. No input message is processed in update().
// 3. Zero length input data is passed in finish operation.
if ((op.getPadding() == KMType.PADDING_NONE) &&
!op.isInputMsgProcessed() &&
(KMByteBlob.cast(data[INPUT_DATA]).length() == 0)) {
len = 0;
} else {
KMException.throwIt(KMError.INVALID_INPUT_LENGTH);
}
}
}

Expand DownExpand Up@@ -2436,6 +2449,13 @@ private void processUpdateOperationCmd(APDU apdu) {
} catch (CryptoException e) {
KMException.throwIt(KMError.INVALID_TAG);
}
if (KMByteBlob.cast(data[INPUT_DATA]).length() > 0) {
// This flag is used to denote that an input data of length > 0 is received and processed
// successfully in update command. This flag is later used in the finish operation
// to handle a particular use case, where a zero length input data on AES/DES algorithm
// with PADDING_NONE should return a zero length output with OK response.
op.setProcessedInputMsg(true);
}
// Adjust the Output data if it is not equal to input data.
// This happens in case of JCardSim provider.
KMByteBlob.cast(data[OUTPUT_DATA]).setLength(tmpVariables[0]);
Expand Down
14 changes: 14 additions & 0 deletions Applet/src/com/android/javacard/keymaster/KMOperationState.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,6 +55,7 @@ public class KMOperationState {
private static final byte SECURE_USER_ID_REQD = 2;
private static final byte AUTH_TIMEOUT_VALIDATED = 4;
private static final byte AES_GCM_UPDATE_ALLOWED = 8;
private static final byte PROCESSED_INPUT_MSG = 16;
private static final byte MAX_SECURE_USER_IDS = 5;

// Object References
Expand DownExpand Up@@ -153,6 +154,10 @@ public void setOperation(KMOperation opr) {
persist();
}

public boolean isInputMsgProcessed() {
return (data[FLAGS] & PROCESSED_INPUT_MSG) != 0;
}

public KMOperation getOperation() {
return (KMOperation) objRefs[OPERATION];
}
Expand DownExpand Up@@ -230,6 +235,15 @@ public void setUserSecureId(short integerArrayPtr) {
dataUpdated();
}

public void setProcessedInputMsg(boolean flag) {
if (flag) {
data[FLAGS] = (byte) (data[FLAGS] | PROCESSED_INPUT_MSG);
} else {
data[FLAGS] = (byte) (data[FLAGS] & (~PROCESSED_INPUT_MSG));
}
dataUpdated();
}

public void setOneTimeAuthReqd(boolean flag) {
if (flag) {
data[FLAGS] = (byte) (data[FLAGS] | SECURE_USER_ID_REQD);
Expand Down