harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r986610 - in /harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main: java/org/apache/harmony/xnet/provider/jsse/ native/jsse/shared/ native/jsse/unix/ native/jsse/windows/
Date Wed, 18 Aug 2010 09:42:27 GMT
Author: odeakin
Date: Wed Aug 18 09:42:26 2010
New Revision: 986610

URL: http://svn.apache.org/viewvc?rev=986610&view=rev
Log:
Fix build failures caused by changes to SSLParameters. Initialise the default ciphers statically
in SSLParameters so they are available without having to have an SSLParameters instance. Temporarily
modify ClientHandshakeImpl and ServerHandshakeImpl so they will build - they should be removed
eventually.

Added:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c
  (with props)
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h
  (with props)
Modified:
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
    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/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.c
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.h
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.h
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/makefile
    harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/windows/makefile

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.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/ClientHandshakeImpl.java?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
Wed Aug 18 09:42:26 2010
@@ -119,11 +119,11 @@ public class ClientHandshakeImpl extends
      * Starts/resumes session
      */
     private void startSession() {
-        CipherSuite[] cipher_suites;
+        CipherSuite[] cipher_suites = null;
         if (isResuming) {
             cipher_suites = new CipherSuite[] { session.cipherSuite };
         } else {
-            cipher_suites = parameters.enabledCipherSuites;
+            //cipher_suites = parameters.getEnabledCipherSuites();
         }
         clientHello = new ClientHello(parameters.getSecureRandom(),
                 session.protocol.version, session.id, cipher_suites);
@@ -205,7 +205,7 @@ public class ClientHandshakeImpl extends
                     }
                     
                     //check cipher_suite
-                    CipherSuite[] enabledSuites = parameters.enabledCipherSuites;
+                    CipherSuite[] enabledSuites = null;//parameters.getEnabledCipherSuites();
                     find: {
                         for (int i = 0; i < enabledSuites.length; i++) {
                             if (serverHello.cipher_suite

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.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/SSLEngineImpl.java?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLEngineImpl.java
Wed Aug 18 09:42:26 2010
@@ -83,6 +83,11 @@ public class SSLEngineImpl extends SSLEn
     // logger
     private Logger.Stream logger = Logger.getStream("engine");
 
+    // Pointer to the OpenSSL SSL struct used for this engine
+    private long SSL;
+
+    private native long initImpl(long context);
+
     /**
      * Ctor
      * @param   sslParameters:  SSLParameters
@@ -90,6 +95,7 @@ public class SSLEngineImpl extends SSLEn
     protected SSLEngineImpl(SSLParameters sslParameters) {
         super();
         this.sslParameters = sslParameters;
+        SSL = initImpl(sslParameters.getSSLContextAddress());
     }
 
     /**
@@ -101,6 +107,7 @@ public class SSLEngineImpl extends SSLEn
     protected SSLEngineImpl(String host, int port, SSLParameters sslParameters) {
         super(host, port);
         this.sslParameters = sslParameters;
+        SSL = initImpl(sslParameters.getSSLContextAddress());
     }
 
     /**
@@ -232,7 +239,7 @@ public class SSLEngineImpl extends SSLEn
      */
     @Override
     public void setEnabledCipherSuites(String[] suites) {
-        sslParameters.setEnabledCipherSuites(suites);
+        sslParameters.setEnabledCipherSuites(SSL, suites);
     }
 
     /**
@@ -242,7 +249,7 @@ public class SSLEngineImpl extends SSLEn
      */
     @Override
     public String[] getSupportedProtocols() {
-        return ProtocolVersion.supportedProtocols.clone();
+        return sslParameters.getSupportedProtocols();
     }
 
     /**
@@ -262,7 +269,7 @@ public class SSLEngineImpl extends SSLEn
      */
     @Override
     public void setEnabledProtocols(String[] protocols) {
-        sslParameters.setEnabledProtocols(protocols);
+        sslParameters.setEnabledProtocols(SSL, protocols);
     }
 
     /**
@@ -297,7 +304,7 @@ public class SSLEngineImpl extends SSLEn
      */
     @Override
     public void setNeedClientAuth(boolean need) {
-        sslParameters.setNeedClientAuth(need);
+        sslParameters.setNeedClientAuth(SSL, need);
     }
 
     /**
@@ -317,7 +324,7 @@ public class SSLEngineImpl extends SSLEn
      */
     @Override
     public void setWantClientAuth(boolean want) {
-        sslParameters.setWantClientAuth(want);
+        sslParameters.setWantClientAuth(SSL, want);
     }
 
     /**

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=986610&r1=986609&r2=986610&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
Wed Aug 18 09:42:26 2010
@@ -68,7 +68,7 @@ public class SSLParameters {
     private SecureRandom secureRandom;
 
     // string representations of available cipher suites
-    private String[] supportedCipherSuites = null;
+    static String[] supportedCipherSuites = null;
     private String[] enabledCipherSuites = null;
 
     // protocols suported and those enabled for SSL connection
@@ -97,8 +97,12 @@ public class SSLParameters {
     // Native address of the OpenSSL SSL_CTX struct
     private long SSL_CTX = 0;
 
+    // Native method that gets the default list of cipher suites from OpenSSL
+    private static native String[] getDefaultCipherSuites();
+
     static {
         System.loadLibrary("hyjsse");
+        supportedCipherSuites = getDefaultCipherSuites();
     }
 
     private static native long initialiseContext(byte[][] trustCerts, byte[] keyCert, byte[]
privateKey);
@@ -284,23 +288,16 @@ public class SSLParameters {
         return secureRandom;
     }
 
-
-    // TODO: implement the natives for get/set cipher suites
-    private static native String[] getSupportedCipherSuitesImpl(long SSL);
-
-    protected String[] getSupportedCipherSuites(long SSL) {
-        if (supportedCipherSuites == null) {
-            supportedCipherSuites = getSupportedCipherSuitesImpl(SSL);
-        }
+    protected String[] getSupportedCipherSuites() {
         return supportedCipherSuites.clone();
     }
 
     /**
      * @return the names of enabled cipher suites
      */
-    protected String[] getEnabledCipherSuites(long SSL) {
+    protected String[] getEnabledCipherSuites() {
         if (enabledCipherSuites == null) {
-            enabledCipherSuites = getSupportedCipherSuites(SSL);
+            enabledCipherSuites = supportedCipherSuites;
         }
         return enabledCipherSuites.clone();
     }
@@ -318,10 +315,6 @@ public class SSLParameters {
             throw new IllegalArgumentException("Provided parameter is null");
         }
 
-        if (supportedCipherSuites == null) {
-            supportedCipherSuites = getSupportedCipherSuitesImpl(SSL);
-        }
-
         for (int i=0; i<suites.length; i++) {
             boolean found = false;
             for (int j=0; j<supportedCipherSuites.length; j++) {

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.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/SSLSocketImpl.java?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
Wed Aug 18 09:42:26 2010
@@ -49,8 +49,6 @@ public class SSLSocketImpl extends SSLSo
 
     // record protocol to be used
     protected SSLRecordProtocol recordProtocol;
-    // handshake protocol to be used
-    private HandshakeProtocol handshakeProtocol;
     // alert protocol to be used
     private AlertProtocol alertProtocol;
     // application data input stream, this stream is presented by
@@ -84,6 +82,8 @@ public class SSLSocketImpl extends SSLSo
 
     // ----------------- Constructors and initializers --------------------
 
+    private native long initImpl(long context);
+
     /**
      * Constructor
      * @param   sslParameters:  SSLParameters
@@ -173,8 +173,6 @@ public class SSLSocketImpl extends SSLSo
         init();
     }
 
-
-    private native long initImpl(long context);
     /**
      * Initialize the SSL socket.
      */
@@ -220,7 +218,7 @@ public class SSLSocketImpl extends SSLSo
      */
     @Override
     public String[] getSupportedCipherSuites() {
-        return sslParameters.getSupportedCipherSuites(SSL);
+        return sslParameters.getSupportedCipherSuites();
     }
 
     /**
@@ -230,7 +228,7 @@ public class SSLSocketImpl extends SSLSo
      */
     @Override
     public String[] getEnabledCipherSuites() {
-        return sslParameters.getEnabledCipherSuites(SSL);
+        return sslParameters.getEnabledCipherSuites();
     }
 
     /**
@@ -603,8 +601,6 @@ public class SSLSocketImpl extends SSLSo
         if (handshake_started) {
             alertProtocol.shutdown();
             alertProtocol = null;
-            handshakeProtocol.shutdown();
-            handshakeProtocol = null;
             recordProtocol.shutdown();
             recordProtocol = null;
         }

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.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/ServerHandshakeImpl.java?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java
Wed Aug 18 09:42:26 2010
@@ -669,8 +669,9 @@ public class ServerHandshakeImpl extends
             if (!client_suites[i].supported) {
                 continue;
             }
-            for (int j = 0; j < parameters.enabledCipherSuites.length; j++) {
-                if (client_suites[i].equals(parameters.enabledCipherSuites[j])) {
+            String[] enabledCipherSuites = parameters.getEnabledCipherSuites();
+            for (int j = 0; j < enabledCipherSuites.length; j++) {
+                if (client_suites[i].equals(enabledCipherSuites[j])) {
                     return client_suites[i];
                 }
             }

Added: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c?rev=986610&view=auto
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c
(added)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c
Wed Aug 18 09:42:26 2010
@@ -0,0 +1,32 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "sslEngine.h"
+
+#include <stdio.h>
+#include "jni.h"
+#include "hysock.h"
+#include "openssl/bio.h"
+#include "openssl/ssl.h"
+#include "openssl/err.h"
+
+
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLEngineImpl_initImpl
+  (JNIEnv *env, jclass clazz, jlong context) {
+    return (jlong)SSL_new((SSL_CTX*)context);
+}
+

Propchange: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h?rev=986610&view=auto
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h
(added)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h
Wed Aug 18 09:42:26 2010
@@ -0,0 +1,33 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+#include <jni.h>
+
+#ifndef _SSLENGINE_H
+#define _SSLENGINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jlong JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLEngineImpl_initImpl
+  (JNIEnv *, jclass, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Propchange: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslEngine.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.c?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.c
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.c
Wed Aug 18 09:42:26 2010
@@ -24,6 +24,49 @@
 #include "openssl/err.h"
 #include "jsse_rand.h"
 
+JNIEXPORT jobjectArray JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_getDefaultCipherSuites
+  (JNIEnv *env, jclass clazz)
+{
+    SSL_CTX *context;
+    SSL *ssl;
+    int i, count;
+    jclass stringClass;
+    jobjectArray stringArray; 
+    STACK_OF(SSL_CIPHER) *ciphers;
+
+    SSL_library_init();
+    SSL_load_error_strings();
+    OpenSSL_add_all_algorithms();
+
+    context = SSL_CTX_new(SSLv23_method());
+
+    /*ret = SSL_CTX_set_cipher_list(context, "ALL");
+    if (ret<=0) {
+       ERR_print_errors_fp(stderr);
+    }*/
+
+    ssl = SSL_new(context);
+
+    ciphers = SSL_get_ciphers(ssl);
+    count = sk_num(&ciphers->stack);
+
+    stringClass = (*env)->FindClass(env, "java/lang/String");
+    stringArray = (*env)->NewObjectArray(env, count, stringClass, NULL);
+
+    for (i=0; i<count; i++)
+    {
+        const char *cipherName = SSL_CIPHER_get_name(sk_value(&ciphers->stack, i));
+        jstring jcipherName = (*env)->NewStringUTF(env, cipherName);
+        (*env)->SetObjectArrayElement(env, stringArray, i, jcipherName);
+        (*env)->DeleteLocalRef(env, jcipherName);
+    }
+
+    SSL_free(ssl);
+    SSL_CTX_free(context);
+
+    return stringArray;
+}
+
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_initialiseContext
   (JNIEnv *env, jclass clazz, jbyteArray jtrustCerts, jbyteArray jkeyCert, jbyteArray jprivateKey)
 {
@@ -37,9 +80,6 @@ JNIEXPORT jlong JNICALL Java_org_apache_
     RAND_METHOD *randMethod;
     JavaVM *jvm;
 
-    SSL_library_init();
-    SSL_load_error_strings();
-    OpenSSL_add_all_algorithms();
     context = SSL_CTX_new(SSLv23_method());
 
     ret = SSL_CTX_set_cipher_list(context, "ALL");
@@ -181,31 +221,6 @@ JNIEXPORT void JNICALL Java_org_apache_h
     }
 }
 
-JNIEXPORT jobjectArray JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_getSupportedCipherSuitesImpl
-  (JNIEnv *env, jclass clazz, jlong jssl)
-{
-    SSL *ssl = (SSL*)jssl;
-    int i, count;
-    jclass stringClass;
-    jobjectArray stringArray; 
-    STACK_OF(SSL_CIPHER) *ciphers;
-
-    ciphers = SSL_get_ciphers(ssl);
-    count = sk_num(&ciphers->stack);
-
-    stringClass = (*env)->FindClass(env, "java/lang/String");
-    stringArray = (*env)->NewObjectArray(env, count, stringClass, NULL);
-
-    for (i=0; i<count; i++)
-    {
-        const char *cipherName = SSL_CIPHER_get_name(sk_value(&ciphers->stack, i));
-        jstring jcipherName = (*env)->NewStringUTF(env, cipherName);
-        (*env)->SetObjectArrayElement(env, stringArray, i, jcipherName);
-        (*env)->DeleteLocalRef(env, jcipherName);
-    }
-    return stringArray;
-}
-
 JNIEXPORT void JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setEnabledCipherSuitesImpl
   (JNIEnv *env, jclass clazz, jlong context, jlong jssl, jobjectArray jenabledCiphers)
 {

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.h?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.h
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslParameters.h
Wed Aug 18 09:42:26 2010
@@ -34,14 +34,14 @@ extern "C" {
 #define REQUEST_CLIENT_AUTH 2
 #define REQUIRE_CLIENT_AUTH 4
 
+JNIEXPORT jobjectArray JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_getDefaultCipherSuites
+  (JNIEnv *, jclass);
 JNIEXPORT jlong JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_initialiseContext
   (JNIEnv *, jclass, jobjectArray, jbyteArray, jbyteArray);
 JNIEXPORT void JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setEnabledProtocolsImpl
   (JNIEnv *, jclass, jlong, jlong, jint);
 JNIEXPORT void JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setClientAuthImpl
   (JNIEnv *, jclass, jlong, jlong, jshort);
-JNIEXPORT jobjectArray JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_getSupportedCipherSuitesImpl
-  (JNIEnv *, jclass, jlong);
 JNIEXPORT void JNICALL Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setEnabledCipherSuitesImpl
   (JNIEnv *, jclass, jlong, jlong, jobjectArray);
 

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.h?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.h
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.h
Wed Aug 18 09:42:26 2010
@@ -16,8 +16,8 @@
  */
 #include <jni.h>
 
-#ifndef _SERVERSOCKET_H
-#define _SERVERSOCKET_H
+#ifndef _SSLSOCKET_H
+#define _SSLSOCKET_H
 
 #ifdef __cplusplus
 extern "C" {

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt
Wed Aug 18 09:42:26 2010
@@ -9,4 +9,4 @@ Java_org_apache_harmony_xnet_provider_js
 Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_sslConnectImpl
 Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_writeAppDataImpl
 Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_needAppDataImpl
-
+Java_org_apache_harmony_xnet_provider_jsse_SSLEngineImpl_initImpl

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/makefile?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/makefile
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/makefile
Wed Aug 18 09:42:26 2010
@@ -29,7 +29,7 @@ endif
 
 BUILDFILES = \
 	$(SHAREDSUB)jsse_copyright.o $(SHAREDSUB)sslParameters.o $(SHAREDSUB)sslSocket.o \
-	$(SHAREDSUB)sslSession.o $(SHAREDSUB)jsse_rand.o
+	$(SHAREDSUB)sslSession.o $(SHAREDSUB)sslEngine.o $(SHAREDSUB)jsse_rand.o
 
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
 	$(OPENSSL_DIST)out32/libeay32$(HY_LINKLIB_SUFFIX) $(OPENSSL_DIST)out32/ssleay32$(HY_LINKLIB_SUFFIX)

Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/windows/makefile?rev=986610&r1=986609&r2=986610&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/windows/makefile
(original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/windows/makefile
Wed Aug 18 09:42:26 2010
@@ -29,7 +29,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 BUILDFILES = \
   $(SHAREDSUB)jsse_copyright.obj $(SHAREDSUB)sslParameters.obj $(SHAREDSUB)sslSocket.obj
\
-  $(SHAREDSUB)sslSession.obj $(SHAREDSUB)jsse_rand.obj
+  $(SHAREDSUB)sslSession.obj $(SHAREDSUB)sslEngine.obj $(SHAREDSUB)jsse_rand.obj
 
 VIRTFILES = hyjsse.res
 



Mime
View raw message