Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 19:59:05 +01:00
Code Issues Projects Releases Wiki Activity

Fixed return value of process().

Browse Source
This commit is contained in:
akwizgran
2015-12-18 14:06:47 +00:00
parent fc897bd1b9
commit 73bb3b0065
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-core/src/org/briarproject/crypto/AuthenticatedCipher.java
View File

@@ -26,14 +26,14 @@ interface AuthenticatedCipher {
* including the MAC.
* @param inputOff the offset into the input array where the data to be
* processed starts.
* @param len the number of bytes to be processed. If decrypting, includes
* the MAC length.
* @param output the output buffer the processed bytes go into. If
* encrypting, the ciphertext including the MAC. If
* decrypting, the plaintext.
* @param outputOff the offset into the output byte array the processed
* data starts at.
* @return the number of bytes processed.
* @param len the length of the input. If decrypting, includes the MAC
* length.
* @param output the output byte array. If encrypting, the ciphertext
* including the MAC. If decrypting, the plaintext.
* @param outputOff the offset into the output byte array where the
* processed data starts.
* @return the length of the output. If encrypting, includes the MAC
* length.
* @throws GeneralSecurityException on invalid input.
*/
int process(byte[] input, int inputOff, int len, byte[] output,

2
briar-core/src/org/briarproject/crypto/XSalsa20Poly1305AuthenticatedCipher.java
View File

@@ -112,7 +112,7 @@ public class XSalsa20Poly1305AuthenticatedCipher
poly1305.doFinal(output, outputOff);
}
return processed;
return encrypting ? processed + MAC_LENGTH : processed;
} catch (DataLengthException e) {
throw new GeneralSecurityException(e.getMessage());
}