diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-21 22:32:21 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-09-22 08:40:43 -0700 |
| commit | 1be19cf6a06834e97608dffd87c30d604b02196a (patch) | |
| tree | 8a2ee7346e067c8744e00dd7450fc8a873747a98 /luni | |
| parent | 301db343e965a7943704887bf29e7f2d94fd3ac6 (diff) | |
| download | libcore-1be19cf6a06834e97608dffd87c30d604b02196a.zip libcore-1be19cf6a06834e97608dffd87c30d604b02196a.tar.gz libcore-1be19cf6a06834e97608dffd87c30d604b02196a.tar.bz2 | |
Tracking external/bouncycastle OpenSSLDigest
Making OpenSSLMessageDigestJDK final to match OpenSSLDigest version
Fixing WITH_JNI_TRACE used for debugging OpenSSLDigest
Bug: 3024499
Change-Id: I919749348e531d074a25e16ab13315cede4f88e5
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java | 2 | ||||
| -rw-r--r-- | luni/src/main/native/NativeCrypto.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java index 0742587..b01670d 100644 --- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java +++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigestJDK.java @@ -37,7 +37,7 @@ public class OpenSSLMessageDigestJDK extends MessageDigest implements Cloneable /** * Holds a dummy buffer for writing single bytes to the digest. */ - private byte[] singleByte = new byte[1]; + private final byte[] singleByte = new byte[1]; /** * Creates a new OpenSSLMessageDigest instance for the given algorithm diff --git a/luni/src/main/native/NativeCrypto.cpp b/luni/src/main/native/NativeCrypto.cpp index 8c8cda7..e304c04 100644 --- a/luni/src/main/native/NativeCrypto.cpp +++ b/luni/src/main/native/NativeCrypto.cpp @@ -1434,6 +1434,9 @@ static int sslSelect(JNIEnv* env, int type, AppData* appData, int timeout) { { AsynchronousSocketCloseMonitor monitor(intFd); result = select(max + 1, &rfds, &wfds, NULL, ptv); + JNI_TRACE("sslSelect %s fd=%d appData=%p timeout=%d => %d", + (type == SSL_ERROR_WANT_READ) ? "READ" : "WRITE", + fd.get(), appData, timeout, result); if (result == -1) { if (fd.isClosed()) { result = THROWN_SOCKETEXCEPTION; @@ -1469,8 +1472,6 @@ static int sslSelect(JNIEnv* env, int type, AppData* appData, int timeout) { // Unlock MUTEX_UNLOCK(appData->mutex); - JNI_TRACE("sslSelect %s fd=%d appData=%p timeout=%d => %d", - (type == SSL_ERROR_WANT_READ) ? "READ" : "WRITE", intFd, appData, timeout, result); return result; } @@ -2423,7 +2424,7 @@ static jint NativeCrypto_SSL_do_handshake(JNIEnv* env, jclass, } int ret = SSL_set_fd(ssl, fd.get()); - JNI_TRACE("ssl=%p NativeCrypto_SSL_do_handshake s=%d", ssl, fd); + JNI_TRACE("ssl=%p NativeCrypto_SSL_do_handshake s=%d", ssl, fd.get()); if (ret != 1) { throwSSLExceptionWithSslErrors(env, ssl, SSL_ERROR_NONE, |