[Gnash-commit] /srv/bzr/gnash/trunk r11298: merge from branch.

[rob]

------------------------------------------------------------
revno: 11298
committer: address@hidden
branch nick: trunk
timestamp: Tue 2009-07-21 16:36:18 -0600
message:
  merge from branch.
modified:
  libbase/gnashrc.in
  libnet/sslclient.cpp
  libnet/sslclient.h
  testsuite/libbase.all/TCXXRc.cpp
    ------------------------------------------------------------
    revno: 11256.1.17
    committer: address@hidden
    branch nick: ssh
    timestamp: Tue 2009-07-21 16:31:42 -0600
    message:
      set client SSL mode in the right place to actually be able to write data. 
Use the RC settings for finding SSL certificates.
    modified:
      libbase/gnashrc.in
      libnet/sslclient.cpp
      libnet/sslclient.h
      testsuite/libbase.all/TCXXRc.cpp

=== modified file 'libbase/gnashrc.in'
--- a/libbase/gnashrc.in        2009-07-21 21:59:27 +0000
+++ b/libbase/gnashrc.in        2009-07-21 22:36:18 +0000
@@ -230,7 +230,6 @@
 # Set the default directory used for certificates
 #set CertDir /etc/pki/tls
 
-# Stage.showMenu ignore behavior
 # By default gnash ignores changes to Stage.showMenu which limits what appears
 # in the context menu (right click menu). Set to false to allow the swf author
 # to suppress some menu settings

=== modified file 'libnet/sslclient.cpp'
--- a/libnet/sslclient.cpp      2009-07-20 20:57:44 +0000
+++ b/libnet/sslclient.cpp      2009-07-21 22:31:42 +0000
@@ -73,6 +73,7 @@
 // The debug log used by all the gnash libraries.
 
 static LogFile& dbglogfile = LogFile::getDefaultInstance();
+RcInitFile& rc = RcInitFile::getDefaultInstance();
 
 // This is static in this file, instead of being a private variable in
 // the SSLCLient class, is so it's accessible from the C function callback,
@@ -84,18 +85,18 @@
 {
 
 const size_t SSL_PASSWD_SIZE = 1024;
-const char  *SSL_HOST    = "localhost";
-const char  *SSL_CA_LIST = "rootcert.pem";
-const char  *SSL_CLIENT_CERTFILE  = "client.pem";
-const char  *SSL_CLIENT_ROOTPATH = "/etc/pki/tls";
+static const char  *SSL_HOST    = "localhost";
+// static const char  *SSL_CA_LIST = "rootcert.pem";
+// static const char  *SSL_CLIENT_CERTFILE  = "client.pem";
+// static const char  *SSL_CLIENT_ROOTPATH = "/etc/pki/tls";
 
 // const char *RANDOM  = "random.pem";
 
 SSLClient::SSLClient()
     : _hostname("localhost"),
-      _calist(SSL_CA_LIST),
-      _keyfile(SSL_CLIENT_CERTFILE),
-      _rootpath(SSL_CLIENT_ROOTPATH),
+      _calist(rc.getRootCert()),
+      _keyfile(rc.getCertFile()),
+      _rootpath(rc.getCertDir()),
       _need_server_auth(true)
 {
     GNASH_REPORT_FUNCTION;
@@ -108,7 +109,7 @@
     RAND_load_file("/dev/urandom", 1024);
 
     // Load the error strings so the SSL_error_*() functions work
-    SSL_load_error_strings();    
+    SSL_load_error_strings();
 }
 
 SSLClient::~SSLClient()
@@ -302,7 +303,8 @@
 #endif
 
     SSL_set_bio(_ssl.get(), _bio.get(), _bio.get());
-
+    SSL_set_connect_state(_ssl.get());
+    
     if ((ret = SSL_connect(_ssl.get())) < 0) {
         log_error("Can't connect to SSL server %s", hostname);
        log_error("Error was: \"%s\"!", 
ERR_reason_error_string(ERR_get_error()));
@@ -318,8 +320,6 @@
     }
 #endif
     
-    SSL_set_connect_state(_ssl.get());
-    
     return true;
 }
 

=== modified file 'libnet/sslclient.h'
--- a/libnet/sslclient.h        2009-07-20 20:57:44 +0000
+++ b/libnet/sslclient.h        2009-07-21 22:31:42 +0000
@@ -45,11 +45,11 @@
 namespace gnash
 {
 
-extern const char *ROOTPATH;
+// extern const char *ROOTPATH;
 extern const char *HOST;
-extern const char *CA_LIST;
-extern const char *RANDOM;
-extern const char *KEYFILE;
+// extern const char *CA_LIST;
+// extern const char *RANDOM;
+// extern const char *KEYFILE;
 extern const size_t SSL_PASSWD_SIZE;
 
 class DSOEXPORT SSLClient

=== modified file 'testsuite/libbase.all/TCXXRc.cpp'
--- a/testsuite/libbase.all/TCXXRc.cpp  2009-07-21 21:54:27 +0000
+++ b/testsuite/libbase.all/TCXXRc.cpp  2009-07-21 22:36:18 +0000
@@ -223,19 +223,19 @@
     } else {
         runtest.fail ("rc.getRootCert() != testrootcert.pem");
     }
-        
+
     if (rc.getCertFile() == "testclient.pem") {
         runtest.pass ("rc.getCertFile() == testclient.pem");
     } else {
         runtest.fail ("rc.getCertFile() != testclient.pem");
     }
-        
+
     if (rc.getCertDir() == "/test/etc/pki/tls/") {
         runtest.pass ("rc.getCertDir() == /test/etc/pki/tls/");
     } else {
         runtest.fail ("rc.getCertDir() != /test/etc/pki/tls/");
     }
-        
+
     std::vector<std::string> blacklist = rc.getBlackList();
     if (blacklist.size()) {
         if ((blacklist[0] == "www.doubleclick.com")