diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-01-17 15:07:27 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-01-17 15:07:27 +0700 |
| commit | cbe36e32b83408ebdb649677dc8cf29ac1e8cf63 (patch) | |
| tree | b0145a697b7467cf9783160ed34a66d3fa1e398a /crypto/test | |
| parent | Support for re-init in Salsa family (diff) | |
| download | BouncyCastle.NET-ed25519-cbe36e32b83408ebdb649677dc8cf29ac1e8cf63.tar.xz | |
Implement updated draft-ietf-tls-chacha20-poly1305-04
Diffstat (limited to 'crypto/test')
4 files changed, 4 insertions, 12 deletions
diff --git a/crypto/test/src/crypto/tls/test/MockDtlsClient.cs b/crypto/test/src/crypto/tls/test/MockDtlsClient.cs index 25057b8ce..e87617e30 100644 --- a/crypto/test/src/crypto/tls/test/MockDtlsClient.cs +++ b/crypto/test/src/crypto/tls/test/MockDtlsClient.cs @@ -60,11 +60,7 @@ namespace Org.BouncyCastle.Crypto.Tls.Tests // return Arrays.Concatenate(base.GetCipherSuites(), // new int[] // { - // CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, - // CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1, - // CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1, - // CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1, - // CipherSuite.TLS_RSA_WITH_SALSA20_SHA1, + // CipherSuite.DRAFT_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, // }); //} diff --git a/crypto/test/src/crypto/tls/test/MockDtlsServer.cs b/crypto/test/src/crypto/tls/test/MockDtlsServer.cs index a7c5efdca..16e92b258 100644 --- a/crypto/test/src/crypto/tls/test/MockDtlsServer.cs +++ b/crypto/test/src/crypto/tls/test/MockDtlsServer.cs @@ -37,7 +37,7 @@ namespace Org.BouncyCastle.Crypto.Tls.Tests return Arrays.Concatenate(base.GetCipherSuites(), new int[] { - CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, + CipherSuite.DRAFT_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, }); } diff --git a/crypto/test/src/crypto/tls/test/MockTlsClient.cs b/crypto/test/src/crypto/tls/test/MockTlsClient.cs index 35c5b3599..747369da2 100644 --- a/crypto/test/src/crypto/tls/test/MockTlsClient.cs +++ b/crypto/test/src/crypto/tls/test/MockTlsClient.cs @@ -50,11 +50,7 @@ namespace Org.BouncyCastle.Crypto.Tls.Tests // return Arrays.Concatenate(base.GetCipherSuites(), // new int[] // { - // CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, - // CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1, - // CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1, - // CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1, - // CipherSuite.TLS_RSA_WITH_SALSA20_SHA1, + // CipherSuite.DRAFT_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, // }); //} diff --git a/crypto/test/src/crypto/tls/test/MockTlsServer.cs b/crypto/test/src/crypto/tls/test/MockTlsServer.cs index 7f0bc29a9..f0a9be0a5 100644 --- a/crypto/test/src/crypto/tls/test/MockTlsServer.cs +++ b/crypto/test/src/crypto/tls/test/MockTlsServer.cs @@ -37,7 +37,7 @@ namespace Org.BouncyCastle.Crypto.Tls.Tests return Arrays.Concatenate(base.GetCipherSuites(), new int[] { - CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, + CipherSuite.DRAFT_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, }); } |