diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-11 08:13:09 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-11 08:13:09 +0400 |
commit | 2e47139d9031482c77680aa8695aaf1f5349afab (patch) | |
tree | fc12cde9cc26dc528059a1ce64cb99d3df77d392 /core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java | |
parent | ded84c7ffaed280d3e4c2dc8d8cbd0be0ce3b85f (diff) |
Updates for draft-josefsson-salsa20-tls-04
Diffstat (limited to 'core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java')
-rw-r--r-- | core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java index 20dfef89..e720d08d 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java @@ -105,15 +105,6 @@ public class TlsMac */ public byte[] calculateMac(long seqNo, short type, byte[] message, int offset, int length) { - /* - * TODO[draft-josefsson-salsa20-tls-02] 3. Moreover, in order to accommodate MAC algorithms - * like UMAC that require a nonce as part of their operation, the document extends the MAC - * algorithm as specified in the TLS protocol. The extended MAC includes a nonce as a second - * parameter. MAC algorithms that do not require a nonce, such as HMAC, are assumed to - * ignore the nonce input value. The MAC in a GenericStreamCipher is then calculated as - * follows. - */ - ProtocolVersion serverVersion = context.getServerVersion(); boolean isSSL = serverVersion.isSSL(); |