David Rose 16 lat temu
rodzic
commit
d3a3ff3b67
1 zmienionych plików z 3 dodań i 11 usunięć
  1. 3 11
      direct/src/plugin/p3dCert.cxx

+ 3 - 11
direct/src/plugin/p3dCert.cxx

@@ -86,7 +86,6 @@ IMPLEMENT_APP(P3DCertApp)
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 bool P3DCertApp::
 bool P3DCertApp::
 OnInit() {
 OnInit() {
-  cerr << "OnInit\n";
   // call the base class initialization method, currently it only parses a
   // call the base class initialization method, currently it only parses a
   // few common command-line options but it could be do more in the future
   // few common command-line options but it could be do more in the future
   if (!wxApp::OnInit()) {
   if (!wxApp::OnInit()) {
@@ -107,7 +106,6 @@ OnInit() {
 
 
   AuthDialog *dialog = new AuthDialog(_cert_filename, _cert_dir);
   AuthDialog *dialog = new AuthDialog(_cert_filename, _cert_dir);
   SetTopWindow(dialog);
   SetTopWindow(dialog);
-  cerr << "got dialog " << dialog << "\n";
   dialog->Show(true);
   dialog->Show(true);
 
 
   // Return true to enter the main loop and wait for user input.
   // Return true to enter the main loop and wait for user input.
@@ -198,7 +196,6 @@ AuthDialog::
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void AuthDialog::
 void AuthDialog::
 run_clicked(wxCommandEvent &event) {
 run_clicked(wxCommandEvent &event) {
-  cerr << "run\n";
   approve_cert();
   approve_cert();
 }
 }
 
 
@@ -209,7 +206,6 @@ run_clicked(wxCommandEvent &event) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void AuthDialog::
 void AuthDialog::
 view_cert_clicked(wxCommandEvent &event) {
 view_cert_clicked(wxCommandEvent &event) {
-  cerr << "view cert\n";
   if (_view_cert_dialog != NULL) {
   if (_view_cert_dialog != NULL) {
     _view_cert_dialog->Destroy();
     _view_cert_dialog->Destroy();
   }
   }
@@ -224,7 +220,6 @@ view_cert_clicked(wxCommandEvent &event) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void AuthDialog::
 void AuthDialog::
 cancel_clicked(wxCommandEvent &event) {
 cancel_clicked(wxCommandEvent &event) {
-  cerr << "cancel\n";
   Destroy();
   Destroy();
 }
 }
 
 
@@ -273,12 +268,12 @@ void AuthDialog::
 read_cert_file(const wxString &cert_filename) {
 read_cert_file(const wxString &cert_filename) {
   FILE *fp = fopen(cert_filename.mb_str(), "r");
   FILE *fp = fopen(cert_filename.mb_str(), "r");
   if (fp == NULL) {
   if (fp == NULL) {
-    cerr << "Couldn't read " << cert_filename << "\n";
+    cerr << "Couldn't read " << cert_filename.mb_str() << "\n";
     return;
     return;
   }
   }
   _cert = PEM_read_X509(fp, NULL, NULL, (void *)"");
   _cert = PEM_read_X509(fp, NULL, NULL, (void *)"");
   if (_cert == NULL) {
   if (_cert == NULL) {
-    cerr << "Could not read certificate in " << cert_filename << ".\n";
+    cerr << "Could not read certificate in " << cert_filename.mb_str() << ".\n";
     fclose(fp);
     fclose(fp);
     return;
     return;
   }
   }
@@ -371,7 +366,6 @@ verify_cert() {
     ca_filename += wxT("/ca-bundle.crt");
     ca_filename += wxT("/ca-bundle.crt");
     
     
     // Read the trusted certificates.
     // Read the trusted certificates.
-    cerr << "Reading " << ca_filename.mb_str() << "\n";;
     FILE *fp = fopen(ca_filename.mb_str(), "r");
     FILE *fp = fopen(ca_filename.mb_str(), "r");
     if (fp == NULL) {
     if (fp == NULL) {
       cerr << "Couldn't read " << ca_filename.mb_str() << "\n";
       cerr << "Couldn't read " << ca_filename.mb_str() << "\n";
@@ -401,7 +395,7 @@ verify_cert() {
 
 
   X509_STORE_free(store);
   X509_STORE_free(store);
 
 
-  cerr << "Got certificate from " << _friendly_name
+  cerr << "Got certificate from " << _friendly_name.mb_str()
        << ", verify_result = " << _verify_result << "\n";
        << ", verify_result = " << _verify_result << "\n";
 }
 }
 
 
@@ -543,7 +537,6 @@ ViewCertDialog::
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void ViewCertDialog::
 void ViewCertDialog::
 run_clicked(wxCommandEvent &event) {
 run_clicked(wxCommandEvent &event) {
-  cerr << "run\n";
   if (_auth_dialog != NULL){ 
   if (_auth_dialog != NULL){ 
     _auth_dialog->approve_cert();
     _auth_dialog->approve_cert();
   }
   }
@@ -557,7 +550,6 @@ run_clicked(wxCommandEvent &event) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void ViewCertDialog::
 void ViewCertDialog::
 cancel_clicked(wxCommandEvent &event) {
 cancel_clicked(wxCommandEvent &event) {
-  cerr << "cancel\n";
   Destroy();
   Destroy();
 }
 }