svn commit: r1617843 - in /tomcat/trunk: java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java

[markt]

Author: markt
Date: Wed Aug 13 21:53:53 2014
New Revision: 1617843

URL: http://svn.apache.org/r1617843
Log:
Update OpenSSL unit tests to use 1.0.1i
Fix a couple of failures caused by some SRP ciphers incorrectly recorded as 
using aNULL rather than SRP as the authentication mechanism

Modified:
    
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Cipher.java
    tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java?rev=1617843&r1=1617842&r2=1617843&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java 
(original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/Authentication.java 
Wed Aug 13 21:53:53 2014
@@ -28,5 +28,6 @@ enum Authentication {
     PSK /* PSK auth */,
     GOST94 /* GOST R 34.10-94 signature auth */,
     GOST01 /* GOST R 34.10-2001 */,
-    FZA /* Fortezza */;
+    FZA /* Fortezza */,
+    SRP
 }

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=1617843&r1=1617842&r2=1617843&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 Wed 
Aug 13 21:53:53 2014
@@ -2031,7 +2031,7 @@ enum Cipher {
     TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA(
             "SRP-3DES-EDE-CBC-SHA",
             KeyExchange.SRP,
-            Authentication.aNULL,
+            Authentication.SRP,
             Encryption.TRIPLE_DES,
             MessageDigest.SHA1,
             Protocol.TLSv1,
@@ -2073,7 +2073,7 @@ enum Cipher {
     TLS_SRP_SHA_WITH_AES_128_CBC_SHA(
             "SRP-AES-128-CBC-SHA",
             KeyExchange.SRP,
-            Authentication.aNULL,
+            Authentication.SRP,
             Encryption.AES128,
             MessageDigest.SHA1,
             Protocol.TLSv1,
@@ -2115,7 +2115,7 @@ enum Cipher {
     TLS_SRP_SHA_WITH_AES_256_CBC_SHA(
             "SRP-AES-256-CBC-SHA",
             KeyExchange.SRP,
-            Authentication.aNULL,
+            Authentication.SRP,
             Encryption.AES256,
             MessageDigest.SHA1,
             Protocol.TLSv1,

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java?rev=1617843&r1=1617842&r2=1617843&view=diff
==============================================================================
--- 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java 
(original)
+++ 
tomcat/trunk/test/org/apache/tomcat/util/net/jsse/openssl/TesterOpenSSL.java 
Wed Aug 13 21:53:53 2014
@@ -30,7 +30,7 @@ import org.apache.tomcat.util.http.fileu
 
 public class TesterOpenSSL {
 
-    public static final String EXPECTED_VERSION = "1.0.1h";
+    public static final String EXPECTED_VERSION = "1.0.1i";
     public static final boolean IS_EXPECTED_VERSION;
 
     public static final Set<Cipher> OPENSSL_UNIMPLEMENTED_CIPHERS =



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org