[teiid-commits] teiid SVN: r2972 - in trunk/runtime/src/main: resources/org/teiid/runtime and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-07 14:20:20 -0500 (Mon, 07 Mar 2011)
New Revision: 2972

Modified:
   trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
   trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
Log:
TEIID-1488 changed the assertion to an error

Modified: trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java	2011-03-05 03:01:13 UTC (rev 2971)
+++ trunk/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java	2011-03-07 19:20:20 UTC (rev 2972)
@@ -30,8 +30,8 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 
-import org.teiid.core.util.Assertion;
 import org.teiid.net.socket.SocketUtil;
+import org.teiid.runtime.RuntimePlugin;
 
 
 
@@ -83,7 +83,9 @@
         SSLEngine result = context.createSSLEngine();
         result.setUseClientMode(false);
         if (ANONYMOUS.equals(authenticationMode)) {
-            Assertion.assertTrue(Arrays.asList(result.getSupportedCipherSuites()).contains(SocketUtil.ANON_CIPHER_SUITE));
+            if (!(Arrays.asList(result.getSupportedCipherSuites()).contains(SocketUtil.ANON_CIPHER_SUITE))) {
+            	throw new GeneralSecurityException(RuntimePlugin.Util.getString("SSLConfiguration.no_anonymous")); //$NON-NLS-1$
+            }
             result.setEnabledCipherSuites(new String[] {
             		SocketUtil.ANON_CIPHER_SUITE
             });

Modified: trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties
===================================================================
--- trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties	2011-03-05 03:01:13 UTC (rev 2971)
+++ trunk/runtime/src/main/resources/org/teiid/runtime/i18n.properties	2011-03-07 19:20:20 UTC (rev 2972)
@@ -88,4 +88,5 @@
 error_closing_stmt=Error closing portal statement {0}
 model_metadata_loading=VDB "{0}" - "{1}" model metadata is currently being loaded. Start Time: {2}
 ambigious_name=Ambiguous VDB name specified. Only single occurrence of the "." is allowed in the VDB name. Also, when version based vdb name is specified, then a separate "version" connection option is not allowed:{0}.{1} 
-lo_not_supported=LO functions are not supported
\ No newline at end of file
+lo_not_supported=LO functions are not supported
+SSLConfiguration.no_anonymous=The anonymous cipher suite TLS_DH_anon_WITH_AES_128_CBC_SHA is not available.  Please change the transport to be non-SSL or use non-anonymous SSL.
\ No newline at end of file