harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r988112 - in /harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main: java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java native/jsse/shared/cipherList.h
Date Mon, 23 Aug 2010 13:03:26 GMT
Author: odeakin
Date: Mon Aug 23 13:03:25 2010
New Revision: 988112

URL: http://svn.apache.org/viewvc?rev=988112&view=rev
Log:
Couple of minor changes:
 - store a clone of the cipher suites being passed in, not the original.
 - add #ifndef around cipherList header content.

Modified:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/cipherList.h

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java?rev=988112&r1=988111&r2=988112&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParameters.java
Mon Aug 23 13:03:25 2010
@@ -322,7 +322,7 @@ public class SSLParameters {
                 throw new IllegalArgumentException(suites[i] + " is not supported.");
             }
         }
-        enabledCipherSuites = suites;        
+        enabledCipherSuites = suites.clone();
         setEnabledCipherSuitesImpl(SSL_CTX, SSL, suites);
     }
 

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/cipherList.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/cipherList.h?rev=988112&r1=988111&r2=988112&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/cipherList.h
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/cipherList.h
Mon Aug 23 13:03:25 2010
@@ -15,6 +15,9 @@
  *  limitations under the License.
  */
 
+#ifndef _CIPHERLIST_H
+#define _CIPHERLIST_H
+
 #define SSLv2_CIPHER_COUNT 7
 char *SSLv2_SpecNames[SSLv2_CIPHER_COUNT] = { "SSL_CK_RC4_128_WITH_MD5", "SSL_CK_RC4_128_EXPORT40_WITH_MD5",
"SSL_CK_RC2_128_CBC_WITH_MD5", 
     "SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5", "SSL_CK_IDEA_128_CBC_WITH_MD5", "SSL_CK_DES_64_CBC_WITH_MD5",
"SSL_CK_DES_192_EDE3_CBC_WITH_MD5" };
@@ -57,3 +60,5 @@ char *TLSv1_openSSLNames[TLSv1_CIPHER_CO
     "DHE-RSA-CAMELLIA256-SHA", "ADH-CAMELLIA128-SHA", "ADH-CAMELLIA256-SHA", "SEED-SHA",
"DHE-DSS-SEED-SHA", "DHE-RSA-SEED-SHA", "ADH-SEED-SHA", 
     "GOST94-GOST89-GOST89", "GOST2001-GOST89-GOST89", "GOST94-NULL-GOST94", "GOST2001-NULL-GOST94",
"EXP1024-DES-CBC-SHA", "EXP1024-RC4-SHA", 
     "EXP1024-DHE-DSS-DES-CBC-SHA", "EXP1024-DHE-DSS-RC4-SHA", "DHE-DSS-RC4-SHA" };
+
+#endif



Mime
View raw message