commit 7b73b7beda88501b9d6e062a5dbf9a72f791dfda
author Matt Caswell <matt@openssl.org> Wed Oct 12 10:56:29 2016 +0100
committer Matt Caswell <matt@openssl.org> Fri Nov 04 10:38:54 2016 +0000
tree b543407170dba31204f5afc0015fec5dff1eb163
parent 8c6c5077b211ea73223c950edff98f0891853dc8

Rebase shim against latest boringssl code

Numerous conflicts resolved. rebase was against commit 490469f850.

Reviewed-by: Richard Levitte <levitte@openssl.org>

test/ossl_shim/async_bio.cc

diff --git a/test/ossl_shim/async_bio.cc b/test/ossl_shim/async_bio.cc
index 825b223..b905a0e 100644
--- a/test/ossl_shim/async_bio.cc
+++ b/test/ossl_shim/async_bio.cc
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <string.h>
 
+#include <openssl/bio.h>
 #include <openssl/crypto.h>
 
 
@@ -158,12 +159,12 @@
 
 }  // namespace
 
-ScopedBIO AsyncBioCreate() {
-  return ScopedBIO(BIO_new(AsyncMethod()));
+bssl::UniquePtr<BIO> AsyncBioCreate() {
+  return bssl::UniquePtr<BIO>(BIO_new(AsyncMethod()));
 }
 
-ScopedBIO AsyncBioCreateDatagram() {
-  ScopedBIO ret(BIO_new(AsyncMethod()));
+bssl::UniquePtr<BIO> AsyncBioCreateDatagram() {
+  bssl::UniquePtr<BIO> ret(BIO_new(AsyncMethod()));
   if (!ret) {
     return nullptr;
   }