File size: 7,014 Bytes
281d6f5 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | diff --git a/src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java b/src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
index 7cd2b74..f627be3 100644
--- a/src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
+++ b/src/main/java/com/southernstorm/noise/protocol/AESGCMFallbackCipherState.java
@@ -185,10 +185,11 @@ class AESGCMFallbackCipherState implements CipherState {
byte[] ciphertext, int ciphertextOffset, int length)
throws ShortBufferException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
- else
- space = ciphertext.length - ciphertextOffset;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = ciphertext.length - ciphertextOffset;
if (!haskey) {
// The key is not set yet - return the plaintext as-is.
if (length > space)
@@ -214,16 +215,15 @@ class AESGCMFallbackCipherState implements CipherState {
int ciphertextOffset, byte[] plaintext, int plaintextOffset,
int length) throws ShortBufferException, BadPaddingException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
else
space = ciphertext.length - ciphertextOffset;
if (length > space)
throw new ShortBufferException();
- if (plaintextOffset > plaintext.length)
- space = 0;
- else
- space = plaintext.length - plaintextOffset;
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = plaintext.length - plaintextOffset;
if (!haskey) {
// The key is not set yet - return the ciphertext as-is.
if (length > space)
diff --git a/src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java b/src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
index deada67..df40945 100644
--- a/src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
+++ b/src/main/java/com/southernstorm/noise/protocol/AESGCMOnCtrCipherState.java
@@ -218,10 +218,11 @@ class AESGCMOnCtrCipherState implements CipherState {
byte[] ciphertext, int ciphertextOffset, int length)
throws ShortBufferException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
- else
- space = ciphertext.length - ciphertextOffset;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = ciphertext.length - ciphertextOffset;
if (keySpec == null) {
// The key is not set yet - return the plaintext as-is.
if (length > space)
@@ -262,16 +263,15 @@ class AESGCMOnCtrCipherState implements CipherState {
int ciphertextOffset, byte[] plaintext, int plaintextOffset,
int length) throws ShortBufferException, BadPaddingException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
else
space = ciphertext.length - ciphertextOffset;
if (length > space)
throw new ShortBufferException();
- if (plaintextOffset > plaintext.length)
- space = 0;
- else
- space = plaintext.length - plaintextOffset;
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = plaintext.length - plaintextOffset;
if (keySpec == null) {
// The key is not set yet - return the ciphertext as-is.
if (length > space)
diff --git a/src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java b/src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
index 25b1a4c..40ce2bc 100644
--- a/src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
+++ b/src/main/java/com/southernstorm/noise/protocol/ChaChaPolyCipherState.java
@@ -214,10 +214,11 @@ class ChaChaPolyCipherState implements CipherState {
public int encryptWithAd(byte[] ad, byte[] plaintext, int plaintextOffset,
byte[] ciphertext, int ciphertextOffset, int length) throws ShortBufferException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
- else
- space = ciphertext.length - ciphertextOffset;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = ciphertext.length - ciphertextOffset;
if (!haskey) {
// The key is not set yet - return the plaintext as-is.
if (length > space)
@@ -241,16 +242,15 @@ class ChaChaPolyCipherState implements CipherState {
int ciphertextOffset, byte[] plaintext, int plaintextOffset,
int length) throws ShortBufferException, BadPaddingException {
int space;
- if (ciphertextOffset > ciphertext.length)
- space = 0;
+ if (ciphertextOffset < 0 || ciphertextOffset > ciphertext.length)
+ throw new IllegalArgumentException();
else
space = ciphertext.length - ciphertextOffset;
if (length > space)
throw new ShortBufferException();
- if (plaintextOffset > plaintext.length)
- space = 0;
- else
- space = plaintext.length - plaintextOffset;
+ if (length < 0 || plaintextOffset < 0 || plaintextOffset > plaintext.length)
+ throw new IllegalArgumentException();
+ space = plaintext.length - plaintextOffset;
if (!haskey) {
// The key is not set yet - return the ciphertext as-is.
if (length > space)
diff --git a/src/main/java/com/southernstorm/noise/protocol/CipherState.java b/src/main/java/com/southernstorm/noise/protocol/CipherState.java
index 3168139..74f808b 100644
--- a/src/main/java/com/southernstorm/noise/protocol/CipherState.java
+++ b/src/main/java/com/southernstorm/noise/protocol/CipherState.java
@@ -100,6 +100,8 @@ public interface CipherState extends Destroyable {
*
* @throws IllegalStateException The nonce has wrapped around.
*
+ * @throws IllegalArgumentException One of the parameters is out of range.
+ *
* The plaintext and ciphertext buffers can be the same for in-place
* encryption. In that case, plaintextOffset must be identical to
* ciphertextOffset.
@@ -130,6 +132,8 @@ public interface CipherState extends Destroyable {
*
* @throws IllegalStateException The nonce has wrapped around.
*
+ * @throws IllegalArgumentException One of the parameters is out of range.
+ *
* The plaintext and ciphertext buffers can be the same for in-place
* decryption. In that case, ciphertextOffset must be identical to
* plaintextOffset.
|