You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by od...@apache.org on 2010/09/02 16:28:08 UTC
svn commit: r991948 - in
/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse:
shared/sslSocket.c unix/exports.txt
Author: odeakin
Date: Thu Sep 2 14:28:07 2010
New Revision: 991948
URL: http://svn.apache.org/viewvc?rev=991948&view=rev
Log:
Apply x-net-3.patch patch for HARMONY-6627 ([classlib][x-net] Creating a JSSE provider based on OpenSSL)
Modified:
harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.c
harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/unix/exports.txt
Modified: harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.c?rev=991948&r1=991947&r2=991948&view=diff
==============================================================================
--- harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.c (original)
+++ harmony/enhanced/java/branches/omd/classlib/modules/x-net/src/main/native/jsse/shared/sslSocket.c Thu Sep 2 14:28:07 2010
@@ -25,7 +25,7 @@
#include "errno.h"
jlong getFD(jlong fd) {
- hysocket_t hysocketP = (hysocket_t) fd;
+ hysocket_t hysocketP = jlong2addr(hysocket_struct, fd);
#if defined(WIN32) || defined(WIN64)
if (hysocketP->flags & SOCKET_IPV4_OPEN_MASK) {
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=991948&r1=991947&r2=991948&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 Thu Sep 2 14:28:07 2010
@@ -4,6 +4,8 @@ Java_org_apache_harmony_xnet_provider_js
Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setClientAuthImpl
Java_org_apache_harmony_xnet_provider_jsse_SSLParameters_setEnabledCipherSuitesImpl
Java_org_apache_harmony_xnet_provider_jsse_SSLSessionImpl_initialiseSession
+Java_org_apache_harmony_xnet_provider_jsse_SSLSessionImpl_getCipherNameImpl
+Java_org_apache_harmony_xnet_provider_jsse_SSLSessionImpl_getCreationTimeImpl
Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_initImpl
Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_sslAcceptImpl
Java_org_apache_harmony_xnet_provider_jsse_SSLSocketImpl_sslConnectImpl