commit e981ca93b3eb5f216ec29c3cc695c550f0d01076
author Kenny Root <kroot@google.com> Mon Jun 15 15:25:02 2015 -0700
committer Kenny Root <kroot@google.com> Mon Jun 15 15:25:02 2015 -0700
tree 774884818b1e03695186e61960a7a02457a79f33
parent a00142199f81acd00671d07d288845b5a5f15381

Use the *_up_ref functions always

Change-Id: Ic6002f364bcae802fc1c007bb86504bc36897882

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 4861492..a7528a3 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -1193,13 +1193,8 @@
 public:
     ScopedSslBio(SSL *ssl, BIO* rbio, BIO* wbio) : ssl_(ssl) {
         SSL_set_bio(ssl_, rbio, wbio);
-#if defined(OPENSSL_IS_BORINGSSL)
         BIO_up_ref(rbio);
         BIO_up_ref(wbio);
-#else
-        CRYPTO_add(&rbio->references,1,CRYPTO_LOCK_BIO);
-        CRYPTO_add(&wbio->references,1,CRYPTO_LOCK_BIO);
-#endif
     }
 
     ~ScopedSslBio() {
@@ -8290,11 +8285,7 @@
     // SSL_set1_tls_channel_id expects to take ownership of the EVP_PKEY, but
     // we have an external reference from the caller such as an OpenSSLKey,
     // so we manually increment the reference count here.
-#if defined(OPENSSL_IS_BORINGSSL)
     EVP_PKEY_up_ref(pkey);
-#else
-    CRYPTO_add(&pkey->references,+1,CRYPTO_LOCK_EVP_PKEY);
-#endif
 
     JNI_TRACE("ssl=%p SSL_set1_tls_channel_id => ok", ssl);
 }
@@ -8324,11 +8315,7 @@
     // SSL_use_PrivateKey expects to take ownership of the EVP_PKEY,
     // but we have an external reference from the caller such as an
     // OpenSSLKey, so we manually increment the reference count here.
-#if defined(OPENSSL_IS_BORINGSSL)
     EVP_PKEY_up_ref(pkey);
-#else
-    CRYPTO_add(&pkey->references,+1,CRYPTO_LOCK_EVP_PKEY);
-#endif
 
     JNI_TRACE("ssl=%p SSL_use_PrivateKey => ok", ssl);
 }