diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-30 19:14:58 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-07-30 14:55:33 +0100 |
| commit | 69a3a9f5d9c018eee97b4127c40bc9903c03cce4 (patch) | |
| tree | 35231f4283e76baf301f15957b619ffb342ee226 /doc | |
| parent | b2f8ab8681d4c9bba3b516672689e86e83b41e53 (diff) | |
CAMELLIA PSK ciphersuites from RFC6367
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apps/ciphers.pod | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod index 1545c8fcf6..d7b7bea8e1 100644 --- a/doc/apps/ciphers.pod +++ b/doc/apps/ciphers.pod @@ -645,6 +645,18 @@ Note: these ciphers can also be used in SSL v3. ECDHE_PSK_WITH_NULL_SHA256 ECDHE-PSK-NULL-SHA256 ECDHE_PSK_WITH_NULL_SHA384 ECDHE-PSK-NULL-SHA384 + PSK_WITH_CAMELLIA_128_CBC_SHA256 PSK-CAMELLIA128-SHA256 + PSK_WITH_CAMELLIA_256_CBC_SHA384 PSK-CAMELLIA256-SHA384 + + DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 DHE-PSK-CAMELLIA128-SHA256 + DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 DHE-PSK-CAMELLIA256-SHA384 + + RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 RSA-PSK-CAMELLIA128-SHA256 + RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 RSA-PSK-CAMELLIA256-SHA384 + + ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 ECDHE-PSK-CAMELLIA128-SHA256 + ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 ECDHE-PSK-CAMELLIA256-SHA384 + =head1 NOTES Some compiled versions of OpenSSL may not include all the ciphers |