Index: runtime/bin/secure_socket_filter.cc |
diff --git a/runtime/bin/secure_socket_filter.cc b/runtime/bin/secure_socket_filter.cc |
index c07eaad404f7c228d26a507766b65a0e06d00438..868d06614b7fc89ac888642045bd09398792e1b9 100644 |
--- a/runtime/bin/secure_socket_filter.cc |
+++ b/runtime/bin/secure_socket_filter.cc |
@@ -16,7 +16,6 @@ |
#include "bin/security_context.h" |
#include "platform/text_buffer.h" |
- |
// Return the error from the containing function if handle is an error handle. |
#define RETURN_IF_ERROR(handle) \ |
{ \ |
@@ -48,7 +47,6 @@ static SSLFilter* GetFilter(Dart_NativeArguments args) { |
return filter; |
} |
- |
static void DeleteFilter(void* isolate_data, |
Dart_WeakPersistentHandle handle, |
void* context_pointer) { |
@@ -56,7 +54,6 @@ static void DeleteFilter(void* isolate_data, |
filter->Release(); |
} |
- |
static Dart_Handle SetFilter(Dart_NativeArguments args, SSLFilter* filter) { |
ASSERT(filter != NULL); |
Dart_Handle dart_this = Dart_GetNativeArgument(args, 0); |
@@ -71,7 +68,6 @@ static Dart_Handle SetFilter(Dart_NativeArguments args, SSLFilter* filter) { |
return Dart_Null(); |
} |
- |
void FUNCTION_NAME(SecureSocket_Init)(Dart_NativeArguments args) { |
Dart_Handle dart_this = ThrowIfError(Dart_GetNativeArgument(args, 0)); |
SSLFilter* filter = new SSLFilter(); |
@@ -89,7 +85,6 @@ void FUNCTION_NAME(SecureSocket_Init)(Dart_NativeArguments args) { |
} |
} |
- |
void FUNCTION_NAME(SecureSocket_Connect)(Dart_NativeArguments args) { |
Dart_Handle host_name_object = ThrowIfError(Dart_GetNativeArgument(args, 1)); |
Dart_Handle context_object = ThrowIfError(Dart_GetNativeArgument(args, 2)); |
@@ -119,7 +114,6 @@ void FUNCTION_NAME(SecureSocket_Connect)(Dart_NativeArguments args) { |
require_client_certificate, protocols_handle); |
} |
- |
void FUNCTION_NAME(SecureSocket_Destroy)(Dart_NativeArguments args) { |
SSLFilter* filter = GetFilter(args); |
// There are two paths that can clean up an SSLFilter object. First, |
@@ -135,18 +129,15 @@ void FUNCTION_NAME(SecureSocket_Destroy)(Dart_NativeArguments args) { |
filter->Destroy(); |
} |
- |
void FUNCTION_NAME(SecureSocket_Handshake)(Dart_NativeArguments args) { |
GetFilter(args)->Handshake(); |
} |
- |
void FUNCTION_NAME(SecureSocket_GetSelectedProtocol)( |
Dart_NativeArguments args) { |
GetFilter(args)->GetSelectedProtocol(args); |
} |
- |
void FUNCTION_NAME(SecureSocket_Renegotiate)(Dart_NativeArguments args) { |
bool use_session_cache = |
DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 1)); |
@@ -158,7 +149,6 @@ void FUNCTION_NAME(SecureSocket_Renegotiate)(Dart_NativeArguments args) { |
require_client_certificate); |
} |
- |
void FUNCTION_NAME(SecureSocket_RegisterHandshakeCompleteCallback)( |
Dart_NativeArguments args) { |
Dart_Handle handshake_complete = |
@@ -170,7 +160,6 @@ void FUNCTION_NAME(SecureSocket_RegisterHandshakeCompleteCallback)( |
GetFilter(args)->RegisterHandshakeCompleteCallback(handshake_complete); |
} |
- |
void FUNCTION_NAME(SecureSocket_RegisterBadCertificateCallback)( |
Dart_NativeArguments args) { |
Dart_Handle callback = ThrowIfError(Dart_GetNativeArgument(args, 1)); |
@@ -181,13 +170,11 @@ void FUNCTION_NAME(SecureSocket_RegisterBadCertificateCallback)( |
GetFilter(args)->RegisterBadCertificateCallback(callback); |
} |
- |
void FUNCTION_NAME(SecureSocket_PeerCertificate)(Dart_NativeArguments args) { |
Dart_Handle cert = ThrowIfError(GetFilter(args)->PeerCertificate()); |
Dart_SetReturnValue(args, cert); |
} |
- |
void FUNCTION_NAME(SecureSocket_FilterPointer)(Dart_NativeArguments args) { |
SSLFilter* filter = GetFilter(args); |
// This filter pointer is passed to the IO Service thread. The IO Service |
@@ -197,7 +184,6 @@ void FUNCTION_NAME(SecureSocket_FilterPointer)(Dart_NativeArguments args) { |
Dart_SetReturnValue(args, Dart_NewInteger(filter_pointer)); |
} |
- |
/** |
* Pushes data through the SSL filter, reading and writing from circular |
* buffers shared with Dart. |
@@ -251,7 +237,6 @@ CObject* SSLFilter::ProcessFilterRequest(const CObjectArray& request) { |
} |
} |
- |
bool SSLFilter::ProcessAllBuffers(int starts[kNumBuffers], |
int ends[kNumBuffers], |
bool in_handshake) { |
@@ -324,7 +309,6 @@ bool SSLFilter::ProcessAllBuffers(int starts[kNumBuffers], |
return true; |
} |
- |
Dart_Handle SSLFilter::Init(Dart_Handle dart_this) { |
if (!library_initialized_) { |
InitializeLibrary(); |
@@ -342,7 +326,6 @@ Dart_Handle SSLFilter::Init(Dart_Handle dart_this) { |
return InitializeBuffers(dart_this); |
} |
- |
Dart_Handle SSLFilter::InitializeBuffers(Dart_Handle dart_this) { |
// Create SSLFilter buffers as ExternalUint8Array objects. |
Dart_Handle buffers_string = DartUtils::NewString("buffers"); |
@@ -421,7 +404,6 @@ Dart_Handle SSLFilter::InitializeBuffers(Dart_Handle dart_this) { |
return result; |
} |
- |
void SSLFilter::RegisterHandshakeCompleteCallback(Dart_Handle complete) { |
ASSERT(NULL == handshake_complete_); |
handshake_complete_ = Dart_NewPersistentHandle(complete); |
@@ -429,7 +411,6 @@ void SSLFilter::RegisterHandshakeCompleteCallback(Dart_Handle complete) { |
ASSERT(handshake_complete_ != NULL); |
} |
- |
void SSLFilter::RegisterBadCertificateCallback(Dart_Handle callback) { |
ASSERT(bad_certificate_callback_ != NULL); |
Dart_DeletePersistentHandle(bad_certificate_callback_); |
@@ -437,7 +418,6 @@ void SSLFilter::RegisterBadCertificateCallback(Dart_Handle callback) { |
ASSERT(bad_certificate_callback_ != NULL); |
} |
- |
Dart_Handle SSLFilter::PeerCertificate() { |
X509* ca = SSL_get_peer_certificate(ssl_); |
if (ca == NULL) { |
@@ -446,7 +426,6 @@ Dart_Handle SSLFilter::PeerCertificate() { |
return X509Helper::WrappedX509Certificate(ca); |
} |
- |
void SSLFilter::InitializeLibrary() { |
MutexLocker locker(mutex_); |
if (!library_initialized_) { |
@@ -457,7 +436,6 @@ void SSLFilter::InitializeLibrary() { |
} |
} |
- |
void SSLFilter::Connect(const char* hostname, |
SSLCertContext* context, |
bool is_server, |
@@ -539,7 +517,6 @@ void SSLFilter::Connect(const char* hostname, |
Handshake(); |
} |
- |
void SSLFilter::Handshake() { |
// Try and push handshake along. |
int status; |
@@ -582,7 +559,6 @@ void SSLFilter::Handshake() { |
} |
} |
- |
void SSLFilter::GetSelectedProtocol(Dart_NativeArguments args) { |
const uint8_t* protocol; |
unsigned length; |
@@ -594,7 +570,6 @@ void SSLFilter::GetSelectedProtocol(Dart_NativeArguments args) { |
} |
} |
- |
void SSLFilter::Renegotiate(bool use_session_cache, |
bool request_client_certificate, |
bool require_client_certificate) { |
@@ -606,7 +581,6 @@ void SSLFilter::Renegotiate(bool use_session_cache, |
// and triggering rehandshake. |
} |
- |
void SSLFilter::FreeResources() { |
if (ssl_ != NULL) { |
SSL_free(ssl_); |
@@ -628,12 +602,10 @@ void SSLFilter::FreeResources() { |
} |
} |
- |
SSLFilter::~SSLFilter() { |
FreeResources(); |
} |
- |
void SSLFilter::Destroy() { |
for (int i = 0; i < kNumBuffers; ++i) { |
if (dart_buffer_objects_[i] != NULL) { |
@@ -660,7 +632,6 @@ void SSLFilter::Destroy() { |
FreeResources(); |
} |
- |
/* Read decrypted data from the filter to the circular buffer */ |
int SSLFilter::ProcessReadPlaintextBuffer(int start, int end) { |
int length = end - start; |
@@ -678,7 +649,6 @@ int SSLFilter::ProcessReadPlaintextBuffer(int start, int end) { |
return bytes_processed; |
} |
- |
int SSLFilter::ProcessWritePlaintextBuffer(int start, int end) { |
int length = end - start; |
int bytes_processed = |
@@ -692,7 +662,6 @@ int SSLFilter::ProcessWritePlaintextBuffer(int start, int end) { |
return bytes_processed; |
} |
- |
/* Read encrypted data from the circular buffer to the filter */ |
int SSLFilter::ProcessReadEncryptedBuffer(int start, int end) { |
int length = end - start; |
@@ -717,7 +686,6 @@ int SSLFilter::ProcessReadEncryptedBuffer(int start, int end) { |
return bytes_processed; |
} |
- |
int SSLFilter::ProcessWriteEncryptedBuffer(int start, int end) { |
int length = end - start; |
int bytes_processed = 0; |