Add automatic initialization of SecureSocket library.

runtime/bin/secure_socket.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/secure_socket.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ skipping 246 matching lines @@
       DartUtils::GetDartClass(DartUtils::kIOLibURL, "X509Certificate");
   Dart_Handle arguments[] = { subject_name_object,
                               issuer_name_object,
                               start_validity_date,
                               end_validity_date };
   return Dart_New(x509_class, Dart_Null(), 4, arguments);
 }
 
 
 void SSLFilter::Init(Dart_Handle dart_this) {
+  if (!library_initialized_) {
+    InitializeLibrary(NULL, "", true, false);
+  }
   string_start_ = ThrowIfError(
       Dart_NewPersistentHandle(DartUtils::NewString("start")));
   string_length_ = ThrowIfError(
       Dart_NewPersistentHandle(DartUtils::NewString("length")));
 
   InitializeBuffers(dart_this);
   filter_ = memio_CreateIOLayer(kMemioBufferSize);
 }
 
 
@@ skipping 36 matching lines @@
 void SSLFilter::RegisterBadCertificateCallback(Dart_Handle callback) {
   if (NULL != bad_certificate_callback_) {
     Dart_DeletePersistentHandle(bad_certificate_callback_);
   }
   bad_certificate_callback_ = ThrowIfError(Dart_NewPersistentHandle(callback));
 }
 
 
 void SSLFilter::InitializeLibrary(const char* certificate_database,
                                   const char* password,
-                                  bool use_builtin_root_certificates) {
+                                  bool use_builtin_root_certificates,
+                                  bool report_duplicate_initialization) {
   MutexLocker locker(&mutex_);
   if (!library_initialized_) {
     library_initialized_ = true;
     password_ = strdup(password);  // This one copy persists until Dart exits.
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
     // TODO(whesse): Verify there are no UTF-8 issues here.
     PRUint32 init_flags = NSS_INIT_READONLY;
     if (certificate_database == NULL) {
       // Passing the empty string as the database path does not try to open
       // a database in the current directory.
@@ skipping 21 matching lines @@
     // Enable TLS, as well as SSL3 and SSL2.
     status = SSL_OptionSetDefault(SSL_ENABLE_TLS, PR_TRUE);
     if (status != SECSuccess) {
       ThrowPRException("Failed SSL_OptionSetDefault enable TLS call.");
     }
     status = SSL_ConfigServerSessionIDCache(0, 0, 0, NULL);
     if (status != SECSuccess) {
       ThrowPRException("Failed SSL_ConfigServerSessionIDCache call.");
     }
 
-  } else {
+  } else if (report_duplicate_initialization) {
+    mutex_.Unlock();  // MutexLocker destructor not called when throwing.

[floitsch, 2012/12/20 17:57:51]

The ... is not called ...

     ThrowException("Called SSLFilter::InitializeLibrary more than once");
   }
 }
 
 
 char* PasswordCallback(PK11SlotInfo* slot, PRBool retry, void* arg) {
   if (!retry) {
     return PL_strdup(static_cast<char*>(arg));  // Freed by NSS internals.
   }
   return NULL;
@@ skipping 277 matching lines @@
         if (PR_WOULD_BLOCK_ERROR != pr_error) {
           ThrowPRException("Error reading plaintext from SSLFilter");
         }
         bytes_processed = 0;
       }
       break;
     }
   }
   return bytes_processed;
 }