Author: markt
Date: Fri Aug 7 15:51:29 2015
New Revision: 1694704
URL: http://svn.apache.org/r1694704
Log:
OpenSSl trunk added support for RFC 4785 ciphers
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java?rev=1694704&r1=1694703&r2=1694704&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java Fri
Aug 7 15:51:29 2015
@@ -731,17 +731,53 @@ public enum Cipher {
128
),*/
- /* PSK cipher suites from RFC 4785
- * Unsupported by both Java and OpenSSL.
+ /* PSK cipher suites from RFC 4785 */
+ // Unsupported by Java
+
// Cipher 2C
- TLS_PSK_WITH_NULL_SHA
+ TLS_PSK_WITH_NULL_SHA(
+ 0x002c,
+ "PSK-NULL-SHA",
+ KeyExchange.PSK,
+ Authentication.PSK,
+ Encryption.eNULL,
+ MessageDigest.SHA1,
+ Protocol.TLSv1,
+ false,
+ EncryptionLevel.STRONG_NONE,
+ true,
+ 0,
+ 0),
// Cipher 2D
- TLS_DHE_PSK_WITH_NULL_SHA
+ TLS_DHE_PSK_WITH_NULL_SHA(
+ 0x002d,
+ "DHE-PSK-NULL-SHA",
+ KeyExchange.DHEPSK,
+ Authentication.PSK,
+ Encryption.eNULL,
+ MessageDigest.SHA1,
+ Protocol.TLSv1,
+ false,
+ EncryptionLevel.STRONG_NONE,
+ true,
+ 0,
+ 0),
// Cipher 2E
- TLS_RSA_PSK_WITH_NULL_SHA
- */
+ TLS_RSA_PSK_WITH_NULL_SHA(
+ 0x002e,
+ "RSA-PSK-NULL-SHA",
+ KeyExchange.RSAPSK,
+ Authentication.RSA,
+ Encryption.eNULL,
+ MessageDigest.SHA1,
+ Protocol.TLSv1,
+ false,
+ EncryptionLevel.STRONG_NONE,
+ true,
+ 0,
+ 0),
/* New AES ciphersuites */
// Cipher 2F
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java?rev=1694704&r1=1694703&r2=1694704&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/KeyExchange.java
Fri Aug 7 15:51:29 2015
@@ -29,5 +29,8 @@ enum KeyExchange {
ECDHr /* SSL_kECDHr - ECDH cert, RSA CA cert */,
ECDHe /* SSL_eECDHe - ECDH cert, ECDSA CA cert */,
GOST /* SSL_kGOST - GOST key exchange */,
- SRP /* SSL_kSRP - SRP */;
+ SRP /* SSL_kSRP - SRP */,
+ RSAPSK,
+ ECDHEPSK,
+ DHEPSK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
