Skip to content

Commit 0837939

Browse files
committed
Crypto: Fix off by one column issue in unit tests.
1 parent 3561d01 commit 0837939

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ nodes
3131
| BadMacUse.java:124:42:124:51 | ciphertext | semmle.label | ciphertext |
3232
subpaths
3333
testFailures
34-
| BadMacUse.java:63:118:63:128 | // $Source | Missing result: Source |
34+
| BadMacUse.java:63:118:63:127 | // $Source | Missing result: Source |
3535
| BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | Unexpected result: Source |
3636
| BadMacUse.java:124:42:124:51 | ciphertext | Unexpected result: Alert |

java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ nodes
1111
| BadMacUse.java:76:44:76:52 | plaintext | semmle.label | plaintext |
1212
subpaths
1313
testFailures
14-
| BadMacUse.java:50:56:50:66 | // $Source | Missing result: Source |
14+
| BadMacUse.java:50:56:50:65 | // $Source | Missing result: Source |

java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public byte[] falsePositiveDecryptToMac(byte[] encryptionKeyBytes, byte[] macKey
122122
Mac mac = Mac.getInstance("HmacSHA256");
123123
mac.init(macKey);
124124
byte[] computedMac = mac.doFinal(ciphertext); // False Positive
125-
125+
126126
// Concatenate ciphertext and MAC
127127
byte[] output = new byte[ciphertext.length + computedMac.length];
128128
System.arraycopy(ciphertext, 0, output, 0, ciphertext.length);
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#select
22
| Test.java:47:22:47:49 | KeyDerivation | Key derivation operation with unknown iteration: $@ | Test.java:43:53:43:70 | iterationCount | iterationCount |
33
testFailures
4-
| Test.java:45:94:45:154 | // $Alert[java/quantum/examples/unknown-kdf-iteration-count] | Missing result: Alert[java/quantum/examples/unknown-kdf-iteration-count] |
4+
| Test.java:45:94:45:153 | // $Alert[java/quantum/examples/unknown-kdf-iteration-count] | Missing result: Alert[java/quantum/examples/unknown-kdf-iteration-count] |
55
| Test.java:47:22:47:49 | Key derivation operation with unknown iteration: $@ | Unexpected result: Alert |

java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ nodes
1313
| Test.java:59:72:59:85 | iterationCount | semmle.label | iterationCount |
1414
subpaths
1515
testFailures
16-
| Test.java:43:92:43:102 | // $Source | Missing result: Source |
16+
| Test.java:43:92:43:101 | // $Source | Missing result: Source |

0 commit comments

Comments
 (0)