commit eced839c4c36a24c55cc33bdd922c8f31faf858b
author Adam Langley <agl@google.com> Mon Sep 14 15:19:24 2015 -0700
committer Adam Langley <agl@google.com> Mon Sep 14 16:52:49 2015 -0700
tree 90c12280aea0852267df551cb4b1393a690a8ef4
parent bb70f6a0de9e2a37016975802ab13d6ced6717bc

Remove references to OpenSSL's |wbuf|.

The |wbuf| member is an internal field that disappears in the latest
BoringSSL revision. Also, it doesn't appear to be neccessary: SSL_write
won't report that bytes were written until the record has hit the
transport, so there's no need to be sensitive to an implementation
detail.

(See also cl/100529082.)

Change-Id: I036bb7ebf69649025967a2af467313d7676e62ca

src/main/native/org_conscrypt_NativeCrypto.cpp

diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp
index f7fbfe5..c8c4fcc 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -9931,7 +9931,7 @@
 
     int count = len;
 
-    while (appData->aliveAndKicking && ((len > 0) || (ssl->s3->wbuf.left > 0))) {
+    while (appData->aliveAndKicking && len > 0) {
         errno = 0;
 
         if (MUTEX_LOCK(appData->mutex) == -1) {
@@ -9952,7 +9952,7 @@
             MUTEX_UNLOCK(appData->mutex);
             return THROWN_EXCEPTION;
         }
-        JNI_TRACE("ssl=%p sslWrite SSL_write len=%d left=%d", ssl, len, ssl->s3->wbuf.left);
+        JNI_TRACE("ssl=%p sslWrite SSL_write len=%d", ssl, len);
         int result = SSL_write(ssl, buf, len);
         appData->clearCallbackState();
         // callbacks can happen if server requests renegotiation
@@ -9962,8 +9962,8 @@
             return THROWN_EXCEPTION;
         }
         sslError.reset(ssl, result);
-        JNI_TRACE("ssl=%p sslWrite SSL_write result=%d sslError=%d left=%d",
-                  ssl, result, sslError.get(), ssl->s3->wbuf.left);
+        JNI_TRACE("ssl=%p sslWrite SSL_write result=%d sslError=%d",
+                  ssl, result, sslError.get());
 #ifdef WITH_JNI_TRACE_DATA
         for (int i = 0; i < result; i+= WITH_JNI_TRACE_DATA_CHUNK_SIZE) {
             int n = result - i;
@@ -10123,8 +10123,8 @@
         return -1;
     }
     OpenSslError sslError(ssl, result);
-    JNI_TRACE("ssl=%p NativeCrypto_SSL_write_BIO SSL_write result=%d sslError=%d left=%d",
-              ssl, result, sslError.get(), ssl->s3->wbuf.left);
+    JNI_TRACE("ssl=%p NativeCrypto_SSL_write_BIO SSL_write result=%d sslError=%d",
+              ssl, result, sslError.get());
 #ifdef WITH_JNI_TRACE_DATA
     for (int i = 0; i < result; i+= WITH_JNI_TRACE_DATA_CHUNK_SIZE) {
         int n = result - i;