projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a version of async_test using openssl 1.1.0
[folly.git]
/
folly
/
io
/
async
/
test
/
AsyncSSLSocketTest.h
diff --git
a/folly/io/async/test/AsyncSSLSocketTest.h
b/folly/io/async/test/AsyncSSLSocketTest.h
index d2acbf43258165148113925a4fd2641efaabc8a9..816971d6dd4c369b64219883682bddf382a323b4 100644
(file)
--- a/
folly/io/async/test/AsyncSSLSocketTest.h
+++ b/
folly/io/async/test/AsyncSSLSocketTest.h
@@
-968,6
+968,7
@@
class NpnClient :
const unsigned char* nextProto;
unsigned nextProtoLength;
SSLContext::NextProtocolType protocolType;
const unsigned char* nextProto;
unsigned nextProtoLength;
SSLContext::NextProtocolType protocolType;
+ folly::Optional<AsyncSocketException> except;
private:
void handshakeSuc(AsyncSSLSocket*) noexcept override {
private:
void handshakeSuc(AsyncSSLSocket*) noexcept override {
@@
-977,7
+978,7
@@
class NpnClient :
void handshakeErr(
AsyncSSLSocket*,
const AsyncSocketException& ex) noexcept override {
void handshakeErr(
AsyncSSLSocket*,
const AsyncSocketException& ex) noexcept override {
-
ADD_FAILURE() << "client handshake error: " << ex.what()
;
+
except = ex
;
}
void writeSuccess() noexcept override {
socket_->close();
}
void writeSuccess() noexcept override {
socket_->close();
@@
-1004,6
+1005,7
@@
class NpnServer :
const unsigned char* nextProto;
unsigned nextProtoLength;
SSLContext::NextProtocolType protocolType;
const unsigned char* nextProto;
unsigned nextProtoLength;
SSLContext::NextProtocolType protocolType;
+ folly::Optional<AsyncSocketException> except;
private:
void handshakeSuc(AsyncSSLSocket*) noexcept override {
private:
void handshakeSuc(AsyncSSLSocket*) noexcept override {
@@
-1013,7
+1015,7
@@
class NpnServer :
void handshakeErr(
AsyncSSLSocket*,
const AsyncSocketException& ex) noexcept override {
void handshakeErr(
AsyncSSLSocket*,
const AsyncSocketException& ex) noexcept override {
-
ADD_FAILURE() << "server handshake error: " << ex.what()
;
+
except = ex
;
}
void getReadBuffer(void** /* bufReturn */, size_t* lenReturn) override {
*lenReturn = 0;
}
void getReadBuffer(void** /* bufReturn */, size_t* lenReturn) override {
*lenReturn = 0;