diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-14 11:25:49 +0400 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-14 11:25:49 +0400 |
| commit | 33de06c1b700936a224fdba3bc799167ca5061da (patch) | |
| tree | 426ef7381cd635188c0f6eb6cbde30e7d54b00e7 /core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java | |
| parent | a21a1556a2b8c4c75ec8d115ba01de5fd66ea25f (diff) | |
Implement new AEAD_CHACHA20_POLY1305 cipher in (D)TLS.
Diffstat (limited to 'core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java')
| -rw-r--r-- | core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java b/core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java index a327035a..262bac5e 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java @@ -90,10 +90,9 @@ public class DefaultTlsCipherFactory createHMACDigest(macAlgorithm), cipherKeySize); } - protected TlsAEADCipher createChaCha20Poly1305(TlsContext context) throws IOException + protected TlsCipher createChaCha20Poly1305(TlsContext context) throws IOException { - // TODO[draft-agl-tls-chacha20poly1305] - throw new TlsFatalAlert(AlertDescription.internal_error); + return new Chacha20Poly1305(context); } protected TlsAEADCipher createCipher_AES_CCM(TlsContext context, int cipherKeySize, int macSize) |