openca-cvsdev — CVS Postings

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-ui-html/HTML Login.pm,1.7,1.8 View.pm,1.11,1.12

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-ui-html/HTML

Modified Files:
	Login.pm View.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: Login.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Login.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Login.pm	10 Aug 2005 16:03:50 -0000	1.7
--- Login.pm	12 Aug 2005 13:47:44 -0000	1.8
***************
*** 227,231 ****
  
          ## delete the counter to avoid reuse in case of an error
!         my $parts = $self->{cgi}->param ('token_passwd_parts');
          $self->{cgi}->delete ('token_passwd_parts');
  
--- 227,232 ----
  
          ## delete the counter to avoid reuse in case of an error
!         ## FIXME: I think we can remove the following line
!         ## my $parts = $self->{cgi}->param ('token_passwd_parts');
          $self->{cgi}->delete ('token_passwd_parts');
  
***************
*** 258,265 ****
              $info_list->{BODY}->[$i]->[0] = i18nGettext('I18N_OPENCA_UI_HTML_LOGIN_GET_TOKEN_PASSWD_PART',
                                                              "__NUMBER__", $i+1);
!             $info_list->{BODY}->[$i]->[1] = [ {TYPE => "PASSWORD", NAME => "token_passwd_'.$i.'_0"} ];
              $info_list->{BODY}->[$i+$parts]->[0] = i18nGettext('I18N_OPENCA_UI_HTML_LOGIN_GET_TOKEN_PASSWD_PART',
                                                              "__NUMBER__", $i+1);
!             $info_list->{BODY}->[$i+$parts]->[1] = [ {TYPE => "PASSWORD", NAME => "token_passwd_'.$i.'_1"} ];
          }
  
--- 259,266 ----
              $info_list->{BODY}->[$i]->[0] = i18nGettext('I18N_OPENCA_UI_HTML_LOGIN_GET_TOKEN_PASSWD_PART',
                                                              "__NUMBER__", $i+1);
!             $info_list->{BODY}->[$i]->[1] = [ {TYPE => "PASSWORD", NAME => "token_passwd_".$i."_0"} ];
              $info_list->{BODY}->[$i+$parts]->[0] = i18nGettext('I18N_OPENCA_UI_HTML_LOGIN_GET_TOKEN_PASSWD_PART',
                                                              "__NUMBER__", $i+1);
!             $info_list->{BODY}->[$i+$parts]->[1] = [ {TYPE => "PASSWORD", NAME => "token_passwd_".$i."_1"} ];
          }
  

Index: View.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/View.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** View.pm	10 Aug 2005 16:03:50 -0000	1.11
--- View.pm	12 Aug 2005 13:47:44 -0000	1.12
***************
*** 351,355 ****
  
      $main .=
!         '    <center>'."\n".
          '    <table class="global">'."\n".
          '      <tr>'."\n".
--- 351,355 ----
  
      $main .=
! #        '    <center>'."\n".
          '    <table class="global">'."\n".
          '      <tr>'."\n".
***************
*** 413,417 ****
              '      <tr>'."\n".
              '        <td class="global_item_list">'."\n".
-             '         <center>'."\n".
              '          <table class="item_list">'."\n".
              '            <tr class="item_list">'."\n";
--- 413,416 ----
***************
*** 427,431 ****
              foreach my $b_item (@{$item})
              {
-                 ## $main .= '<td class="item_list">'.$b_item."</td>\n";
                  $main .= '<td class="item_list">';
                  $main .= $self->get_list_item($b_item);
--- 426,429 ----
***************
*** 436,440 ****
          $main .=
              '          </table>'."\n".
-             '         </center>'."\n".
              '        </td>'."\n".
              '      </tr>'."\n";
--- 434,437 ----
***************
*** 447,451 ****
              '      <tr>'."\n".
              '        <td class="global_info_list">'."\n".
-             '         <center>'."\n".
              '          <table class="info_list">'."\n";
          if (exists $list->{HEAD})
--- 444,447 ----
***************
*** 454,458 ****
              foreach my $item (@{$list->{HEAD}})
              {
!                 $main .= '<th class="info_list">'.$self->__escape($item)."</th>\n";
              }
              $main .= '            </tr>'."\n";
--- 450,454 ----
              foreach my $item (@{$list->{HEAD}})
              {
!                 $main .= '              <th class="info_list">'.$self->__escape($item)."</th>\n";
              }
              $main .= '            </tr>'."\n";
***************
*** 465,471 ****
              foreach my $item (@{$line})
              {
!                 $main .= '              <td colspan="'.$colspan.'"class="info_list">';
!                 $main .= $self->get_list_item($item);
!                 $main .= "</td>\n";
              }
              $main .= '            </tr>'."\n";
--- 461,472 ----
              foreach my $item (@{$line})
              {
!                 if ($colspan > 1)
!                 {
!                     $main .= '              <td colspan="'.$colspan.'" class="info_list_head">';
!                 } else {
!                     $main .= '              <td colspan="'.$colspan.'" class="info_list">';
!                 }
!                 $main .= "\n".$self->get_list_item($item, "                ");
!                 $main .= "              </td>\n";
              }
              $main .= '            </tr>'."\n";
***************
*** 473,477 ****
          $main .=
              '          </table>'."\n".
-             '         </center>'."\n".
              '        </td>'."\n".
              '      </tr>'."\n";
--- 474,477 ----
***************
*** 484,488 ****
              '      <tr>'."\n".
              '        <td class="global_cmd_list">'."\n".
-             '         <center>'."\n".
              '          <table class="cmd_list">'."\n";
          if ($list->{HEAD})
--- 484,487 ----
***************
*** 525,542 ****
          $main .=
              '      <tr>'."\n".
!             '        <td class="global_cmd_panel">'."\n".
!             '         <center>'."\n".
!             '          <table class="cmd_panel">'."\n".
!             '            <tr class="cmd_panel">'."\n";
!         foreach my $item (@{$list})
!         {
!             $main .= '<td class="cmd_panel">';
!             $main .= $self->get_list_item($item);
!             $main .= "</td>\n";
!         }
          $main .=
-             '            </tr>'."\n".
-             '          </table>'."\n".
-             '         </center>'."\n".
              '        </td>'."\n".
              '      </tr>'."\n";
--- 524,530 ----
          $main .=
              '      <tr>'."\n".
!             '        <td class="cmd_panel">'."\n";
!         $main .= $self->get_list_item($list, "          ");
          $main .=
              '        </td>'."\n".
              '      </tr>'."\n";
***************
*** 559,563 ****
                  $list->{$item} =~ s/\n/\r\n/g;   ## LF --> CRLF
              }
!             $main .= '<input type="hidden" name="'.$self->__escape($item).
                                         '" value="'.$self->__escape($list->{$item})."\">\n";
          }
--- 547,551 ----
                  $list->{$item} =~ s/\n/\r\n/g;   ## LF --> CRLF
              }
!             $main .= '    <input type="hidden" name="'.$self->__escape($item).
                                         '" value="'.$self->__escape($list->{$item})."\">\n";
          }
***************
*** 567,576 ****
          foreach my $menutab (@{$self->{MENU}})
          {
!             $main .= '<input type="hidden" name="__OPENCA_UI_HTML_MENU_ID" value="'.
                       $self->__escape($menutab)."\">\n";
          }
      }
!     $main .= '<input type="hidden" name="CGISESSID" value="'.$self->{api}->get_session_id()."\">\n";
!     $main .= '    </center>'."\n";
  
      return $main;
--- 555,563 ----
          foreach my $menutab (@{$self->{MENU}})
          {
!             $main .= '    <input type="hidden" name="__OPENCA_UI_HTML_MENU_ID" value="'.
                       $self->__escape($menutab)."\">\n";
          }
      }
!     $main .= '    <input type="hidden" name="CGISESSID" value="'.$self->{api}->get_session_id()."\">\n";
  
      return $main;
***************
*** 623,645 ****
      ## now handle the two dimensional array
  
-     $html .= "<table>\n";
- 
      foreach my $line (@{$list})
      {
!         $html .= "  <tr>\n";
          foreach my $item (@{$line})
          {
-             $html .= "    <td>\n";
              if (not ref $item)
              {
!                 $html .= $self->__escape($item);
              } else { ## HASH ref
!                 $html .= $self->get_input_field($item);
              }
-             $html .= "    </td>\n";
          }
!         $html .= "  </tr>\n";
      }
-     $html .= "</table>\n";
      $html =~ s/^(.)/${indent}$1/gm;
  
--- 610,627 ----
      ## now handle the two dimensional array
  
      foreach my $line (@{$list})
      {
!         $html .= "<div class=\"list_line\">\n";
          foreach my $item (@{$line})
          {
              if (not ref $item)
              {
!                 $html .= "  ".join ("<br>\n  ", split /\n/, $self->__escape($item))."\n";
              } else { ## HASH ref
!                 $html .= $self->get_input_field($item, "  ");
              }
          }
!         $html .= "</div>\n";
      }
      $html =~ s/^(.)/${indent}$1/gm;
  
***************
*** 655,661 ****
  sub get_input_field
  {
!     my $self = shift;
!     my $keys = shift;
!     my $html = "";
  
      ## only input fields must specify what they are
--- 637,644 ----
  sub get_input_field
  {
!     my $self   = shift;
!     my $keys   = shift;
!     my $indent = shift;
!     my $html   = "";
  
      ## only input fields must specify what they are
***************
*** 680,684 ****
              my $selected = "";
                 $selected = " selected" if ($value eq $keys->{SELECTED});
!             $html .= "    <option value=\"".$self->__escape($value).
                       "\"$selected>".
                       $self->__escape($name).
--- 663,667 ----
              my $selected = "";
                 $selected = " selected" if ($value eq $keys->{SELECTED});
!             $html .= "  <option value=\"".$self->__escape($value).
                       "\"$selected>".
                       $self->__escape($name).
***************
*** 719,722 ****
--- 702,707 ----
      }
  
+     $html =~ s/^(.)/${indent}$1/gm;
+ 
      return $html;
  }
***************
*** 741,745 ****
      }
      $html .= $self->{ENV_LINK};
!     $html .= '">'.$self->__escape($keys->{LABEL}).'</a> ';
  
      return $html;
--- 726,730 ----
      }
      $html .= $self->{ENV_LINK};
!     $html .= '">'.$self->__escape($keys->{LABEL}).'</a>';
  
      return $html;

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-ui-html/HTML/Command edit_csr.pm,1.4,1.5 list_cert.pm,1.6,1.7 list_csr.pm,1.7,1.8 new_csr.pm,1.7,1.8 server_info.pm,1.3,1.4 view_cert.pm,1.5,1.6 view_csr.pm,1.9,1.10

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-ui-html/HTML/Command

Modified Files:
	edit_csr.pm list_cert.pm list_csr.pm new_csr.pm server_info.pm 
	view_cert.pm view_csr.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: edit_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/edit_csr.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** edit_csr.pm	10 Aug 2005 16:03:51 -0000	1.4
--- edit_csr.pm	12 Aug 2005 13:47:44 -0000	1.5
***************
*** 90,96 ****
  
      ## load allowed attributes and calculate tablelength
!     my $allowed_attr = $self->{api}->get_required_list ('CSR_SUPPORTED_ATTRIBUTES');
!     my $max_attr     = $self->{api}->get_required ('CSR_DEFAULT_ATTRIBUTE_FIELDS');
!     my $allow_multi  = $self->{api}->get_required ('CSR_ALLOW_MULTIVALUED_ATTRIBUTES');
      $max_attr = scalar @subject_array + 1
          if (scalar @subject_array >= $max_attr);
--- 90,96 ----
  
      ## load allowed attributes and calculate tablelength
!     my $allowed_attr = $self->{api}->get_xpath_list (XPATH => 'policy/subject/supported_attributes');
!     my $max_attr     = $self->{api}->get_xpath      (XPATH => 'config/server/csr_default_attribute_fields');
!     my $allow_multi  = $self->{api}->get_xpath      (XPATH => 'policy/subject/allow_multivalued_attributes');
      $max_attr = scalar @subject_array + 1
          if (scalar @subject_array >= $max_attr);
***************
*** 162,167 ****
  
      ## load allowed attributes and calculate tablelength
!     $allowed_attr = $self->{api}->get_required_list ('CSR_SUPPORTED_SUBJECT_ALT_NAMES');
!     $max_attr     = $self->{api}->get_required ('CSR_DEFAULT_SUBJECT_ALT_NAME_FIELDS');
      $max_attr = scalar @subjectAltName_array + 1
          if (scalar @subjectAltName_array/2 >= $max_attr);
--- 162,167 ----
  
      ## load allowed attributes and calculate tablelength
!     $allowed_attr = $self->{api}->get_xpath_list (XPATH => 'policy/subject_alt_name/supported_subject_alt_names');
!     $max_attr     = $self->{api}->get_xpath      (XPATH => 'config/server/csr_default_subject_alt_name_fields');
      $max_attr = scalar @subjectAltName_array + 1
          if (scalar @subjectAltName_array/2 >= $max_attr);
***************
*** 213,217 ****
      ## get config Option and set internal variable
      
!     $days_option = 1 if (uc($self->{api}->get_required ('CHANGE_DAYS')) eq "YES");
  
      ## fill field with standard value, if no value is present
--- 213,217 ----
      ## get config Option and set internal variable
      
!     $days_option = 1 if (uc($self->{api}->get_xpath (XPATH => 'policy/change_days')) eq "YES");
  
      ## fill field with standard value, if no value is present

Index: list_cert.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/list_cert.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list_cert.pm	10 Aug 2005 16:03:51 -0000	1.6
--- list_cert.pm	12 Aug 2005 13:47:44 -0000	1.7
***************
*** 127,131 ****
                                           i18nGettext ("I18N_OPENCA_UI_HTML_NOT_AVAILABLE"));
          $item_list->{BODY}->[$i]->[3] = $parsed->{HEADER}->{ROLE};
!         $parsed->{DN} =~ s/([^\\])(\\\\|),\s*/$1$2, /g;
          $item_list->{BODY}->[$i]->[4] = $parsed->{DN};
      }
--- 127,131 ----
                                           i18nGettext ("I18N_OPENCA_UI_HTML_NOT_AVAILABLE"));
          $item_list->{BODY}->[$i]->[3] = $parsed->{HEADER}->{ROLE};
!         $parsed->{DN} =~ s/([^\\])(\\\\|),\s*/$1$2,\n/g;
          $item_list->{BODY}->[$i]->[4] = $parsed->{DN};
      }

Index: list_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/list_csr.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** list_csr.pm	10 Aug 2005 16:03:51 -0000	1.7
--- list_csr.pm	12 Aug 2005 13:47:44 -0000	1.8
***************
*** 101,105 ****
          $item_list->{BODY}->[$i]->[1] = $result->[$i]->getParsed()->{SUBJECT};
          ## put a blank after every comma to allow HTML linebreaks
!         $item_list->{BODY}->[$i]->[1] =~ s/([^\\])(\\\\|)*,([^\s])/$1$2, $3/g;
          $item_list->{BODY}->[$i]->[2] = $result->[$i]->getParsed()->{HEADER}->{ROLE};
          $item_list->{BODY}->[$i]->[3] = ($result->[$i]->getParsed()->{HEADER}->{LOA} or
--- 101,105 ----
          $item_list->{BODY}->[$i]->[1] = $result->[$i]->getParsed()->{SUBJECT};
          ## put a blank after every comma to allow HTML linebreaks
!         $item_list->{BODY}->[$i]->[1] =~ s/([^\\])(\\\\|)*,([^\s])/$1$2,\n$3/g;
          $item_list->{BODY}->[$i]->[2] = $result->[$i]->getParsed()->{HEADER}->{ROLE};
          $item_list->{BODY}->[$i]->[3] = ($result->[$i]->getParsed()->{HEADER}->{LOA} or

Index: new_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/new_csr.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** new_csr.pm	10 Aug 2005 16:03:51 -0000	1.7
--- new_csr.pm	12 Aug 2005 13:47:44 -0000	1.8
***************
*** 73,76 ****
--- 73,77 ----
      {
          my $key = $self->store_csr();
+         return undef if (not defined $key);
  
          my $info_list = undef;

Index: server_info.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/server_info.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** server_info.pm	10 Aug 2005 16:03:51 -0000	1.3
--- server_info.pm	12 Aug 2005 13:47:44 -0000	1.4
***************
*** 34,39 ****
  
      my $info_list = undef;
!     $info_list->{BODY}->[0]->[0] = i18nGettext ("I18N_OPENCA_UI_HTML_CMD_SERVER_INFO_MODULE_NAME");
!     $info_list->{BODY}->[0]->[1] = i18nGettext ("I18N_OPENCA_UI_HTML_CMD_SERVER_INFO_MODULE_VERSION");
  
      my @modules = ("OpenCA::OpenSSL", "OpenCA::Crypto", "OpenCA::DBI",
--- 34,39 ----
  
      my $info_list = undef;
!     $info_list->{HEAD}->[0] = i18nGettext ("I18N_OPENCA_UI_HTML_CMD_SERVER_INFO_MODULE_NAME");
!     $info_list->{HEAD}->[1] = i18nGettext ("I18N_OPENCA_UI_HTML_CMD_SERVER_INFO_MODULE_VERSION");
  
      my @modules = ("OpenCA::OpenSSL", "OpenCA::Crypto", "OpenCA::DBI",
***************
*** 41,45 ****
                     "OpenCA::Server", "OpenCA::API", "OpenCA::Log");
  
!     my $count = 1;
      foreach my $module (@modules)
      {
--- 41,45 ----
                     "OpenCA::Server", "OpenCA::API", "OpenCA::Log");
  
!     my $count = 0;
      foreach my $module (@modules)
      {

Index: view_cert.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/view_cert.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** view_cert.pm	10 Aug 2005 16:03:51 -0000	1.5
--- view_cert.pm	12 Aug 2005 13:47:44 -0000	1.6
***************
*** 78,87 ****
  
      $issuer = $parsed->{ISSUER};
!     $issuer =~ s%([^\\](\\\\|)*),([^\s])%$1, $3%g;
  
      ## build subject
  
      $subject = $parsed->{SUBJECT};
!     $subject =~ s%([^\\](\\\\|)*),([^\s])%$1, $3%g;
  
      ## build status
--- 78,87 ----
  
      $issuer = $parsed->{ISSUER};
!     $issuer =~ s%([^\\](\\\\|)*),\s*([^\s])%$1,\n$3%g;
  
      ## build subject
  
      $subject = $parsed->{SUBJECT};
!     $subject =~ s%([^\\](\\\\|)*),\s*([^\s])%$1,\n$3%g;
  
      ## build status

Index: view_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ui-html/HTML/Command/view_csr.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** view_csr.pm	10 Aug 2005 16:03:51 -0000	1.9
--- view_csr.pm	12 Aug 2005 13:47:44 -0000	1.10
***************
*** 52,56 ****
  
      ## Required Configuration Key
!     $days_option = $self->{api}->get_required('CHANGE_DAYS');
      return $self->api_error () if (not defined $days_option);
      $days_option = 1 if (uc($days_option) eq "YES");
--- 52,56 ----
  
      ## Required Configuration Key
!     $days_option = $self->{api}->get_xpath (XPATH => 'policy/change_days');
      return $self->api_error () if (not defined $days_option);
      $days_option = 1 if (uc($days_option) eq "YES");
***************
*** 96,100 ****
  
      ## put a blank after every comma to allow HTML linebreaks
!     $subject =~ s/([^\\](\\\\|)*),([^\s])/$1, $3/g;
  
      ## subject alternative name
--- 96,100 ----
  
      ## put a blank after every comma to allow HTML linebreaks
!     $subject =~ s/([^\\](\\\\|)*),\s*([^\s])/$1,\n$3/g;
  
      ## subject alternative name

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-server/Server/Command batch_cmd_enroll_pkcs12.pm,1.3,1.4 check_csr.pm,1.7,1.8 genCACert.pm,1.6,1.7 genSKey.pm,1.5,1.6

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-server/Server/Command

Modified Files:
	batch_cmd_enroll_pkcs12.pm check_csr.pm genCACert.pm 
	genSKey.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: batch_cmd_enroll_pkcs12.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_enroll_pkcs12.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** batch_cmd_enroll_pkcs12.pm	10 Aug 2005 16:03:49 -0000	1.3
--- batch_cmd_enroll_pkcs12.pm	12 Aug 2005 13:47:44 -0000	1.4
***************
*** 54,57 ****
--- 54,58 ----
      my $id           = $keys->{GLOBAL_ID};
      my $token        = $self->{crypto_layer}->getToken("BP");
+     my $ca           = $self->{crypto_layer}->getToken("CA");
      my $statemachine = $keys->{STATEMACHINE};
         $statemachine = $self->get_state_machine() if (not $statemachine);
***************
*** 142,146 ****
      ## build pkcs#12 file
  
!     my $cacert   = $self->{api}->get_required ('CACertificate');
      my $data     = $cert->getPEM();
      if (not $self->{crypto_shell}->dataConvert (
--- 143,147 ----
      ## build pkcs#12 file
  
!     my $cacert   = $ca->get_pem_cert();
      my $data     = $cert->getPEM();
      if (not $self->{crypto_shell}->dataConvert (

Index: check_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/check_csr.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** check_csr.pm	10 Aug 2005 16:03:49 -0000	1.7
--- check_csr.pm	12 Aug 2005 13:47:44 -0000	1.8
***************
*** 88,94 ****
      ## keysize acceptable
  
!     my $DNRequiredElementsArray = $self->{api}->get_required_list('DN_TYPE_PKCS10_REQUIRED_ELEMENTS');
!     my $DNBaseArray             = $self->{api}->get_required_list('DN_TYPE_PKCS10_BASE');
!     my $DNEnforceBase           = $self->{api}->get_required('DN_TYPE_PKCS10_ENFORCE_BASE');
  
      if (not defined $DNRequiredElementsArray or
--- 88,94 ----
      ## keysize acceptable
  
!     my $DNRequiredElementsArray = $self->{api}->get_xpath_list (XPATH => 'policy/subject/required_elements');
!     my $DNBaseArray             = $self->{api}->get_xpath_list (XPATH => 'policy/subject/base');
!     my $DNEnforceBase           = $self->{api}->get_xpath      (XPATH => 'policy/subject/enforce_base');
  
      if (not defined $DNRequiredElementsArray or
***************
*** 127,131 ****
              next if (not $key);
              my $ok = 0;
!             my $req = $self->{api}->get_required ("DN_TYPE_PKCS10_BASE_$i");
              foreach my $value (@{$dn{$key}})
              {
--- 127,131 ----
              next if (not $key);
              my $ok = 0;
!             my $req = $self->{api}->get_xpath (XPATH => "policy/subject/base_$i");
              foreach my $value (@{$dn{$key}})
              {
***************
*** 154,158 ****
          {
              $h .= ", ";
!             $h .= $DNBaseArray->[$i]."=".$self->{api}->get_required ("DN_TYPE_PKCS10_BASE_$i");
          }
          if ($dn !~ /.*${h}$/)
--- 154,158 ----
          {
              $h .= ", ";
!             $h .= $DNBaseArray->[$i]."=".$self->{api}->get_xpath (XPATH => "policy/subject/base_$i");
          }
          if ($dn !~ /.*${h}$/)

Index: genCACert.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/genCACert.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** genCACert.pm	10 Aug 2005 16:03:49 -0000	1.6
--- genCACert.pm	12 Aug 2005 13:47:44 -0000	1.7
***************
*** 56,79 ****
      my $makeCmd    = $self->{api}->get_required ( 'MakePath');
      my $careqFile  = $self->{api}->get_required ( 'ReqDir' )."/careq.pem";
-     my $cacertFile = $self->{api}->get_required ( 'CACertificate' );
-     my $cacertDER  = $self->{api}->get_required ( 'CACertificateDER' );
-     my $cacertCRT  = $self->{api}->get_required ( 'CACertificateCRT' );
-     my $cacertTXT  = $self->{api}->get_required ( 'CACertificateTXT' );
-     my $chainDir   = $self->{api}->get_required ( 'ChainDir' );
- 
-     ## check the situation of the different files
- 
-     if (not -e $careqFile)
-     {
-         $self->set_error ("I18N_OPENCA_SERVER_CMD_GENCACERT_MISSING_CSR",
-                           "__FILE__", $careqFile);
-         return undef;
-     }
-     if ( -e $cacertFile ) {
-         $self->set_error ("I18N_OPENCA_SERVER_CMD_GENCACERT_DETECTED_CACERT",
-                           "__FILE__", $cacertFile);
-         return undef;
-     }
-     unlink( "$cacertDER" ) if ( -e "$cacertDER" );
  
      ## activate the CA token
--- 56,59 ----
***************
*** 87,90 ****
--- 67,73 ----
          return undef;
      }
+ 
+     ## activate the key of the CA token
+  
      if (not ($ca_token->keyOnline || $ca_token->login))
      {
***************
*** 95,98 ****
--- 78,104 ----
      }
  
+     ## load the different file positions
+  
+     my $cacertFile = $ca_token->get_pem_cert();
+     my $cacertDER  = $ca_token->get_der_cert();
+     my $cacertTXT  = $ca_token->get_txt_cert();
+     my $chainDir   = $self->{api}->get_required ( 'ChainDir' );
+     my $cacertCRT  = $chainDir."/cacert.crt";
+ 
+     ## check the situation of the different files
+ 
+     if (not -e $careqFile)
+     {
+         $self->set_error ("I18N_OPENCA_SERVER_CMD_GENCACERT_MISSING_CSR",
+                           "__FILE__", $careqFile);
+         return undef;
+     }
+     if ( -e $cacertFile ) {
+         $self->set_error ("I18N_OPENCA_SERVER_CMD_GENCACERT_DETECTED_CACERT",
+                           "__FILE__", $cacertFile);
+         return undef;
+     }
+     unlink( "$cacertDER" ) if ( -e "$cacertDER" );
+ 
      ## create CA cert
  

Index: genSKey.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/genSKey.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genSKey.pm	10 Aug 2005 16:03:49 -0000	1.5
--- genSKey.pm	12 Aug 2005 13:47:44 -0000	1.6
***************
*** 57,65 ****
      my $alg       = $keys->{'ALG'};
      my $key_type  = $keys->{'KEY_TYPE'};
-     my $cakeyFile = $self->{api}->get_required ( 'CAKEY' );
  
!     ## Other reserved variables
!     my $key;
  
      if( -e "$cakeyFile" ) {
          $self->set_error ("I18N_OPENCA_SERVER_CMD_GENSKEY_KEY_DETECTED",
--- 57,68 ----
      my $alg       = $keys->{'ALG'};
      my $key_type  = $keys->{'KEY_TYPE'};
  
!     ## do not check for a successful login!
!     ## login is only used to set the passphrase for the token if necessary
!     my $ca_token = $self->{crypto_layer}->getToken ('CA');
!     $ca_token->login() if (not $ca_token->keyOnline());
  
+     ## check for an old key
+     my $cakeyFile = $ca_token->get_key();
      if( -e "$cakeyFile" ) {
          $self->set_error ("I18N_OPENCA_SERVER_CMD_GENSKEY_KEY_DETECTED",
***************
*** 68,76 ****
      }
  
!     ## do not check for a successful login!
!     ## useKey is only used to set the passphrase for the token if necessary
!     my $ca_token = $self->{crypto_layer}->getToken ('CA');
!     $ca_token->login() if (not $ca_token->keyOnline());
! 
      my $errno = 0;
      my $msg   = "";
--- 71,75 ----
      }
  
!     ## create the new key
      my $errno = 0;
      my $msg   = "";
***************
*** 84,91 ****
      }
  
!     ## Try loading the Key File
!     $key = $self->{tools}->getFile( "$cakeyFile" );
! 
!     return $key;
  }
  
--- 83,87 ----
      }
  
!     return $self->{tools}->getFile( "$cakeyFile" );
  }
  

[openca-cvsdev] CVS: openca-0.9/src/common/lib/locale/ru_RU openca.po,1.11,1.12

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/common/lib/locale/ru_RU
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/common/lib/locale/ru_RU

Modified Files:
	openca.po 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: openca.po
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/common/lib/locale/ru_RU/openca.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** openca.po	10 Aug 2005 16:03:47 -0000	1.11
--- openca.po	12 Aug 2005 13:47:43 -0000	1.12
***************
*** 2239,2248 ****
--- 2239,2280 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_CRYPTO_SHELL_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_SERVER_INIT_DATA_EXCHANGE_FAILED"
  msgstr "Ошибка обновления данных UPDATE_FAILED."
  
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_DB_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_DB_LOGDB_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_LDAP_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
  msgid "I18N_OPENCA_SERVER_INIT_LOG_FAILED"
  msgstr ""
  
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_TOOLS_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_STDERR_NOT_CONFIGURED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_STDERR_REDIRECT_FAILED"
+ msgstr "Ошибка обновления данных UPDATE_FAILED."
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_XML_CACHE_INIT_FAILED"
+ msgstr "Ошибка вставки записи INSERT_FAILED."
+ 
  msgid "I18N_OPENCA_SERVER_PROCESS_REQUEST_DATABASE_FAILED"
  msgstr ""
***************
*** 2315,2318 ****
--- 2347,2354 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_TOOLS_LOAD_XML_CONFIG_CACHE_INIT_FAILED"
+ msgstr "Ошибка PREPARE_FAILED."
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_TOOLS_SET_XML_CONFIG_WRONG_ARGUMENTS"
  msgstr "Заявки, ожидающие обработки "
***************
*** 3268,3271 ****
--- 3304,3311 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_XML_CACHE_INIT_XML_ERROR"
+ msgstr "Ошибка при разрыве соединения с сервером баз данных DISCONNECT_FAILED."
+ 
+ #, fuzzy
  #~ msgid "I18N_OPENCA_SERVER_CRYPTO_GET_SIG_CERT_FROM_DB_DATABASE_FAILED"
  #~ msgstr "Заявки, ожидающие обработки "
***************
*** 3325,3332 ****
  
  #, fuzzy
- #~ msgid "I18N_OPENCA_TOOLS_LOAD_XML_CONFIG_PARSER_FAILED"
- #~ msgstr "Ошибка PREPARE_FAILED."
- 
- #, fuzzy
  #~ msgid "I18N_OPENCA_SERVER_DATAEXCHANGE_BACKUP_NOT_IMPLEMENTED"
  #~ msgstr "Ошибка обновления данных UPDATE_FAILED."
--- 3365,3368 ----

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-server/Server Crypto.pm,1.19,1.20

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-server/Server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-server/Server

Modified Files:
	Crypto.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: Crypto.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Crypto.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Crypto.pm	10 Aug 2005 16:03:49 -0000	1.19
--- Crypto.pm	12 Aug 2005 13:47:43 -0000	1.20
***************
*** 84,88 ****
      my $item = $keys->{OBJECT};
      my $sig  = $keys->{SIGNATURE};
!     my $chainDir = $self->{api}->get_required('ChainDir');
      return $self->set_error ($self->{api}->errno(), $self->{api}->errval())
          if (not $chainDir);
--- 84,88 ----
      my $item = $keys->{OBJECT};
      my $sig  = $keys->{SIGNATURE};
!     my $chainDir = $self->{api}->get_xpath (XPATH => 'config/server/chaindir');
      return $self->set_error ($self->{api}->errno(), $self->{api}->errval())
          if (not $chainDir);
***************
*** 174,178 ****
      }
  
!     if (uc($self->{api}->get_required ("ALLOW_EXTERNAL_SIGNATURES") or "NO") ne "YES")
      {
          ## get signer cert as object
--- 174,178 ----
      }
  
!     if (uc($self->{api}->get_xpath (XPATH => "policy/allow_external_signatures") or "NO") ne "YES")
      {
          ## get signer cert as object
***************
*** 370,374 ****
  {
      my $self = shift;
!     if ($self->{api}->get_required ('UNIQUE_DN') =~ /NO|N|OFF/i) {
          return 1;
      } else {
--- 370,374 ----
  {
      my $self = shift;
!     if ($self->{api}->get_xpath (XPATH => 'policy/subject/unique') =~ /NO|N|OFF/i) {
          return 1;
      } else {
***************
*** 388,400 ****
  
      #// perhaps the request's serial must be stored in the dn
!     my $use_request_serial = $self->{api}->get_required ('SET_REQUEST_SERIAL_IN_DN');
      if ($use_request_serial =~ /^(Y|YES|ON)$/i) {
!         $cert_subject .= $self->{api}->get_required ('REQUEST_SERIAL_NAME')."=".$ser.",";
      }
  
      #// perhaps the cert's serial must be stored in the dn
!     my $use_cert_serial = $self->{api}->get_required ('SET_CERTIFICATE_SERIAL_IN_DN');
      if ($use_cert_serial =~ /^(Y|YES|ON)$/i) {
!         $cert_subject = $self->{api}->get_required ('CERTIFICATE_SERIAL_NAME')."=".$ser.",";
      }
  
--- 388,400 ----
  
      #// perhaps the request's serial must be stored in the dn
!     my $use_request_serial = $self->{api}->get_xpath (XPATH => 'policy/subject/set_request_serial');
      if ($use_request_serial =~ /^(Y|YES|ON)$/i) {
!         $cert_subject .= $self->{api}->get_xpath (XPATH => 'policy/subject/request_serial_name')."=".$ser.",";
      }
  
      #// perhaps the cert's serial must be stored in the dn
!     my $use_cert_serial = $self->{api}->get_xpath (XPATH => 'policy/subject/set_certificate_serial');
      if ($use_cert_serial =~ /^(Y|YES|ON)$/i) {
!         $cert_subject = $self->{api}->get_xpath (XPATH => 'policy/subject/certificate_serial_name')."=".$ser.",";
      }
  
***************
*** 409,413 ****
  
      ## filter email if necessary
!     if ( $self->{api}->get_required ('DN_WITHOUT_EMAIL') =~ /Y|YES|ON/i ) {
          $cert_subject =~ s/^\s*MAIL\s*=[^,]*,\s*//i;
          $cert_subject =~ s/^\s*EMAIL\s*=[^,]*,\s*//i;
--- 409,413 ----
  
      ## filter email if necessary
!     if ( $self->{api}->get_xpath (XPATH => 'policy/subject/without_email') =~ /Y|YES|ON/i ) {
          $cert_subject =~ s/^\s*MAIL\s*=[^,]*,\s*//i;
          $cert_subject =~ s/^\s*EMAIL\s*=[^,]*,\s*//i;
***************
*** 458,463 ****
      my $subject_alt_name = "";
  
!     my $automatic_subject_alt_name = $self->{api}->get_required ('AUTOMATIC_SUBJECT_ALT_NAME');
!     my $default_subject_alt_name   = $self->{api}->get_required ('DEFAULT_SUBJECT_ALT_NAME');
  
      # set the subjectAlternativeName
--- 458,463 ----
      my $subject_alt_name = "";
  
!     my $automatic_subject_alt_name = $self->{api}->get_xpath (XPATH => 'policy/subject_alt_name/automatic');
!     my $default_subject_alt_name   = $self->{api}->get_xpath (XPATH => 'policy/subject_alt_name/default');
  
      # set the subjectAlternativeName
***************
*** 470,474 ****
      } elsif ( $automatic_subject_alt_name =~ /(Y|YES|ON)/i ) {
          ## perhaps we support DNS and IP in the future too
!         if ( ($default_subject_alt_name =~ /Email/i) and
               $csr->getParsed()->{DN_HASH}->{EMAILADDRESS})
          {
--- 470,474 ----
      } elsif ( $automatic_subject_alt_name =~ /(Y|YES|ON)/i ) {
          ## perhaps we support DNS and IP in the future too
!         if ( (lc($default_subject_alt_name) eq "email") and
               $csr->getParsed()->{DN_HASH}->{EMAILADDRESS})
          {
***************
*** 484,488 ****
      ## then add them from DN to the subject alt name
  
!     if ( $self->{api}->get_required ('DN_WITHOUT_EMAIL') =~ /Y|YES|ON/i ) {
          my $cert_subject;
          if ($csr->getParsed()->{HEADER}->{SUBJECT}) {
--- 484,488 ----
      ## then add them from DN to the subject alt name
  
!     if ( $self->{api}->get_xpath (XPATH => 'policy/subject/without_email') =~ /Y|YES|ON/i ) {
          my $cert_subject;
          if ($csr->getParsed()->{HEADER}->{SUBJECT}) {
***************
*** 588,592 ****
  {
      my $self = shift;
!     my $account = $self->{api}->get_required ('SERVICE_MAIL_ACCOUNT');
      if ( not $account ) {
          $self->set_error ("I18N_OPENCA_SERVER_CRYPTO_GET_ADMIN_ACCOUNT_NOT_CONFIGURED");
--- 588,592 ----
  {
      my $self = shift;
!     my $account = $self->{api}->get_xpath (XPATH => 'config/server/service_mail_account');
      if ( not $account ) {
          $self->set_error ("I18N_OPENCA_SERVER_CRYPTO_GET_ADMIN_ACCOUNT_NOT_CONFIGURED");
***************
*** 600,604 ****
      my $self = shift;
      my $csr  = $_[0];
!     my $loaOption = $self->{api}->get_required('USE_LOAS');
      if ($loaOption =~ m/yes/i and 
          (not exists $csr->getParsed()->{HEADER}->{LOA_MODE} or
--- 600,604 ----
      my $self = shift;
      my $csr  = $_[0];
!     my $loaOption = $self->{api}->get_xpath (XPATH => 'policy/use_loas');
      if ($loaOption =~ m/yes/i and 
          (not exists $csr->getParsed()->{HEADER}->{LOA_MODE} or
***************
*** 630,639 ****
          my  $found = 0;
          my $index = 0;
!         my $count = $self->{api}->get_xpath_count (XPATH => [ "loa" ]);
          $self->debug ("loa_configs = $count");
          for (my $i=0; $i < $count; $i++)
          {
              $level = $self->{api}->get_xpath(
!                         XPATH    => [ "loa", "level" ],
                          COUNTER  => [ $i, 0 ]);
              $self->debug ("level = $level");
--- 630,639 ----
          my  $found = 0;
          my $index = 0;
!         my $count = $self->{api}->get_xpath_count (XPATH => [ "policy/loa" ]);
          $self->debug ("loa_configs = $count");
          for (my $i=0; $i < $count; $i++)
          {
              $level = $self->{api}->get_xpath(
!                         XPATH    => [ "policy/loa", "level" ],
                          COUNTER  => [ $i, 0 ]);
              $self->debug ("level = $level");
***************
*** 649,653 ****
                  #$cert= gettext(($al->first_child('cert'))->field);
                  $certPolicy = $self->{api}->get_xpath(
!                                   XPATH    => [ "loa", "cert/ext/name" ],
                                    COUNTER  => [ $i, 0 ]);
                  $self->debug ("certPolicy = $certPolicy");
--- 649,653 ----
                  #$cert= gettext(($al->first_child('cert'))->field);
                  $certPolicy = $self->{api}->get_xpath(
!                                   XPATH    => [ "policy/loa", "cert/ext/name" ],
                                    COUNTER  => [ $i, 0 ]);
                  $self->debug ("certPolicy = $certPolicy");
***************
*** 658,664 ****
                  ## add all the OIDs
                  my @OID = ();
!                 @OID = @{$self->{api}->get_xpath_list (XPATH   => [ "loa", "cert/ext/CP/value" ],
                                                         COUNTER => [ $i ])}
!                     if ($self->{api}->get_xpath_count (XPATH   => [ "loa", "cert/ext/CP/value" ],
                                                         COUNTER => [ $i ]));
  
--- 658,664 ----
                  ## add all the OIDs
                  my @OID = ();
!                 @OID = @{$self->{api}->get_xpath_list (XPATH   => [ "policy/loa", "cert/ext/CP/value" ],
                                                         COUNTER => [ $i ])}
!                     if ($self->{api}->get_xpath_count (XPATH   => [ "policy/loa", "cert/ext/CP/value" ],
                                                         COUNTER => [ $i ]));
  
***************
*** 668,672 ****
  
                  $section = $self->{api}->get_xpath(
!                                XPATH    => [ "loa", "cert/ext/section/name" ],
                                 COUNTER  => [ $i, 0 ]);
                  $loaOID = pop (@OID);
--- 668,672 ----
  
                  $section = $self->{api}->get_xpath(
!                                XPATH    => [ "policy/loa", "cert/ext/section/name" ],
                                 COUNTER  => [ $i, 0 ]);
                  $loaOID = pop (@OID);
***************
*** 679,683 ****
                  ## add the policy section
                  $policyID = $self->{api}->get_xpath(
!                                 XPATH    => [ "loa", "cert/ext/section/policy_ID_tag" ],
                                  COUNTER  => [ $i, 0 ]);
                  chomp $policyID ;
--- 679,683 ----
                  ## add the policy section
                  $policyID = $self->{api}->get_xpath(
!                                 XPATH    => [ "policy/loa", "cert/ext/section/policy_ID_tag" ],
                                  COUNTER  => [ $i, 0 ]);
                  chomp $policyID ;
***************
*** 692,698 ****
                  ## under
                  my @URI = ();
!                 @URI = @{$self->{api}->get_xpath_list (XPATH   => [ "loa", "cert/ext/section/CPS/URI" ],
                                                         COUNTER => [ $i ])}
!                     if ($self->{api}->get_xpath_count (XPATH   => [ "loa", "cert/ext/section/CPS/URI" ],
                                                         COUNTER => [ $i ]));
                  $policyString .= join ("\n", @URI)."\n";
--- 692,698 ----
                  ## under
                  my @URI = ();
!                 @URI = @{$self->{api}->get_xpath_list (XPATH   => [ "policy/loa", "cert/ext/section/CPS/URI" ],
                                                         COUNTER => [ $i ])}
!                     if ($self->{api}->get_xpath_count (XPATH   => [ "policy/loa", "cert/ext/section/CPS/URI" ],
                                                         COUNTER => [ $i ]));
                  $policyString .= join ("\n", @URI)."\n";
***************
*** 731,736 ****
      if ($extfile) {
          ## handle subject alternative name
!         my $tempExt = $self->{api}->get_required ( 'TempDir')."/${extfile}";
!         my $extfile = $self->{api}->get_required ( 'EXT_DIR')."/${extfile}";
          my $file = $self->{tools}->getFile ($extfile);
          # 2005-06-15 Martin Bartosch: fixed SF bug #1122343
--- 731,736 ----
      if ($extfile) {
          ## handle subject alternative name
!         my $tempExt = $self->{api}->get_xpath (XPATH => 'config/server/tempdir')."/${extfile}";
!         my $extfile = $self->{api}->get_xpath (XAPTH => 'config/server/ext_dir')."/${extfile}";
          my $file = $self->{tools}->getFile ($extfile);
          # 2005-06-15 Martin Bartosch: fixed SF bug #1122343
***************
*** 788,792 ****
      $opensslfile .= ".conf";
      if ($opensslfile) {
!         $opensslfile = $self->{api}->get_required ( 'OpenSSL_DIR' )."/${opensslfile}";
      }
  
--- 788,792 ----
      $opensslfile .= ".conf";
      if ($opensslfile) {
!         $opensslfile = $self->{api}->get_xpath (XPATH => 'config/server/openssl_dir' )."/${opensslfile}";
      }
  
***************
*** 854,858 ****
  
      ## load CA certificate
!     my $cafile = $self->{api}->get_required ('CACertificate');
      $self->debug ("filename determined - $cafile");
      my $cacert = new OpenCA::X509 (DEBUG  => $self->{DEBUG},
--- 854,859 ----
  
      ## load CA certificate
!     my $ca_token = $self->{crypto_layer}->getToken ("CA");
!     my $cafile = $ca_token->get_pem_cert();
      $self->debug ("filename determined - $cafile");
      my $cacert = new OpenCA::X509 (DEBUG  => $self->{DEBUG},
***************
*** 919,923 ****
      my $csr  = $_[0];
  
!     my $tmpdir = $self->{api}->get_required ('TempDir');
      my $ser    = $self->{next_cert_serial};
  
--- 920,924 ----
      my $csr  = $_[0];
  
!     my $tmpdir = $self->{api}->get_xpath (XPATH => 'config/server/tempdir');
      my $ser    = $self->{next_cert_serial};
  
***************
*** 936,941 ****
      my $self = shift;
      my $keys = { @_ };
!     my $tmpdir      = $self->{api}->get_required ('TempDir');
!     my $newCertsDir = $self->{api}->get_required('NewCertsDir');
      my $ser         = $self->{next_cert_serial};
      my $token       = $self->{crypto_layer}->getToken("CA");
--- 937,942 ----
      my $self = shift;
      my $keys = { @_ };
!     my $tmpdir      = $self->{api}->get_xpath (XPATH => 'config/server/tempdir');
!     my $newCertsDir = $self->{api}->get_xpath (XPATH => 'config/server/newcertsdir');
      my $ser         = $self->{next_cert_serial};
      my $token       = $self->{crypto_layer}->getToken("CA");
***************
*** 1047,1052 ****
      my $pin;
  
!     my $secure_pin_length = $self->{api}->get_required ('SECURE_PIN_LENGTH');
!     my $secure_pin_random = $self->{api}->get_required ('SECURE_PIN_RANDOM');
  
      ## get PIN
--- 1048,1053 ----
      my $pin;
  
!     my $secure_pin_length = $self->{api}->get_xpath (XPATH => 'policy/pin/secure_length');
!     my $secure_pin_random = $self->{api}->get_xpath (XPATH => 'policy/pin/secure_random');
  
      ## get PIN
***************
*** 1080,1088 ****
      my $cert = $_[0];
      my $new_msg;
!     my $default_mail_dir  = $self->{api}->get_required ('DEFAULT_MAIL_DIR');
!     my $lang              = $self->{api}->get_required ('DEFAULT_LANGUAGE');
  
      ## load prepared mail for confirm a signed certificate
!     my $filename = $self->{api}->get_required ('CONFIRM_CERT_SIGN');
      $filename =~ s/__LANGUAGE__/$lang/g;
      $new_msg = $self->{tools}->getFile ($filename);
--- 1081,1089 ----
      my $cert = $_[0];
      my $new_msg;
!     my $default_mail_dir  = $self->{api}->get_xpath (XPATH => 'config/server/default_mail_dir');
!     my $lang              = $self->{api}->get_xpath (XPATH => 'config/server/default_language');
  
      ## load prepared mail for confirm a signed certificate
!     my $filename = $self->{api}->get_xpath (XPATH => 'config/server/confirm_cert_sign');
      $filename =~ s/__LANGUAGE__/$lang/g;
      $new_msg = $self->{tools}->getFile ($filename);
***************
*** 1132,1136 ****
      my $cert = $keys->{CERT};
      my $csr  = $keys->{CSR};
!     my $tmpdir = $self->{api}->get_required ('TempDir');
  
      $cert->setStatus("VALID");
--- 1133,1137 ----
      my $cert = $keys->{CERT};
      my $csr  = $keys->{CSR};
!     my $tmpdir = $self->{api}->get_xpath (XPATH => 'config/server/tempdir');
  
      $cert->setStatus("VALID");
***************
*** 1279,1283 ****
      $opensslfile .= ".conf";
      if ($opensslfile) {
!         $opensslfile = $self->{api}->get_required ( 'OpenSSL_DIR' )."/${opensslfile}";
      }
  
--- 1280,1284 ----
      $opensslfile .= ".conf";
      if ($opensslfile) {
!         $opensslfile = $self->{api}->get_xpath (XPATH => 'config/server/openssl_dir' )."/${opensslfile}";
      }
  
***************
*** 1335,1343 ****
  
      ## Get Configuration needed parameters ...
!     my $tmpdir = $self->{api}->get_required('TempDir');
  
      ## unique DN?
      my $nouniqueDN = 0;
!     if ($self->{api}->get_required ('UNIQUE_DN') =~ /NO|N|OFF/i) {
          $nouniqueDN = 1;
      }
--- 1336,1344 ----
  
      ## Get Configuration needed parameters ...
!     my $tmpdir = $self->{api}->get_xpath(XPATH => 'config/server/tempdir');
  
      ## unique DN?
      my $nouniqueDN = 0;
!     if ($self->{api}->get_xpath (XPATH => 'policy/subject/unique') =~ /NO|N|OFF/i) {
          $nouniqueDN = 1;
      }

[openca-cvsdev] CVS: openca-0.9/src/web-interfaces/pub/htdocs/stylesheets main-openca.css,1.1,1.2

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/web-interfaces/pub/htdocs/stylesheets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/web-interfaces/pub/htdocs/stylesheets

Modified Files:
	main-openca.css 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: main-openca.css
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/web-interfaces/pub/htdocs/stylesheets/main-openca.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main-openca.css	4 Aug 2005 16:31:35 -0000	1.1
--- main-openca.css	12 Aug 2005 13:47:44 -0000	1.2
***************
*** 24,27 ****
--- 24,31 ----
  /* ****************************************** */
  
+ .list_line {
+     white-space:nowrap;
+ }
+ 
  /* ************** explanation ************* */
  
***************
*** 43,52 ****
  
  td.global_info_list {
      background-color: #ddddee;
      padding:          10px;
  }
  
  td.info_list {
!     text-align: left;
  }
  
--- 47,88 ----
  
  td.global_info_list {
+     /*background-color: #ddddee;
+     text-align:       center;
+     align:            center;
+     padding:          10px; */
      background-color: #ddddee;
      padding:          10px;
+     nowrap;
+     text-align:      center;
+ }
+ 
+ table.info_list {
+     border-collapse: collapse;
+     width:           100%;
+ }
+ 
+ th.info_list {
+     border:          medium solid #264A8D;
+     padding:         0.25em;
+     text-align:      center;
+     font-family:     helvetica;
+     font-weight:     normal;
+     font-style:      italic;
+ }
+ 
+ td.info_list_head {
+     border:          medium solid #264A8D;
+     padding:         0.25em;
+     text-align:      center;
+     font-family:     helvetica;
+     font-weight:     normal;
+     font-style:      italic;
  }
  
  td.info_list {
!     border:        thin solid #bbbbcc;
!     white-space:   nowrap;
!     nowrap;
!     text-align:    left;
  }
  
***************
*** 67,77 ****
      background-color: #ddddee;
      padding:          10px;
  }
  
  /* ************** cmd_panel ************* */
  
! td.global_cmd_panel {
      background-color: #ddddee;
      padding:          10px;
  }
  
--- 103,129 ----
      background-color: #ddddee;
      padding:          10px;
+     text-align:      center;
+ }
+ 
+ table.cmd_list {
+     border-collapse: collapse;
+     width:           100%;
+ }
+ 
+ td.cmd_list {
+     border:        thin solid #bbbbcc;
+     white-space:   nowrap;
+     nowrap;
+     text-align:    left;
  }
  
  /* ************** cmd_panel ************* */
  
! /* td.global_cmd_panel { */
! td.cmd_panel {
      background-color: #ddddee;
      padding:          10px;
+     nowrap;
+     text-align:      center;
  }
  

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-server API.pm,1.16,1.17 Server.pm,1.24,1.25

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-server

Modified Files:
	API.pm Server.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: API.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/API.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** API.pm	10 Aug 2005 16:03:49 -0000	1.16
--- API.pm	12 Aug 2005 13:47:43 -0000	1.17
***************
*** 217,235 ****
      my $self = shift;
  
!     my $loa_option = $self->get_required('USE_LOAS');
      return {} if (lc($loa_option) ne "yes");
  
      my %loa = ();
      my $count = $self->get_xpath_count (
!                         XPATH    => "loa");
      return \%loa if (not defined $count);
      for (my $i=0; $i<$count; $i++)
      {
          my $level = $self->get_xpath (
!                         XPATH    => ["loa", "level"],
                          COUNTER  => [ $i, 0 ]);
          return undef if (not defined $level);
          my $name = $self->get_xpath (
!                         XPATH    => ["loa", "name"],
                          COUNTER  => [ $i, 0 ]);
          return undef if (not defined $name);
--- 217,235 ----
      my $self = shift;
  
!     my $loa_option = $self->get_xpath (XPATH => 'policy/use_loas');
      return {} if (lc($loa_option) ne "yes");
  
      my %loa = ();
      my $count = $self->get_xpath_count (
!                         XPATH    => "policy/loa");
      return \%loa if (not defined $count);
      for (my $i=0; $i<$count; $i++)
      {
          my $level = $self->get_xpath (
!                         XPATH    => ["policy/loa", "level"],
                          COUNTER  => [ $i, 0 ]);
          return undef if (not defined $level);
          my $name = $self->get_xpath (
!                         XPATH    => ["policy/loa", "name"],
                          COUNTER  => [ $i, 0 ]);
          return undef if (not defined $name);

Index: Server.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Server.pm	10 Aug 2005 16:03:49 -0000	1.24
--- Server.pm	12 Aug 2005 13:47:43 -0000	1.25
***************
*** 65,76 ****
      $self->{xml_cache} = OpenCA::XML::Cache->new (DEBUG  => $self->{"DEBUG"},
                                                    CONFIG => $self->{"CONFIG"});
  
!     $self->{role_config} = undef;
!     OpenCA::Server::i18n::set_prefix ($self->{xml_cache}->get_xpath (XPATH => "config/server/locale"));
  
      my $stderr = $self->{xml_cache}->get_xpath (XPATH => "config/server/stderr");
!     $self->_startup_error ("STDERR file not configured")
          if (not $stderr);
!     $self->_startup_error ("STDERR cannot be redirected.")
          if (not open STDERR, ">> ".$stderr);
      binmode STDERR, ":utf8";
--- 65,81 ----
      $self->{xml_cache} = OpenCA::XML::Cache->new (DEBUG  => $self->{"DEBUG"},
                                                    CONFIG => $self->{"CONFIG"});
+     $self->__startup_error ($OpenCA::XML::Cache::errno,
+                             "I18N_OPENCA_SERVER_NEW_XML_CACHE_INIT_FAILED",
+                             "__ERRVAL__", $OpenCA::XML::Cache::errval)
+         if (not $self->{xml_cache});
  
!     OpenCA::Server::i18n::set_prefix   ($self->{api}->get_xpath (XPATH => "config/server/locale"));
!     OpenCA::Server::i18n::set_language ($self->{api}->get_xpath (XAPTH => "config/server/default_language"));
  
      my $stderr = $self->{xml_cache}->get_xpath (XPATH => "config/server/stderr");
!     $self->__startup_error ("I18N_OPENCA_SERVER_NEW_STDERR_NOT_CONFIGURED")
          if (not $stderr);
!     $self->__startup_error ("I18N_OPENCA_SERVER_NEW_STDERR_REDIRECT_FAILED",
!                            "__FILE__", $stderr)
          if (not open STDERR, ">> ".$stderr);
      binmode STDERR, ":utf8";
***************
*** 131,137 ****
      if (not $self->{data_exchange})
      {
!         $self->_startup_error(i18nGettext ("I18N_OPENCA_SERVER_INIT_DATA_EXCHANGE_FAILED",
!                                            "__ERRVAL__", $OpenCA::Server::DataExchange::errval),
!                               $OpenCA::Server::DataExchange::errno );
      }
  
--- 136,142 ----
      if (not $self->{data_exchange})
      {
!         $self->__startup_error($OpenCA::Server::DataExchange::errno,
!                                "I18N_OPENCA_SERVER_INIT_DATA_EXCHANGE_FAILED",
!                                "__ERRVAL__", $OpenCA::Server::DataExchange::errval);
      }
  
***************
*** 148,152 ****
                                         "DEBUG"   => $self->{DEBUG});
      if ( not $self->{tools} ) {
! 	$self->_startup_error( i18nGettext("Cannot initialize OpenCA::Tools class!") );
      }
  
--- 153,158 ----
                                         "DEBUG"   => $self->{DEBUG});
      if ( not $self->{tools} ) {
! 	$self->__startup_error("I18N_OPENCA_SERVER_INIT_TOOLS_FAILED",
!                                "__ERRVAL__", $OpenCA::Tools::errval);
      }
  
***************
*** 168,174 ****
  
      if ( not $self->{crypto_layer} ) {
!         $self->_startup_error( i18nGettext ("I18N_OPENCA_SERVER_INIT_CRYPTO_FAILED",
!                                             "__ERRVAL__", $OpenCA::Crypto::errval),
!                                $OpenCA::Crypto::errno );
      }
  
--- 174,180 ----
  
      if ( not $self->{crypto_layer} ) {
!         $self->__startup_error($OpenCA::Crypto::errno,
!                                "I18N_OPENCA_SERVER_INIT_CRYPTO_FAILED",
!                                "__ERRVAL__", $OpenCA::Crypto::errval);
      }
  
***************
*** 176,181 ****
  
      if ( not $self->{"cryptoShell"} ) {
!         $self->_startup_error( i18nGettext ("Cannot initialize Crypto Shell!").
!                      $OpenCA::Crypto::errval, $OpenCA::Crypto::errno );
      }
  
--- 182,188 ----
  
      if ( not $self->{"cryptoShell"} ) {
!         $self->__startup_error($OpenCA::Crypto::errno,
!                                "I18N_OPENCA_SERVER_INIT_CRYPTO_SHELL_FAILED",
!                                "__ERRVAL__", $OpenCA::Crypto::errval);
      }
  
***************
*** 195,199 ****
                   API     => $self->{api},
                   DEBUG   => $self->{DEBUG});
!     $self->_startup_error ($OpenCA::AC::errval, $OpenCA::AC::errno)
          if (not $self->{access_control});
  
--- 202,206 ----
                   API     => $self->{api},
                   DEBUG   => $self->{DEBUG});
!     $self->__startup_error ($OpenCA::AC::errno, $OpenCA::AC::errval)
          if (not $self->{access_control});
  
***************
*** 212,218 ****
                                        );
  
!     $self->_startup_error (i18nGettext("Cannot initialize LDAP management (__ERRNO__). __ERRVAL__",
!                              "__ERRNO__", $OpenCA::LDAP::errno,
!                              "__ERRVAL__", $OpenCA::LDAP::errval))
          if (not $self->{ldap});
  
--- 219,225 ----
                                        );
  
!     $self->__startup_error ($OpenCA::LDAP::errno,
!                             "I18N_OPENCA_SERVER_INIT_LDAP_FAILED",
!                             "__ERRVAL__", $OpenCA::LDAP::errval)
          if (not $self->{ldap});
  
***************
*** 306,313 ****
  
      if ( not $self->{db} ) {
!         return $self->_startup_error ( i18nGettext (
!                        "Cannot initialize OpenCA::DBI class! __ERRVAL__",
!                        "__ERRVAL__", $OpenCA::DBI::errval),
!                    $OpenCA::DBI::errno);
      }
  
--- 313,319 ----
  
      if ( not $self->{db} ) {
!         return $self->__startup_error ($OpenCA::DBI::errno,
!                                        "I18N_OPENCA_SERVER_INIT_DB_FAILED",
!                                        "__ERRVAL__", $OpenCA::DBI::errval);
      }
  
***************
*** 327,334 ****
  
      if ( not $self->{logdb} ) {
!         return $self->_startup_error ( i18nGettext (
!                        "Cannot initialize OpenCA::DBI class for logging! __ERRVAL__",
!                        "__ERRVAL__", $OpenCA::DBI::errval),
!                    $OpenCA::DBI::errno);
      }
  
--- 333,339 ----
  
      if ( not $self->{logdb} ) {
!         return $self->__startup_error ($OpenCA::DBI::errno,
!                                        "I18N_OPENCA_SERVER_INIT_DB_LOGDB_FAILED",
!                                        "__ERRVAL__", $OpenCA::DBI::errval);
      }
  
***************
*** 345,351 ****
      if (not $self->{log})
      {
!         $self->_startup_error (i18nGettext ("I18N_OPENCA_SERVER_INIT_LOG_FAILED",
!                                             "__ERRNO__", $OpenCA::Log::errno,
!                                             "__ERRVAL__", $OpenCA::Log::errval));
      }
      return 1;
--- 350,356 ----
      if (not $self->{log})
      {
!         $self->__startup_error ($OpenCA::Log::errno,
!                                 "I18N_OPENCA_SERVER_INIT_LOG_FAILED",
!                                 "__ERRVAL__", $OpenCA::Log::errval);
      }
      return 1;
***************
*** 537,557 ****
  }
  
! sub _startup_error
  {
      my $self = shift;
  
      $self->{db}->rollback() if (ref $self and $self->{db});
!     my $msg = "";
!     if (not ref $self or not $self->{UI})
!     {
!         $msg .= $self if (not ref $self);
!         foreach my $item (@_)
!         {
!             $msg .= "OpenCA::Server Error: ".$item."\n";
!         }
!         print $msg;
!         print STDERR $msg;
!         die ($msg);
!     }
  }
  
--- 542,554 ----
  }
  
! sub __startup_error
  {
      my $self = shift;
  
      $self->{db}->rollback() if (ref $self and $self->{db});
! 
!     $self->set_error (@_);
! 
!     die ("[".$self->errno()."] ".$self->errval()."\n");
  }
  

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-xml-cache Cache.pm,1.19,1.20

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-xml-cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-xml-cache

Modified Files:
	Cache.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: Cache.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-xml-cache/Cache.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Cache.pm	10 Aug 2005 16:03:51 -0000	1.19
--- Cache.pm	12 Aug 2005 13:47:44 -0000	1.20
***************
*** 15,19 ****
--- 15,29 ----
  package OpenCA::XML::Cache;
  
+ =head1 XML::Parser and XML::Simple
+ 
+ We enforce the usage of XML::Parser by XML::Simple because some other
+ parsers does not create an error if the XML document is malformed.
+ These parsers tolerate errors!
+ 
+ =cut
+ 
  use XML::Simple;
+ use XML::Parser;
+ $XML::Simple::PREFERRED_PARSER = "XML::Parser";
  use OpenCA::API qw(debug set_error errno errval);
  
***************
*** 41,45 ****
      $self->{config} = $keys->{CONFIG};
  
!     $self->init (@_);
  
      $self->debug("dump: ".$self->dump());
--- 51,55 ----
      $self->{config} = $keys->{CONFIG};
  
!     return undef if (not $self->init (@_));
  
      $self->debug("dump: ".$self->dump());
***************
*** 53,59 ****
      my $keys = { @_ };
      $self->debug ("start");
!     my $xs   = XML::Simple->new (forcearray   => 1,
!                                  forcecontent => 1,
!                                  keeproot     => 1);
  
      delete $self->{cache} if (exists $self->{cache});
--- 63,70 ----
      my $keys = { @_ };
      $self->debug ("start");
!     my $xs   = XML::Simple->new (ForceArray    => 1,
!                                  ForceContent  => 1,
!                                  SuppressEmpty => undef,
!                                  KeepRoot      => 1);
  
      delete $self->{cache} if (exists $self->{cache});
***************
*** 61,65 ****
      {
          $self->debug ("filename: $filename");
!         my $xml = $xs->XMLin ($filename);
          if (not exists $self->{cache})
          {
--- 72,85 ----
      {
          $self->debug ("filename: $filename");
!         my $xml = eval { $xs->XMLin ($filename); };
!         if (not $xml and $@)
!         {
!             my $msg = $@;
!             delete $self->{cache} if (exists $self->{cache});
!             $self->set_error ("I18N_OPENCA_XML_CACHE_INIT_XML_ERROR",
!                               "__FILE__", $filename,
!                               "__ERRVAL__", $msg);
!             return undef;
!         }
          if (not exists $self->{cache})
          {
***************
*** 152,155 ****
--- 172,176 ----
          {
              $self->set_error ("I18N_OPENCA_XML_CACHE_GET_XPATH_MISSING_ELEMENT",
+                               "__XPATH__", $self->__get_serialized_xpath($keys),
                                "__TAG__", $keys->{XPATH}->[$i],
                                "__POSITION__", $keys->{COUNTER}->[$i]);
***************
*** 159,164 ****
      if (not exists $item->{content})
      {
!         $self->set_error ("I18N_OPENCA_XML_CACHE_GET_XPATH_MISSING_CONTENT");
!         return undef;
      }
      $self->debug ("content: ".$item->{content});
--- 180,186 ----
      if (not exists $item->{content})
      {
!         ## the tag is present but does not contain anything
!         ## this is no error !
!         return "";
      }
      $self->debug ("content: ".$item->{content});
***************
*** 170,174 ****
--- 192,200 ----
      my $self = shift;
      $self->debug ("start");
+ 
      my $ref = $self->get_xpath_count (REF => 1, @_);
+     return undef if (not defined $ref);
+     return []    if (not ref $ref); ## happens when there are no results
+ 
      my @list = ();
      foreach my $item (@{$ref})
***************
*** 176,180 ****
          if (not exists $item->{content})
          {
!             $self->set_error ("I18N_OPENCA_XML_CACHE_GET_XPATH_MISSING_CONTENT");
              return undef;
          }
--- 202,207 ----
          if (not exists $item->{content})
          {
!             $self->set_error ("I18N_OPENCA_XML_CACHE_GET_XPATH_MISSING_CONTENT",
!                               "__XPATH__", $self->__get_serialized_xpath({@_}));
              return undef;
          }
***************
*** 220,223 ****
--- 247,251 ----
          {
              $self->set_error ("I18N_OPENCA_XML_CACHE_GET_XPATH_COUNT_MISSING_ELEMENT",
+                               "__XPATH__", $self->__get_serialized_xpath($keys),
                                "__TAG__", $keys->{XPATH}->[$i],
                                "__POSITION__", $keys->{COUNTER}->[$i]);
***************
*** 276,278 ****
--- 304,323 ----
  }
  
+ sub __get_serialized_xpath
+ {
+     my $self    = shift;
+     my $keys    = shift;
+     my $xpath   = $keys->{XPATH};
+     my $counter = $keys->{COUNTER};
+     my $result = "";
+ 
+     for (my $i=0; $i < scalar @{$xpath}; $i++)
+     {
+         $result .= "/" if (length($result));
+         $result .= $xpath->[$i];
+         $result .= "/".$counter->[$i] if (defined $counter->[$i]);
+     }
+     return $result;
+ }
+ 
  1;

[openca-cvsdev] CVS: openca-0.9/src/common/lib/locale/sl_SI openca.po,1.17,1.18

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/common/lib/locale/sl_SI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/common/lib/locale/sl_SI

Modified Files:
	openca.po 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: openca.po
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/common/lib/locale/sl_SI/openca.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** openca.po	10 Aug 2005 16:03:47 -0000	1.17
--- openca.po	12 Aug 2005 13:47:43 -0000	1.18
***************
*** 2381,2392 ****
--- 2381,2424 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_CRYPTO_SHELL_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_SERVER_INIT_DATA_EXCHANGE_FAILED"
  msgstr "(SELECT) SPODLETELO"
  
  #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_DB_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_DB_LOGDB_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_LDAP_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_SERVER_INIT_LOG_FAILED"
  msgstr "(SELECT) SPODLETELO"
  
  #, fuzzy
+ msgid "I18N_OPENCA_SERVER_INIT_TOOLS_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_STDERR_NOT_CONFIGURED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_STDERR_REDIRECT_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
+ msgid "I18N_OPENCA_SERVER_NEW_XML_CACHE_INIT_FAILED"
+ msgstr "(SELECT) SPODLETELO"
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_SERVER_PROCESS_REQUEST_DATABASE_FAILED"
  msgstr "(UPDATE) SPODLETELO"
***************
*** 2461,2464 ****
--- 2493,2500 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_TOOLS_LOAD_XML_CONFIG_CACHE_INIT_FAILED"
+ msgstr "(COMMIT) SPODLETELO"
+ 
+ #, fuzzy
  msgid "I18N_OPENCA_TOOLS_SET_XML_CONFIG_WRONG_ARGUMENTS"
  msgstr "(DISCONNECT) SPODLETELO"
***************
*** 3460,3463 ****
--- 3496,3503 ----
  
  #, fuzzy
+ msgid "I18N_OPENCA_XML_CACHE_INIT_XML_ERROR"
+ msgstr "(PREPARE) SPODLETELO"
+ 
+ #, fuzzy
  #~ msgid "I18N_OPENCA_API_CMD_ISSUE_CERT_DATABASE_FAILED"
  #~ msgstr "(DELETE) SPODLETELO"
***************
*** 3552,3559 ****
  
  #, fuzzy
- #~ msgid "I18N_OPENCA_SERVER_DATAEXCHANGE_NEW_MISCONFIGURED"
- #~ msgstr "(SELECT) SPODLETELO"
- 
- #, fuzzy
  #~ msgid "I18N_OPENCA_TOOLS_GET_CONFIGURED_DATA_MISSING_OPTION_VALUE"
  #~ msgstr "(INSERT) SPODLETELO"
--- 3592,3595 ----
***************
*** 3564,3571 ****
  
  #, fuzzy
- #~ msgid "I18N_OPENCA_TOOLS_LOAD_XML_CONFIG_PARSER_FAILED"
- #~ msgstr "(COMMIT) SPODLETELO"
- 
- #, fuzzy
  #~ msgid "I18N_OPENCA_TRISTATECGI_ONLY_LATIN1_CHARS"
  #~ msgstr "(INSERT) SPODLETELO"
--- 3600,3603 ----

[openca-cvsdev] CVS: openca-0.9/src/web-interfaces/pub pki.in,1.24,1.25

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/web-interfaces/pub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/web-interfaces/pub

Modified Files:
	pki.in 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: pki.in
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/web-interfaces/pub/pki.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** pki.in	2 Aug 2005 14:30:42 -0000	1.24
--- pki.in	12 Aug 2005 13:47:44 -0000	1.25
***************
*** 86,91 ****
  $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_SSL_CIPHER",
               "-value" => $ENV{SSL_CIPHER});
! $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_SSL_CIPHER_USEKEYSIZE",
!              "-value" => $ENV{SSL_CIPHER_USEKEYSIZE});
  $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_REMOTE_ADDRESS",
               "-value" => $ENV{REMOTE_ADDR});
--- 86,100 ----
  $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_SSL_CIPHER",
               "-value" => $ENV{SSL_CIPHER});
! ## symmeric key size
! if (exists $ENV{HTTPS_KEYSIZE})
! {
!     ## apache-ssl (deprecated)
!     $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_SSL_CIPHER_USEKEYSIZE",
!                  "-value" => $ENV{HTTPS_KEYSIZE});
! } else {
!     ## mod_ssl
!     $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_SSL_CIPHER_USEKEYSIZE",
!                  "-value" => $ENV{SSL_CIPHER_USEKEYSIZE});
! }
  $cgi->param ("-name"  => "OPENCA_AC_CHANNEL_REMOTE_ADDRESS",
               "-value" => $ENV{REMOTE_ADDR});

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-tools Tools.pm,1.19,1.20

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-tools

Modified Files:
	Tools.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: Tools.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-tools/Tools.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Tools.pm	10 Aug 2005 16:03:50 -0000	1.19
--- Tools.pm	12 Aug 2005 13:47:44 -0000	1.20
***************
*** 514,517 ****
--- 514,524 ----
      $self->{xml_cache} = OpenCA::XML::Cache->new (DEBUG  => $self->{DEBUG},
                                                    CONFIG => [ $self->{xml_config} ]);
+     if (not $self->{xml_cache})
+     {
+         $self->set_error ($OpenCA::XML::Cache::errno,
+                           "I18N_OPENCA_TOOLS_LOAD_XML_CONFIG_CACHE_INIT_FAILED",
+                           "__ERRVAL__", $OpenCA::XML::Cache::errval);
+         return undef;
+     }
  
      return 1;

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-openssl OpenSSL.pm,1.159,1.160

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-openssl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4567/src/modules/openca-openssl

Modified Files:
	OpenSSL.pm 
Log Message:
CSS update, introducing policy.xml and several small fixes


Author of changes:  michaelbell

Index: OpenSSL.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-openssl/OpenSSL.pm,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** OpenSSL.pm	10 Aug 2005 09:37:32 -0000	1.159
--- OpenSSL.pm	12 Aug 2005 13:47:43 -0000	1.160
***************
*** 220,223 ****
--- 220,225 ----
  		$self->{PASSWD}      = $params->{$key} if ( $key eq "PASSWD" );
  		$self->{PEM_CERT}    = $params->{$key} if ( $key eq "PEM_CERT" );
+ 		$self->{DER_CERT}    = $params->{$key} if ( $key eq "DER_CERT" );
+ 		$self->{TXT_CERT}    = $params->{$key} if ( $key eq "TXT_CERT" );
  
  		$self->{tmpDir}      = $params->{$key} if ( $key eq "TMPDIR" );
***************
*** 3043,3046 ****
--- 3045,3083 ----
  ##############################################################
  
+ 
+ ##############################################################
+ ##                        BEGIN                             ##
+ ##              Token information handling                  ##
+ ##############################################################
+ 
+ sub get_pem_cert
+ {
+     my $self = shift;
+     return $self->{PEM_CERT};
+ }
+ 
+ sub get_der_cert
+ {
+     my $self = shift;
+     return $self->{DER_CERT};
+ }
+ 
+ sub get_txt_cert
+ {
+     my $self = shift;
+     return $self->{TXT_CERT};
+ }
+ 
+ sub get_key
+ {
+     my $self = shift;
+     return $self->{KEY};
+ }
+ 
+ ##############################################################
+ ##                         END                              ##
+ ##              Token information handling                  ##
+ ##############################################################
+ 
  sub _debug
  {

[openca-cvsdev] CVS: openca-0.9 CHANGES,1.397,1.398

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2373

Modified Files:
	CHANGES 
Log Message:
ignore  - local CVS trouble


Author of changes:  michaelbell

Index: CHANGES
===================================================================
RCS file: /cvsroot/openca/openca-0.9/CHANGES,v
retrieving revision 1.397
retrieving revision 1.398
diff -C2 -d -r1.397 -r1.398
*** CHANGES	10 Aug 2005 16:03:40 -0000	1.397
--- CHANGES	12 Aug 2005 13:39:36 -0000	1.398
***************
*** 3,8 ****
  "cvs commit".
  
! 2005-Aug-09
! 	* migrated all OPENCA_I18N strings to I18N_OPENCA
  	* nCipher: Added timeout for autoloaded OpenSSL calls, fixed 
  	  minor problems with unclosed timeouts (openca_0_9_2 too)
--- 3,18 ----
  "cvs commit".
  
! 2005-Aug-xx
! 	* CSS enhancements
! 	    * Removed nested tables by nowrap option
! 	    * Make HTML output human readable
! 	* cleanup
! 	    * Removed loa.xml
! 	    * Added policy.xml (central point for policy relevant stuff)
! 	    * Removed duplicates in server.xml and token.xml
! 2005-Aug-12
! 	* 0.9.2.4
! 	* Added apache-ssl support
! 	* Migrated all OPENCA_I18N strings to I18N_OPENCA
  	* nCipher: Added timeout for autoloaded OpenSSL calls, fixed 
  	  minor problems with unclosed timeouts (openca_0_9_2 too)

[openca-cvsdev] CVS: www.openca.org/htdocs/download index.html,1.14,1.15

[<ope...@li...>]

Update of /cvsroot/openca/www.openca.org/htdocs/download
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15711/htdocs/download

Modified Files:
	index.html 
Log Message:
Release ofRelease of 0.9.2.4 added


Author of changes:  oliwel

Index: index.html
===================================================================
RCS file: /cvsroot/openca/www.openca.org/htdocs/download/index.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** index.html	10 Aug 2005 10:33:31 -0000	1.14
--- index.html	12 Aug 2005 12:13:45 -0000	1.15
***************
*** 48,51 ****
--- 48,54 ----
          <h3>OpenCA 0.9.2</h3>
          <ul>
+           <li><a href="http://prdownloads.sourceforge.net/openca/openca-0.9.2.4.tar.gz?download">
+             0.9.2.4 (introduces UTF-8 support)
+           </a></li>
            <li>
              0.9.2.3 (revoked because buggy - database layer is broken !)

[openca-cvsdev] CVS: www.openca.org/htdocs/news index.html,1.20,1.21

[<ope...@li...>]

Update of /cvsroot/openca/www.openca.org/htdocs/news
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15711/htdocs/news

Modified Files:
	index.html 
Log Message:
Release ofRelease of 0.9.2.4 added


Author of changes:  oliwel

Index: index.html
===================================================================
RCS file: /cvsroot/openca/www.openca.org/htdocs/news/index.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** index.html	10 Aug 2005 10:33:31 -0000	1.20
--- index.html	12 Aug 2005 12:13:45 -0000	1.21
***************
*** 35,38 ****
--- 35,40 ----
          <h2>News</h2>
          <dl>
+           <dt>2005-Aug-12</dt>
+           <dd>OpenCA 0.9.2.4 was released (Bugfix for 0.9.2.3)</dd>
            <dt>2005-Aug-10</dt>
            <dd>OpenCA 0.9.2.3 contains a severe bug in the database backend - dont use it ! We will provide a fixed version soon!</dd>
***************
*** 72,75 ****
--- 74,79 ----
          <dl>
            <dt>0.9.2</dt>
+           <dd><a href="http://prdownloads.sourceforge.net/openca/openca-0.9.2.4.tar.gz?download" target="_blank">openca-0.9.2.4
+ .tar.gz</a></dd>
            <dd>openca-0.9.2.3.tar.gz (revoke due to a severe bug!)</dd>
            <dd><a href="http://prdownloads.sourceforge.net/openca/openca-0.9.2.2.tar.gz?download" target="_blank">openca-0.9.2.2.tar.gz</a></dd>

[openca-cvsdev] CVS: openca-0.9 Makefile.devel,1.19.2.4,1.19.2.5

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31522

Modified Files:
      Tag: openca_0_9_2
	Makefile.devel 
Log Message:
fixed minor version number


Author of changes:  michaelbell

Index: Makefile.devel
===================================================================
RCS file: /cvsroot/openca/openca-0.9/Makefile.devel,v
retrieving revision 1.19.2.4
retrieving revision 1.19.2.5
diff -C2 -d -r1.19.2.4 -r1.19.2.5
*** Makefile.devel	8 Mar 2005 11:56:59 -0000	1.19.2.4
--- Makefile.devel	12 Aug 2005 10:57:28 -0000	1.19.2.5
***************
*** 176,180 ****
  VERSION	= "0.9.2"
  ## format is "-RC1" or "-0"
! MINOR   = ".3"
  
  dist:
--- 176,180 ----
  VERSION	= "0.9.2"
  ## format is "-RC1" or "-0"
! MINOR   = ".4"
  
  dist:

[openca-cvsdev] CVS: openca-0.9 CHANGES,1.295.2.58,1.295.2.59 HISTORY,1.23.2.3,1.23.2.4

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16712

Modified Files:
      Tag: openca_0_9_2
	CHANGES HISTORY 
Log Message:
preparations for 0.9.2.4


Author of changes:  mbartosch

Index: CHANGES
===================================================================
RCS file: /cvsroot/openca/openca-0.9/CHANGES,v
retrieving revision 1.295.2.58
retrieving revision 1.295.2.59
diff -C2 -d -r1.295.2.58 -r1.295.2.59
*** CHANGES	10 Aug 2005 15:41:07 -0000	1.295.2.58
--- CHANGES	12 Aug 2005 09:23:55 -0000	1.295.2.59
***************
*** 3,7 ****
  "cvs commit".
  
! 2005-Aug-xx:
  	* nCipher: Added timeout for autoloaded OpenSSL calls, fixed minor 
  	  problems with unclosed timeouts, removed HSM online indicator
--- 3,8 ----
  "cvs commit".
  
! 2005-Aug-12:
! 	* 0.9.2.4
  	* nCipher: Added timeout for autoloaded OpenSSL calls, fixed minor 
  	  problems with unclosed timeouts, removed HSM online indicator
***************
*** 58,63 ****
  	* Fixed wrong condition to check for attribute type without it's
  	  value in pkcs10_req
! 	* added support for static openssl engines with PRE and POST commands
! 2004-Mar-07:
  	* 0.9.2.2
          * automatic cleanup of PKCS#10 requests (multiple CR/LFs are removed)
--- 59,64 ----
  	* Fixed wrong condition to check for attribute type without it's
  	  value in pkcs10_req
! 	* added support for dynamic openssl engines with PRE and POST commands
! 2005-Mar-07:
  	* 0.9.2.2
          * automatic cleanup of PKCS#10 requests (multiple CR/LFs are removed)

Index: HISTORY
===================================================================
RCS file: /cvsroot/openca/openca-0.9/HISTORY,v
retrieving revision 1.23.2.3
retrieving revision 1.23.2.4
diff -C2 -d -r1.23.2.3 -r1.23.2.4
*** HISTORY	5 Aug 2005 15:46:26 -0000	1.23.2.3
--- HISTORY	12 Aug 2005 09:23:55 -0000	1.23.2.4
***************
*** 15,18 ****
--- 15,19 ----
  |  Version  |     Date    |
  +-----------+-------------+
+ | 0.9.2.4   | 12 Aug 2005 |
  | 0.9.2.3   |  5 Aug 2005 |
  | 0.9.2.2   |  7 Mar 2005 |

[openca-cvsdev] CVS: openca-0.9 RELEASE-NOTES,1.1.2.1,1.1.2.2

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4981

Modified Files:
      Tag: openca_0_9_2
	RELEASE-NOTES 
Log Message:
finetuned wording


Author of changes:  mbartosch

Index: RELEASE-NOTES
===================================================================
RCS file: /cvsroot/openca/openca-0.9/Attic/RELEASE-NOTES,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** RELEASE-NOTES	12 Aug 2005 07:57:40 -0000	1.1.2.1
--- RELEASE-NOTES	12 Aug 2005 08:29:17 -0000	1.1.2.2
***************
*** 3,9 ****
  
  This file documents major changes between releases, including new or
! modified features and in particular configuration file changes.
! Only major modifications are mentioned, in particular those that
! can affect existing installations.
  Before upgrading from a previous release please consider all changes, in 
  particular configuration file modifications, carefully.
--- 3,9 ----
  
  This file documents major changes between releases, including new or
! modified features and configuration file changes. Only major modifications 
! are listed, primarily those that can affect existing installations.
! 
  Before upgrading from a previous release please consider all changes, in 
  particular configuration file modifications, carefully.

[openca-cvsdev] CVS: suse openca.spec,1.6,1.7

[<ope...@li...>]

Update of /cvsroot/openca/suse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30272

Modified Files:
	openca.spec 
Log Message:
added utf8 support selector file


Author of changes:  mbartosch

Index: openca.spec
===================================================================
RCS file: /cvsroot/openca/suse/openca.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** openca.spec	6 Oct 2004 13:44:23 -0000	1.6
--- openca.spec	12 Aug 2005 07:59:47 -0000	1.7
***************
*** 209,212 ****
--- 209,213 ----
  %{prefix}/etc/scep
  %{prefix}/etc/token.xml
+ %{prefix}/etc/utf8_latin1_selector.sh.template
  
  

[openca-cvsdev] CVS: openca-0.9 RELEASE-NOTES,NONE,1.1.2.1

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29905

Added Files:
      Tag: openca_0_9_2
	RELEASE-NOTES 
Log Message:
Added release notes


Author of changes:  mbartosch

--- NEW FILE: RELEASE-NOTES ---

OpenCA 0.9.2 Release Notes

This file documents major changes between releases, including new or
modified features and in particular configuration file changes.
Only major modifications are mentioned, in particular those that
can affect existing installations.
Before upgrading from a previous release please consider all changes, in 
particular configuration file modifications, carefully.

For more details please refer to the CHANGES file.



2005-08-12 - OpenCA 0.9.2.4
This is a maintenance release and mainly identical to 0.9.2.3.
---------------------------------------------------------------------------

2005-08-05 - OpenCA 0.9.2.3
*** IMPORTANT: This release contains an error in the database layer. ***
DO NOT USE THIS RELEASE!

- Dynamic engine support (required for OpenSSL 0.9.8)
- Russian translation
- UTF-8 support
- Improved SCEP interface (read documentation!)

Configuration file changes:
etc/config.xml
  new: cert_chars
etc/menu.xml.template
  new: HSM Management
  new: Russian
etc/rbac/acl.xml
  modified: permission/module
etc/servers/ca.conf.template
  new: lockFile
  modified: DN_*_CHARACTERSET
etc/servers/pub.conf.template
  modified: DN_*_CHARACTERSET
etc/servers/ra.conf.template
  modified: DN_*_CHARACTERSET
etc/servers/scep.conf.template
  new: ScepAllowEnrollment
  new: ScepAllowRenewal
  new: ScepKeepSubjectAltName
  new: ScepRenewalRDNMatch
  new: ScepDefaultRole
  new: ScepDefaultRA
  new: ScepAutoApprove
---------------------------------------------------------------------------

2005-03-07 - OpenCA 0.9.2.2
- LunaCA3 support

Configuration file changes:
etc/servers/ldap.conf.template
  new: ModuleID
  new: ModuleShift
etc/servers/node.conf.template
  modified: SEND_MAIL_DURING_IMPORT
---------------------------------------------------------------------------

2004-08-28 - OpenCA 0.9.2.1
- Greek translation

Configuration file changes:
etc/menu.xml.template
  new: Greek
---------------------------------------------------------------------------

2004-10-11 - OpenCA 0.9.2.0
Major differences to the 0.9.1 version. It is recommended to perform
a fresh install and migrate configuration manually if upgrading
from 0.9.1.

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-server/Server/Command approve_csr.pm,1.6,1.7 backup_key.pm,1.3,1.4 batch_cmd_backup_key.pm,1.3,1.4 batch_cmd_check_csr.pm,1.2,1.3 batch_cmd_check_csr_params.pm,1.4,1.5 batch_cmd_check_key.pm,1.2,1.3 batch_cmd_check_key_params.pm,1.4,1.5 batch_cmd_check_pin.pm,1.3,1.4 batch_cmd_complete_csr.pm,1.2,1.3 batch_cmd_create_cert.pm,1.1,1.2 batch_cmd_create_csr.pm,1.2,1.3 batch_cmd_create_key.pm,1.3,1.4 batch_cmd_create_pin.pm,1.3,1.4 batch_cmd_enroll_pin.pm,1.1,1.2 batch_cmd_enroll_pkcs12.pm,1.2,1.3 batch_do_step.pm,1.4,1.5 batch_import_data.pm,1.4,1.5 check_csr.pm,1.6,1.7 create_global_id.pm,1.2,1.3 create_pin.pm,1.2,1.3 create_pkcs10.pm,1.3,1.4 create_pkcs8.pm,1.2,1.3 dataexchange_backup.pm,1.1,1.2 dataexchange_export.pm,1.1,1.2 dataexchange_import.pm,1.2,1.3 dataexchange_recovery.pm,1.1,1.2 genCACert.pm,1.5,1.6 genCAReq.pm,1.3,1.4 genSKey.pm,1.4,1.5 get_cert.pm,1.2,1.3 get_csr.pm,1.8,1.9 get_signature.pm,1.3,1.4 insert_csr.pm,1.8,1.9 insert_pin.pm,1.3,1.4 insert_pkcs8.pm,1.4,1.5 insert_signature.pm,1.6,1.7 issue_cert.pm,1.8,1.9 list_signature.pm,1.5,1.6 lock_global_id.pm,1.2,1.3 set_crin.pm,1.3,1.4 unlock_global_id.pm,1.2,1.3 update_csr.pm,1.10,1.11

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257/openca-0.9/src/modules/openca-server/Server/Command

Modified Files:
	approve_csr.pm backup_key.pm batch_cmd_backup_key.pm 
	batch_cmd_check_csr.pm batch_cmd_check_csr_params.pm 
	batch_cmd_check_key.pm batch_cmd_check_key_params.pm 
	batch_cmd_check_pin.pm batch_cmd_complete_csr.pm 
	batch_cmd_create_cert.pm batch_cmd_create_csr.pm 
	batch_cmd_create_key.pm batch_cmd_create_pin.pm 
	batch_cmd_enroll_pin.pm batch_cmd_enroll_pkcs12.pm 
	batch_do_step.pm batch_import_data.pm check_csr.pm 
	create_global_id.pm create_pin.pm create_pkcs10.pm 
	create_pkcs8.pm dataexchange_backup.pm dataexchange_export.pm 
	dataexchange_import.pm dataexchange_recovery.pm genCACert.pm 
	genCAReq.pm genSKey.pm get_cert.pm get_csr.pm get_signature.pm 
	insert_csr.pm insert_pin.pm insert_pkcs8.pm 
	insert_signature.pm issue_cert.pm list_signature.pm 
	lock_global_id.pm set_crin.pm unlock_global_id.pm 
	update_csr.pm 
Log Message:
OPENCA_I18N ==> I18N_OPENCA


Author of changes:  michaelbell

Index: approve_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/approve_csr.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** approve_csr.pm	1 Aug 2005 15:41:15 -0000	1.6
--- approve_csr.pm	10 Aug 2005 16:03:49 -0000	1.7
***************
*** 58,62 ****
          if (not $org_csr)
          {
!             $self->set_error ("OPENCA_I18N_API_CMD_APPROVE_CSR_DATA_CORRUPT",
                                "__ERRNO__", $OpenCA::REQ::errno,
                                "__ERRVAL__", $OpenCA::REQ::errval);
--- 58,62 ----
          if (not $org_csr)
          {
!             $self->set_error ("I18N_OPENCA_API_CMD_APPROVE_CSR_DATA_CORRUPT",
                                "__ERRNO__", $OpenCA::REQ::errno,
                                "__ERRVAL__", $OpenCA::REQ::errval);
***************
*** 67,71 ****
  
      if (not $key) {
!         $self->set_error ("OPENCA_I18N_API_CMD_APPROVE_CSR_SERIAL_MISSING");
          return undef;
      }
--- 67,71 ----
  
      if (not $key) {
!         $self->set_error ("I18N_OPENCA_API_CMD_APPROVE_CSR_SERIAL_MISSING");
          return undef;
      }
***************
*** 77,81 ****
      if (not $csr)
      {
!         $self->set_error ("OPENCA_I18N_API_CMS_APPROVE_CSR_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 77,81 ----
      if (not $csr)
      {
!         $self->set_error ("I18N_OPENCA_API_CMS_APPROVE_CSR_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 88,92 ****
          $status ne "SIGNED")
      {
!         $self->set_error ("OPENCA_I18N_API_CMS_APPROVE_CSR_WRONG_STATUS",
                            "__STATUS__", $status);
          return undef;
--- 88,92 ----
          $status ne "SIGNED")
      {
!         $self->set_error ("I18N_OPENCA_API_CMS_APPROVE_CSR_WRONG_STATUS",
                            "__STATUS__", $status);
          return undef;
***************
*** 96,100 ****
      if ($org_csr and $csr->getItem() ne $org_csr->getItem())
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_APPROVE_CSR_DATA_NOT_IDENTICAL");
          return undef;
      }
--- 96,100 ----
      if ($org_csr and $csr->getItem() ne $org_csr->getItem())
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_APPROVE_CSR_DATA_NOT_IDENTICAL");
          return undef;
      }
***************
*** 106,110 ****
      {
  	$self->set_error ($self->{"api"}->errno(),
!                           "OPENCA_I18N_API_CMD_APPROVE_CSR_CHECK_FAILED",
                            "__ERRVAL__", $self->{"api"}->errval());
          return undef;
--- 106,110 ----
      {
  	$self->set_error ($self->{"api"}->errno(),
!                           "I18N_OPENCA_API_CMD_APPROVE_CSR_CHECK_FAILED",
                            "__ERRVAL__", $self->{"api"}->errval());
          return undef;
***************
*** 116,120 ****
                                   OBJECT => $csr))
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_APPROVE_CSR_STATUS_UPDATE_FAILED",
                            "__ERRNO__", $self->{db}->errno,
                            "__ERRVAL__", $self->{db}->errval);
--- 116,120 ----
                                   OBJECT => $csr))
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_APPROVE_CSR_STATUS_UPDATE_FAILED",
                            "__ERRNO__", $self->{db}->errno,
                            "__ERRVAL__", $self->{db}->errval);

Index: backup_key.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/backup_key.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** backup_key.pm	25 Jul 2005 08:11:22 -0000	1.3
--- backup_key.pm	10 Aug 2005 16:03:49 -0000	1.4
***************
*** 67,71 ****
  
      if (not $key) {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_NO_KEY");
          return undef;
      }
--- 67,71 ----
  
      if (not $key) {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_NO_KEY");
          return undef;
      }
***************
*** 73,77 ****
      if (not $tokenname)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_NO_TOKEN");
          return undef;
      }
--- 73,77 ----
      if (not $tokenname)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_NO_TOKEN");
          return undef;
      }
***************
*** 79,83 ****
      if (not $token)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_CANNOT_GET_TOKEN",
                            "__ERRNO__", $self->{crypto_layer}->errno(),
                            "__ERRVAL__", $self->{crypto_layer}->errval());
--- 79,83 ----
      if (not $token)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_CANNOT_GET_TOKEN",
                            "__ERRNO__", $self->{crypto_layer}->errno(),
                            "__ERRVAL__", $self->{crypto_layer}->errval());
***************
*** 93,97 ****
      {
          $self->set_error ($self->{db}->errno(),
!                           "OPENCA_I18N_API_CMD_BACKUP_KEY_SEARCH_KEYBACKUP_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
--- 93,97 ----
      {
          $self->set_error ($self->{db}->errno(),
!                           "I18N_OPENCA_API_CMD_BACKUP_KEY_SEARCH_KEYBACKUP_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
***************
*** 99,103 ****
      if (scalar @{$datasets})
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_OLD_BACKUP_FOUND");
          return undef;
      }
--- 99,103 ----
      if (scalar @{$datasets})
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_OLD_BACKUP_FOUND");
          return undef;
      }
***************
*** 112,116 ****
                           DATA      => $key->{DATA});
      if (not $clear_key) {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_DECRYPT_FAILED",
                            "__ERRNO__", $self->{crypto_shell}->errno(),
                            "__ERRVAL__", $self->{crypto_shell}->errval());
--- 112,116 ----
                           DATA      => $key->{DATA});
      if (not $clear_key) {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_DECRYPT_FAILED",
                            "__ERRNO__", $self->{crypto_shell}->errno(),
                            "__ERRVAL__", $self->{crypto_shell}->errval());
***************
*** 125,129 ****
      if (not $passwd_backup)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_ENCRYPT_PASSWD_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
--- 125,129 ----
      if (not $passwd_backup)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_ENCRYPT_PASSWD_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
***************
*** 135,139 ****
      if (not $backup)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_ENCRYPT_KEY_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
--- 135,139 ----
      if (not $backup)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_ENCRYPT_KEY_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
***************
*** 148,152 ****
      if (not $self->{db}->store_hash (OBJECTTYPE => "PRIVATE", MODE => "INSERT", HASH => $private))
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_INSERT_PINBACKUP_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 148,152 ----
      if (not $self->{db}->store_hash (OBJECTTYPE => "PRIVATE", MODE => "INSERT", HASH => $private))
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_INSERT_PINBACKUP_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 164,168 ****
      {
          $self->set_error ($self->{db}->errno(),
!                           "OPENCA_I18N_API_CMD_BACKUP_KEY_INSERT_PINBACKUP_REF_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
--- 164,168 ----
      {
          $self->set_error ($self->{db}->errno(),
!                           "I18N_OPENCA_API_CMD_BACKUP_KEY_INSERT_PINBACKUP_REF_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
***************
*** 177,181 ****
      {
          $self->set_error ($self->{db}->errno(),
!                           "OPENCA_I18N_API_CMD_BACKUP_KEY_INSERT_KEYBACKUP_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
--- 177,181 ----
      {
          $self->set_error ($self->{db}->errno(),
!                           "I18N_OPENCA_API_CMD_BACKUP_KEY_INSERT_KEYBACKUP_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
***************
*** 191,195 ****
      {
          $self->set_error ($self->{db}->errno(),
!                           "OPENCA_I18N_API_CMD_BACKUP_KEY_INSERT_KEYBACKUP_REF_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;
--- 191,195 ----
      {
          $self->set_error ($self->{db}->errno(),
!                           "I18N_OPENCA_API_CMD_BACKUP_KEY_INSERT_KEYBACKUP_REF_FAILED",
                            "__ERRVAL__", $self->{db}->errval());
          return undef;

Index: batch_cmd_backup_key.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_backup_key.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** batch_cmd_backup_key.pm	15 Apr 2005 13:36:55 -0000	1.3
--- batch_cmd_backup_key.pm	10 Aug 2005 16:03:49 -0000	1.4
***************
*** 61,65 ****
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "OPENCA_I18N_CMD_BATCH_CMD_BACKUP_KEY_NO_TOKEN");
          return undef;
      }
--- 61,65 ----
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "I18N_OPENCA_CMD_BATCH_CMD_BACKUP_KEY_NO_TOKEN");
          return undef;
      }
***************
*** 70,74 ****
      if (not $dataset)
      {
!         $self->set_error (-120, "OPENCA_I18N_CMD_BATCH_CMD_BACKUP_KEY_NO_PIN_REF");
          return undef;
      }
--- 70,74 ----
      if (not $dataset)
      {
!         $self->set_error (-120, "I18N_OPENCA_CMD_BATCH_CMD_BACKUP_KEY_NO_PIN_REF");
          return undef;
      }
***************
*** 79,88 ****
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_CMD_BATCH_CMD_BACKUP_KEY_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "OPENCA_I18N_CMD_BATCH_CMD_BACKUP_KEY_DECRYPT_FAILED");
          return undef;
      }
--- 79,88 ----
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_CMD_BATCH_CMD_BACKUP_KEY_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "I18N_OPENCA_CMD_BATCH_CMD_BACKUP_KEY_DECRYPT_FAILED");
          return undef;
      }
***************
*** 92,96 ****
      if (not $key_ref)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BACKUP_KEY_NO_KEY_REF_FOUND");
          return undef;
      }
--- 92,96 ----
      if (not $key_ref)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BACKUP_KEY_NO_KEY_REF_FOUND");
          return undef;
      }
***************
*** 98,102 ****
      if (not $key)
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_LOAD_KEY_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 98,102 ----
      if (not $key)
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_LOAD_KEY_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 132,136 ****
          if ($backup_mode =~ /DENY/i)
          {
!             $self->set_error (-150, "OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_GLOBAL_DENY_BUT_LOCAL_FORCE");
              return undef;
          }
--- 132,136 ----
          if ($backup_mode =~ /DENY/i)
          {
!             $self->set_error (-150, "I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_GLOBAL_DENY_BUT_LOCAL_FORCE");
              return undef;
          }
***************
*** 139,143 ****
          if ($backup_mode =~ /FORCE/i)
          {
!             $self->set_error (-160, "OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_GLOBAL_FORCE_BUT_LOCAL_DENY");
              return undef;
          }
--- 139,143 ----
          if ($backup_mode =~ /FORCE/i)
          {
!             $self->set_error (-160, "I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_GLOBAL_FORCE_BUT_LOCAL_DENY");
              return undef;
          }
***************
*** 145,149 ****
  
      ## stop operations if keybackup is not necessary
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_IGNORED")
          if (not $backup_key);
  
--- 145,149 ----
  
      ## stop operations if keybackup is not necessary
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_IGNORED")
          if (not $backup_key);
  
***************
*** 157,161 ****
      {
          $self->set_error (-170,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 157,161 ----
      {
          $self->set_error (-170,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 164,168 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_BACKUP_KEY_SUCCESS");
  }
  
--- 164,168 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_BACKUP_KEY_SUCCESS");
  }
  

Index: batch_cmd_check_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_check_csr.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_cmd_check_csr.pm	18 Jul 2005 10:11:55 -0000	1.2
--- batch_cmd_check_csr.pm	10 Aug 2005 16:03:49 -0000	1.3
***************
*** 77,86 ****
      if (not $csr_ref)
      {
!         $self->set_error (-110, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_NO_CSR_REF");
          return undef;
      }
      if (not exists $csr_ref->{NUMBER})
      {
!         $self->set_error (-115, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_NO_CSR_REF_NUMBER");
          return undef;
      }
--- 77,86 ----
      if (not $csr_ref)
      {
!         $self->set_error (-110, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_NO_CSR_REF");
          return undef;
      }
      if (not exists $csr_ref->{NUMBER})
      {
!         $self->set_error (-115, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_NO_CSR_REF_NUMBER");
          return undef;
      }
***************
*** 91,95 ****
      {
          $self->set_error (-170,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_GET_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 91,95 ----
      {
          $self->set_error (-170,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_GET_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 111,115 ****
      {
          $self->set_error (-140,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_ROLE_NOT_ALLOWED",
                            "__ROLE__", $csr->{HEADER}->{ROLE});
          return undef;
--- 111,115 ----
      {
          $self->set_error (-140,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_ROLE_NOT_ALLOWED",
                            "__ROLE__", $csr->{HEADER}->{ROLE});
          return undef;
***************
*** 132,136 ****
      {
          $self->set_error (-160,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_SUBJECT_SUFFIX_NOT_ALLOWED",
                            "__SUBJECT__", $csr->{HEADER}->{SUBJECT});
          return undef;
--- 132,136 ----
      {
          $self->set_error (-160,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_SUBJECT_SUFFIX_NOT_ALLOWED",
                            "__SUBJECT__", $csr->{HEADER}->{SUBJECT});
          return undef;
***************
*** 141,145 ****
      if (not $csr->{HEADER}->{SUBJECT_ALT_NAME})
      {
!         $self->set_error (-180, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
--- 141,145 ----
      if (not $csr->{HEADER}->{SUBJECT_ALT_NAME})
      {
!         $self->set_error (-180, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
***************
*** 154,158 ****
      {
          $self->set_error (-170,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_KEY_TOO_SHORT",
                            "__CSR_KEY__", $csr->{PARAMS}->{KEYSIZE},
                            "__MIN_KEY__", $min_key_length);
--- 154,158 ----
      {
          $self->set_error (-170,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_KEY_TOO_SHORT",
                            "__CSR_KEY__", $csr->{PARAMS}->{KEYSIZE},
                            "__MIN_KEY__", $min_key_length);
***************
*** 166,170 ****
                                       CSR    => $csr->{BODY}))
      {
! 	$self->set_error ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_NORMAL_CHECK_FAILED",
                            "__ERRVAL__", $self->{api}->errno(),
                            "__ERRNO__", $self->{api}->errval());
--- 166,170 ----
                                       CSR    => $csr->{BODY}))
      {
! 	$self->set_error ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_NORMAL_CHECK_FAILED",
                            "__ERRVAL__", $self->{api}->errno(),
                            "__ERRNO__", $self->{api}->errval());
***************
*** 177,181 ****
                                       KEY => $csr_ref->{NUMBER}))
      {
!         $self->set_error ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_APPROVE_FAILED",
                            "__ERRVAL__", $self->{api}->errno(),
                            "__ERRNO__", $self->{api}->errval());
--- 177,181 ----
                                       KEY => $csr_ref->{NUMBER}))
      {
!         $self->set_error ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_APPROVE_FAILED",
                            "__ERRVAL__", $self->{api}->errno(),
                            "__ERRNO__", $self->{api}->errval());
***************
*** 185,189 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_SUCCESS");
  }
  
--- 185,189 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_SUCCESS");
  }
  

Index: batch_cmd_check_csr_params.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_check_csr_params.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** batch_cmd_check_csr_params.pm	18 Jul 2005 10:11:55 -0000	1.4
--- batch_cmd_check_csr_params.pm	10 Aug 2005 16:03:49 -0000	1.5
***************
*** 78,82 ****
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-110, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_PIN");
          return undef;
      }
--- 78,82 ----
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-110, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_PIN");
          return undef;
      }
***************
*** 87,91 ****
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_KEY");
          return undef;
      }
--- 87,91 ----
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_KEY");
          return undef;
      }
***************
*** 96,100 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-130, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_ROLE");
          return undef;
      }
--- 96,100 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-130, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_ROLE");
          return undef;
      }
***************
*** 111,115 ****
      {
          $self->set_error (-140,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_ROLE_NOT_ALLOWED",
                            "__ROLE__", $dataset->{STRING});
          return undef;
--- 111,115 ----
      {
          $self->set_error (-140,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_ROLE_NOT_ALLOWED",
                            "__ROLE__", $dataset->{STRING});
          return undef;
***************
*** 121,125 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-150, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_SUBJECT");
          return undef;
      }
--- 121,125 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-150, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_SUBJECT");
          return undef;
      }
***************
*** 129,133 ****
      {
          $self->set_error (-151,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_RFC2253_SUBJECT",
                            "__ERRNO__", $OpenCA::DN::errno,
                            "__ERRVAL__", $OpenCA::DN::errval);
--- 129,133 ----
      {
          $self->set_error (-151,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_RFC2253_SUBJECT",
                            "__ERRNO__", $OpenCA::DN::errno,
                            "__ERRVAL__", $OpenCA::DN::errval);
***************
*** 148,152 ****
      {
          $self->set_error (-160,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_SUBJECT_SUFFIX_NOT_ALLOWED",
                            "__SUBJECT__", $dataset->{STRING});
          return undef;
--- 148,152 ----
      {
          $self->set_error (-160,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_SUBJECT_SUFFIX_NOT_ALLOWED",
                            "__SUBJECT__", $dataset->{STRING});
          return undef;
***************
*** 162,166 ****
      {
          $self->set_error (-175,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 162,166 ----
      {
          $self->set_error (-175,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 169,178 ****
      if (not scalar @{$datasets})
      {
!         $self->set_error (-180, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_SUBJECT_ALT_NAME");
          return undef;
      }
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_SUCCESS");
  }
  
--- 169,178 ----
      if (not scalar @{$datasets})
      {
!         $self->set_error (-180, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_NO_SUBJECT_ALT_NAME");
          return undef;
      }
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_CSR_PARAMS_SUCCESS");
  }
  

Index: batch_cmd_check_key.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_check_key.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_cmd_check_key.pm	15 Apr 2005 13:36:55 -0000	1.2
--- batch_cmd_check_key.pm	10 Aug 2005 16:03:49 -0000	1.3
***************
*** 60,64 ****
      if (not $token or not ref $token or not $token->keyOnline())
      {
!         $self->set_error (-115, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_NO_TOKEN");
          return undef;
      }
--- 60,64 ----
      if (not $token or not ref $token or not $token->keyOnline())
      {
!         $self->set_error (-115, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_NO_TOKEN");
          return undef;
      }
***************
*** 69,73 ****
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_NO_PIN");
          return undef;
      }
--- 69,73 ----
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_NO_PIN");
          return undef;
      }
***************
*** 78,82 ****
      if (not $enc_pin or not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_NO_ENCRYPTED_PIN");
          return undef;
      }
--- 78,82 ----
      if (not $enc_pin or not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_NO_ENCRYPTED_PIN");
          return undef;
      }
***************
*** 84,88 ****
      if (not $pin) {
          $self->set_error (-140,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_DECRYPT_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
--- 84,88 ----
      if (not $pin) {
          $self->set_error (-140,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_DECRYPT_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
***************
*** 96,100 ****
      ## actually I don't know how to test a private key
  
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_SUCCESS");
  }
  
--- 96,100 ----
      ## actually I don't know how to test a private key
  
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_SUCCESS");
  }
  

Index: batch_cmd_check_key_params.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_check_key_params.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** batch_cmd_check_key_params.pm	11 Apr 2005 12:23:30 -0000	1.4
--- batch_cmd_check_key_params.pm	10 Aug 2005 16:03:49 -0000	1.5
***************
*** 93,97 ****
      {
          $self->set_error (-140,
!                           "OPENCA_I18N_CMD_BATCH_CMD_CHECK_KEY_PARAMS_LENGTH_TOO_SHORT",
                            "__MINIMUM__", $min_key_length,
                            "__LENGTH__", $key_length);
--- 93,97 ----
      {
          $self->set_error (-140,
!                           "I18N_OPENCA_CMD_BATCH_CMD_CHECK_KEY_PARAMS_LENGTH_TOO_SHORT",
                            "__MINIMUM__", $min_key_length,
                            "__LENGTH__", $key_length);
***************
*** 101,110 ****
      ## check keyalgorithm
      if (not $key_alg) {
!         $self->set_error (-150, "OPENCA_I18N_CMD_BATCH_CMD_CHECK_KEY_PARAMS_NO_ALGORITHM");
          return undef;
      }
      if ($key_alg !~ /^(rsa|dsa)$/i) {
          $self->set_error (-160,
!                           "OPENCA_I18N_CMD_BATCH_CMD_CHECK_KEY_PARAMS_UNSUPPORTED_ALGORITHM",
                            "__KEY_ALG__", $key_alg);
          return undef;
--- 101,110 ----
      ## check keyalgorithm
      if (not $key_alg) {
!         $self->set_error (-150, "I18N_OPENCA_CMD_BATCH_CMD_CHECK_KEY_PARAMS_NO_ALGORITHM");
          return undef;
      }
      if ($key_alg !~ /^(rsa|dsa)$/i) {
          $self->set_error (-160,
!                           "I18N_OPENCA_CMD_BATCH_CMD_CHECK_KEY_PARAMS_UNSUPPORTED_ALGORITHM",
                            "__KEY_ALG__", $key_alg);
          return undef;
***************
*** 112,116 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_KEY_PARAMS_SUCCESS");
  }
  
--- 112,116 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_KEY_PARAMS_SUCCESS");
  }
  

Index: batch_cmd_check_pin.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_check_pin.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** batch_cmd_check_pin.pm	15 Apr 2005 13:36:55 -0000	1.3
--- batch_cmd_check_pin.pm	10 Aug 2005 16:03:49 -0000	1.4
***************
*** 60,64 ****
      if (not $token or not ref $token or not $token->keyOnline())
      {
!         $self->set_error (-115, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_NO_TOKEN");
          return undef;
      }
--- 60,64 ----
      if (not $token or not ref $token or not $token->keyOnline())
      {
!         $self->set_error (-115, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_NO_TOKEN");
          return undef;
      }
***************
*** 69,73 ****
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_NO_PIN");
          return undef;
      }
--- 69,73 ----
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_NO_PIN");
          return undef;
      }
***************
*** 78,82 ****
      if (not $enc_pin or not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_NO_ENCRYPTED_PIN");
          return undef;
      }
--- 78,82 ----
      if (not $enc_pin or not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_NO_ENCRYPTED_PIN");
          return undef;
      }
***************
*** 84,88 ****
      if (not $pin) {
          $self->set_error (-140,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_DECRYPT_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
--- 84,88 ----
      if (not $pin) {
          $self->set_error (-140,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_DECRYPT_FAILED",
                            "__ERRNO__", $token->errno(),
                            "__ERRVAL__", $token->errval());
***************
*** 96,105 ****
  
      if (length ($pin) < 22) {
!         $self->set_error (-150, "OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_TOO_SHORT");
          return undef;
      }
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CHECK_PIN_SUCCESS");
  }
  
--- 96,105 ----
  
      if (length ($pin) < 22) {
!         $self->set_error (-150, "I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_TOO_SHORT");
          return undef;
      }
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CHECK_PIN_SUCCESS");
  }
  

Index: batch_cmd_complete_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_complete_csr.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_cmd_complete_csr.pm	14 Jul 2005 11:22:55 -0000	1.2
--- batch_cmd_complete_csr.pm	10 Aug 2005 16:03:49 -0000	1.3
***************
*** 80,84 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-130, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_ROLE");
          return undef;
      }
--- 80,84 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-130, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_ROLE");
          return undef;
      }
***************
*** 90,94 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-140, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT");
          return undef;
      }
--- 90,94 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-140, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT");
          return undef;
      }
***************
*** 104,108 ****
      {
          $self->set_error (-145,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 104,108 ----
      {
          $self->set_error (-145,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_DATABASE_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 111,115 ****
      if (not scalar @{$datasets})
      {
!         $self->set_error (-150, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
--- 111,115 ----
      if (not scalar @{$datasets})
      {
!         $self->set_error (-150, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
***************
*** 122,126 ****
          if (not $subject_alt_names->{$number}) {
              $self->set_error (-160,
!                               "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_CANNOT_LOAD_SUBJECT_ALT_NAME_PART",
                                "__NUMBER__", $number);
              return undef;
--- 122,126 ----
          if (not $subject_alt_names->{$number}) {
              $self->set_error (-160,
!                               "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_CANNOT_LOAD_SUBJECT_ALT_NAME_PART",
                                "__NUMBER__", $number);
              return undef;
***************
*** 145,149 ****
              {
                  $self->set_error (-166,
!                                   "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_WRONG_IP",
                                    "__IP__", $value);
                  return undef;
--- 145,149 ----
              {
                  $self->set_error (-166,
!                                   "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_WRONG_IP",
                                    "__IP__", $value);
                  return undef;
***************
*** 155,159 ****
              {
                  $self->set_error (-169,
!                                   "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_WRONG_EMAIL",
                                    "__EMAIL__", $value);
                  return undef;
--- 155,159 ----
              {
                  $self->set_error (-169,
!                                   "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_WRONG_EMAIL",
                                    "__EMAIL__", $value);
                  return undef;
***************
*** 165,169 ****
          } else {
              $self->set_error (-174,
!                               "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_UNSUPPORTED_SUBJECT_ALT_NAME_TYPE",
                                "__TYPE__", $name);
              return undef;
--- 165,169 ----
          } else {
              $self->set_error (-174,
!                               "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_UNSUPPORTED_SUBJECT_ALT_NAME_TYPE",
                                "__TYPE__", $name);
              return undef;
***************
*** 173,177 ****
      }
      if (not $subject_alt_name) {
!         $self->set_error (-175, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
--- 173,177 ----
      }
      if (not $subject_alt_name) {
!         $self->set_error (-175, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_SUBJECT_ALT_NAME");
          return undef;
      }
***************
*** 182,186 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-310, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_LOA_MODE");
          return undef;
      }
--- 182,186 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-310, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_LOA_MODE");
          return undef;
      }
***************
*** 195,199 ****
             )
          {
!             $self->set_error (-315, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_LOA");
              return undef;
          }
--- 195,199 ----
             )
          {
!             $self->set_error (-315, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_LOA");
              return undef;
          }
***************
*** 208,217 ****
      if (not $dataset)
      {
!         $self->set_error (-110, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_CSR_REF");
          return undef;
      }
      if (not exists $dataset->{NUMBER})
      {
!         $self->set_error (-115, "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_CSR_REF_NUMBER");
          return undef;
      }
--- 208,217 ----
      if (not $dataset)
      {
!         $self->set_error (-110, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_CSR_REF");
          return undef;
      }
      if (not exists $dataset->{NUMBER})
      {
!         $self->set_error (-115, "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_NO_CSR_REF_NUMBER");
          return undef;
      }
***************
*** 229,233 ****
      {
          $self->set_error (-200,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_UPDATE_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 229,233 ----
      {
          $self->set_error (-200,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_UPDATE_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 236,240 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_COMPLETE_CSR_SUCCESS");
  }
  
--- 236,240 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_COMPLETE_CSR_SUCCESS");
  }
  

Index: batch_cmd_create_cert.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_create_cert.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** batch_cmd_create_cert.pm	15 Apr 2005 13:36:55 -0000	1.1
--- batch_cmd_create_cert.pm	10 Aug 2005 16:03:49 -0000	1.2
***************
*** 60,69 ****
      if (not $csr_ref)
      {
!         $self->set_error (-110, "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CERT_NO_CSR_REF");
          return undef;
      }
      if (not exists $csr_ref->{NUMBER})
      {
!         $self->set_error (-115, "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CERT_NO_CSR_REF_NUMBER");
          return undef;
      }
--- 60,69 ----
      if (not $csr_ref)
      {
!         $self->set_error (-110, "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CERT_NO_CSR_REF");
          return undef;
      }
      if (not exists $csr_ref->{NUMBER})
      {
!         $self->set_error (-115, "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CERT_NO_CSR_REF_NUMBER");
          return undef;
      }
***************
*** 76,80 ****
      {
          $self->set_error (-170,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CERT_ISSUE_CERT_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 76,80 ----
      {
          $self->set_error (-170,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CERT_ISSUE_CERT_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 83,87 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CERT_SUCCESS");
  }
  
--- 83,87 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CERT_SUCCESS");
  }
  

Index: batch_cmd_create_csr.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_create_csr.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_cmd_create_csr.pm	15 Apr 2005 13:36:55 -0000	1.2
--- batch_cmd_create_csr.pm	10 Aug 2005 16:03:49 -0000	1.3
***************
*** 60,64 ****
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_NO_TOKEN");
          return undef;
      }
--- 60,64 ----
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_NO_TOKEN");
          return undef;
      }
***************
*** 69,73 ****
      if (not $dataset)
      {
!         $self->set_error (-120, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_NO_PIN_REF");
          return undef;
      }
--- 69,73 ----
      if (not $dataset)
      {
!         $self->set_error (-120, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_NO_PIN_REF");
          return undef;
      }
***************
*** 78,87 ****
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_DECRYPT_FAILED");
          return undef;
      }
--- 78,87 ----
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_DECRYPT_FAILED");
          return undef;
      }
***************
*** 92,96 ****
      if (not $dataset)
      {
!         $self->set_error (-145, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_NO_KEY_REF");
          return undef;
      }
--- 92,96 ----
      if (not $dataset)
      {
!         $self->set_error (-145, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_NO_KEY_REF");
          return undef;
      }
***************
*** 102,106 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-150, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_CSR_NO_SUBJECT");
          return undef;
      }
--- 102,106 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-150, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_CSR_NO_SUBJECT");
          return undef;
      }
***************
*** 112,116 ****
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-160, "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CSR_NO_ROLE");
          return undef;
      }
--- 112,116 ----
      if (not $dataset or not exists $dataset->{STRING})
      {
!         $self->set_error (-160, "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CSR_NO_ROLE");
          return undef;
      }
***************
*** 126,130 ****
      {
          $self->set_error (-170,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CSR_PLAIN_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 126,130 ----
      {
          $self->set_error (-170,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CSR_PLAIN_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 140,144 ****
      {
          $self->set_error (-180,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CSR_INSERT_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 140,144 ----
      {
          $self->set_error (-180,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CSR_INSERT_CSR_FAILED",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 147,151 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_CSR_SUCCESS");
  }
  
--- 147,151 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_CSR_SUCCESS");
  }
  

Index: batch_cmd_create_key.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_create_key.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** batch_cmd_create_key.pm	15 Apr 2005 13:36:55 -0000	1.3
--- batch_cmd_create_key.pm	10 Aug 2005 16:03:49 -0000	1.4
***************
*** 61,65 ****
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_KEY_NO_TOKEN");
          return undef;
      }
--- 61,65 ----
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_KEY_NO_TOKEN");
          return undef;
      }
***************
*** 70,74 ****
      if (not $dataset)
      {
!         $self->set_error (-120, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_KEY_NO_PIN_REF");
          return undef;
      }
--- 70,74 ----
      if (not $dataset)
      {
!         $self->set_error (-120, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_KEY_NO_PIN_REF");
          return undef;
      }
***************
*** 79,88 ****
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_KEY_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "OPENCA_I18N_CMD_BATCH_CMD_CREATE_KEY_DECRYPT_FAILED");
          return undef;
      }
--- 79,88 ----
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_KEY_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "I18N_OPENCA_CMD_BATCH_CMD_CREATE_KEY_DECRYPT_FAILED");
          return undef;
      }
***************
*** 123,127 ****
      if (not $key) {
          $self->set_error (-150,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_KEY_NO_KEY",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 123,127 ----
      if (not $key) {
          $self->set_error (-150,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_KEY_NO_KEY",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 134,138 ****
      {
          $self->set_error (-160,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_KEY_DATABASE_ERROR",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 134,138 ----
      {
          $self->set_error (-160,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_KEY_DATABASE_ERROR",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 141,145 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_KEY_SUCCESS");
  }
  
--- 141,145 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_KEY_SUCCESS");
  }
  

Index: batch_cmd_create_pin.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_create_pin.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** batch_cmd_create_pin.pm	6 Apr 2005 16:07:01 -0000	1.3
--- batch_cmd_create_pin.pm	10 Aug 2005 16:03:49 -0000	1.4
***************
*** 61,65 ****
      {
          $self->set_error (-120,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_PIN_OLD_PIN_FOUND");
          return undef;
      }
--- 61,65 ----
      {
          $self->set_error (-120,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_PIN_OLD_PIN_FOUND");
          return undef;
      }
***************
*** 81,85 ****
      if (not $pin) {
          $self->set_error (-150,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_PIN_NO_PIN",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 81,85 ----
      if (not $pin) {
          $self->set_error (-150,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_PIN_NO_PIN",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 93,97 ****
      {
          $self->set_error (-160,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_PIN_DATABASE_ERROR",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
--- 93,97 ----
      {
          $self->set_error (-160,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_PIN_DATABASE_ERROR",
                            "__ERRNO__", $self->{api}->errno(),
                            "__ERRVAL__", $self->{api}->errval());
***************
*** 100,104 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_CREATE_PIN_SUCCESS");
  }
  
--- 100,104 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_CREATE_PIN_SUCCESS");
  }
  

Index: batch_cmd_enroll_pin.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_enroll_pin.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** batch_cmd_enroll_pin.pm	15 Apr 2005 13:36:55 -0000	1.1
--- batch_cmd_enroll_pin.pm	10 Aug 2005 16:03:49 -0000	1.2
***************
*** 60,64 ****
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PIN_NO_PIN");
          return undef;
      }
--- 60,64 ----
      if (not $dataset or not exists $dataset->{NUMBER})
      {
!         $self->set_error (-120, "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PIN_NO_PIN");
          return undef;
      }
***************
*** 72,76 ****
      if (not $filename)
      {
!         $self->set_error (-130, "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PIN_NO_PINFILE");
          return undef;
      }
--- 72,76 ----
      if (not $filename)
      {
!         $self->set_error (-130, "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PIN_NO_PINFILE");
          return undef;
      }
***************
*** 81,85 ****
      {
          $self->set_error (-140,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PIN_CANNOT_OPEN_PINFILE",
                            "__FILENAME__", $filename);
          return undef;
--- 81,85 ----
      {
          $self->set_error (-140,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PIN_CANNOT_OPEN_PINFILE",
                            "__FILENAME__", $filename);
          return undef;
***************
*** 89,93 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PIN_SUCCESS");
  }
  
--- 89,93 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PIN_SUCCESS");
  }
  

Index: batch_cmd_enroll_pkcs12.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-server/Server/Command/batch_cmd_enroll_pkcs12.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_cmd_enroll_pkcs12.pm	29 Jul 2005 14:02:35 -0000	1.2
--- batch_cmd_enroll_pkcs12.pm	10 Aug 2005 16:03:49 -0000	1.3
***************
*** 61,65 ****
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "OPENCA_I18N_CMD_BATCH_CMD_ENROLL_PKCS12_NO_TOKEN");
          return undef;
      }
--- 61,65 ----
      if (not $token or not ref $token or not $token->keyOnline)
      {
!         $self->set_error (-105, "I18N_OPENCA_CMD_BATCH_CMD_ENROLL_PKCS12_NO_TOKEN");
          return undef;
      }
***************
*** 70,74 ****
      if (not $dataset)
      {
!         $self->set_error (-120, "OPENCA_I18N_CMD_BATCH_CMD_ENROLL_PKCS12_NO_PIN_REF");
          return undef;
      }
--- 70,74 ----
      if (not $dataset)
      {
!         $self->set_error (-120, "I18N_OPENCA_CMD_BATCH_CMD_ENROLL_PKCS12_NO_PIN_REF");
          return undef;
      }
***************
*** 79,88 ****
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "OPENCA_I18N_CMD_BATCH_CMD_ENROLL_PKCS12_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "OPENCA_I18N_CMD_BATCH_CMD_ENROLL_PKCS12_DECRYPT_FAILED");
          return undef;
      }
--- 79,88 ----
      if (not $enc_pin->{DATA})
      {
!         $self->set_error (-130, "I18N_OPENCA_CMD_BATCH_CMD_ENROLL_PKCS12_NO_PIN");
          return undef;
      }
      my $pin = $token->decrypt (DATA => $enc_pin->{DATA});
      if (not $pin) {
!         $self->set_error (-140, "I18N_OPENCA_CMD_BATCH_CMD_ENROLL_PKCS12_DECRYPT_FAILED");
          return undef;
      }
***************
*** 92,96 ****
      if (not $key_ref)
      {
!         $self->set_error (-190, "OPENCA_I18N_API_CMD_ENROLL_PKCS12_NO_KEY_REF_FOUND");
          return undef;
      }
--- 92,96 ----
      if (not $key_ref)
      {
!         $self->set_error (-190, "I18N_OPENCA_API_CMD_ENROLL_PKCS12_NO_KEY_REF_FOUND");
          return undef;
      }
***************
*** 99,103 ****
      {
          $self->set_error (-195,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PKCS12_LOAD_KEY_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 99,103 ----
      {
          $self->set_error (-195,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PKCS12_LOAD_KEY_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 110,114 ****
      if (not $dataset)
      {
!         $self->set_error (-145, "OPENCA_I18N_API_CMD_ENROLL_PKCS12_NO_CERT_REF_FOUND");
          return undef;
      }
--- 110,114 ----
      if (not $dataset)
      {
!         $self->set_error (-145, "I18N_OPENCA_API_CMD_ENROLL_PKCS12_NO_CERT_REF_FOUND");
          return undef;
      }
***************
*** 117,121 ****
      {
          $self->set_error (-150,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PKCS12_LOAD_CERT_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
--- 117,121 ----
      {
          $self->set_error (-150,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PKCS12_LOAD_CERT_FAILED",
                            "__ERRNO__", $self->{db}->errno(),
                            "__ERRVAL__", $self->{db}->errval());
***************
*** 134,138 ****
      if (not $filename)
      {
!         $self->set_error (-155, "OPENCA_I18N_API_CMD_ENROLL_PKCS12_NO_PKCS12_DIR_FOUND");
          return undef;
      }
--- 134,138 ----
      if (not $filename)
      {
!         $self->set_error (-155, "I18N_OPENCA_API_CMD_ENROLL_PKCS12_NO_PKCS12_DIR_FOUND");
          return undef;
      }
***************
*** 156,160 ****
      {
          $self->set_error (-160,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PKCS12_DATA_CONVERT_FAILED",
                            "__ERRNO__", $self->{crypto_shell}->errno(),
                            "__ERRVAL__", $self->{crypto_shell}->errval());
--- 156,160 ----
      {
          $self->set_error (-160,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PKCS12_DATA_CONVERT_FAILED",
                            "__ERRNO__", $self->{crypto_shell}->errno(),
                            "__ERRVAL__", $self->{crypto_shell}->errval());
***************
*** 170,174 ****
      if (not $filename)
      {
!         $self->set_error (-170, "OPENCA_I18N_API_CMD_ENROLL_PKCS12_NO_PKCS12_LIST_FOUND");
          return undef;
      }
--- 170,174 ----
      if (not $filename)
      {
!         $self->set_error (-170, "I18N_OPENCA_API_CMD_ENROLL_PKCS12_NO_PKCS12_LIST_FOUND");
          return undef;
      }
***************
*** 179,183 ****
      {
          $self->set_error (-180,
!                           "OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PKCS12_CANNOT_OPEN_LIST",
                            "__FILENAME__", $filename);
          return undef;
--- 179,183 ----
      {
          $self->set_error (-180,
!                           "I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PKCS12_CANNOT_OPEN_LIST",
                            "__FILENAME__", $filename);
          return undef;
***************
*** 187,191 ****
  
      ## finished
!     return i18nGettext ("OPENCA_I18N_API_CMD_BATCH_CMD_ENROLL_PKCS12_SUCCESS");
  }
  
--- 187,191 ----
  
      ## finished
!     return i18nGettext ("I18N_OPENCA_API_CMD_BATCH_CMD_ENROLL_PKCS12_SUCCESS");
  }
  

Index: batch_do_step.pm...
 
[truncated message content]

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-pkcs7 PKCS7.pm,1.25,1.26

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-pkcs7
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257/openca-0.9/src/modules/openca-pkcs7

Modified Files:
	PKCS7.pm 
Log Message:
OPENCA_I18N ==> I18N_OPENCA


Author of changes:  michaelbell

Index: PKCS7.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-pkcs7/PKCS7.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PKCS7.pm	4 Aug 2005 14:15:38 -0000	1.25
--- PKCS7.pm	10 Aug 2005 16:03:49 -0000	1.26
***************
*** 155,159 ****
  		open(FD, "<$self->{inFile}" )
  			or return $self->set_error (7911021,
!                                                     "OPENCA_I18N_PKCS7_NEW_CANNOT_OPEN_INFILE",
                                                      "__FILENAME__", $self->{inFile});
  		while ( $tmp = <FD> ) {
--- 155,159 ----
  		open(FD, "<$self->{inFile}" )
  			or return $self->set_error (7911021,
!                                                     "I18N_OPENCA_PKCS7_NEW_CANNOT_OPEN_INFILE",
                                                      "__FILENAME__", $self->{inFile});
  		while ( $tmp = <FD> ) {
***************
*** 168,172 ****
  		open(FD, "<$self->{dataFile}" )
  			or return $self->set_error (7911023,
!                                                     "OPENCA_I18N_PKCS7_NEW_CANNOT_OPEN_DATAFILE",
                                                      "__FILENAME__", $self->{dataFile});
  		while ( $tmp = <FD> ) {
--- 168,172 ----
  		open(FD, "<$self->{dataFile}" )
  			or return $self->set_error (7911023,
!                                                     "I18N_OPENCA_PKCS7_NEW_CANNOT_OPEN_DATAFILE",
                                                      "__FILENAME__", $self->{dataFile});
  		while ( $tmp = <FD> ) {
***************
*** 181,185 ****
  		open(FD, "<$self->{inFile}" )
  			or return $self->set_error (7911025,
!                                                    "OPENCA_I18N_PKCS7_NEW_CANNOT_OPEN_INFILE",
                                                     "__FILENAME__", $self->{inFile});
  		while ( $tmp = <FD> ) {
--- 181,185 ----
  		open(FD, "<$self->{inFile}" )
  			or return $self->set_error (7911025,
!                                                    "I18N_OPENCA_PKCS7_NEW_CANNOT_OPEN_INFILE",
                                                     "__FILENAME__", $self->{inFile});
  		while ( $tmp = <FD> ) {
***************
*** 190,194 ****
  
  	return $self->set_error (7911031,
!                                  "OPENCA_I18N_PKCS7_NEW_INIT_SIGNATURE_FAILED",
                                   "__ERRNO__", $self->errno,
                                   "__ERRVAL__", $self->errval)
--- 190,194 ----
  
  	return $self->set_error (7911031,
!                                  "I18N_OPENCA_PKCS7_NEW_INIT_SIGNATURE_FAILED",
                                   "__ERRNO__", $self->errno,
                                   "__ERRVAL__", $self->errval)
***************
*** 203,209 ****
  	my $tmp;
  
! 	return $self->set_error (7912011, "OPENCA_I18N_PKCS7_INIT_SIGNATURE_MISSING_SIGNATURE")
  		if (not $self->{signature});
! 	return $self->set_error (7912012, "OPENCA_I18N_PKCS7_INIT_SIGNATURE_MISSING_DATA")
  		if (not $self->{data} and (not $self->{opaquesig}));
  
--- 203,209 ----
  	my $tmp;
  
! 	return $self->set_error (7912011, "I18N_OPENCA_PKCS7_INIT_SIGNATURE_MISSING_SIGNATURE")
  		if (not $self->{signature});
! 	return $self->set_error (7912012, "I18N_OPENCA_PKCS7_INIT_SIGNATURE_MISSING_DATA")
  		if (not $self->{data} and (not $self->{opaquesig}));
  
***************
*** 212,216 ****
  	} else {
  		return $self->set_error (7912021,
!                                          "OPENCA_I18N_PKCS7_INIT_SIGNATURE_PARSER_FAILED",
                                           "__ERRNO__", $self->errno,
                                           "__ERRVAL__", $self->errval);
--- 212,216 ----
  	} else {
  		return $self->set_error (7912021,
!                                          "I18N_OPENCA_PKCS7_INIT_SIGNATURE_PARSER_FAILED",
                                           "__ERRNO__", $self->errno,
                                           "__ERRVAL__", $self->errval);
***************
*** 245,249 ****
  
  		return $self->set_error (7921021,
!                                          "OPENCA_I18N_PKCS7_GET_PARSED_CRYPTO_ERROR",
                                           "__ERRNO__", $self->{backend}->errno(),
                                           "__ERRVAL__", $self->{backend}->errval());
--- 245,249 ----
  
  		return $self->set_error (7921021,
!                                          "I18N_OPENCA_PKCS7_GET_PARSED_CRYPTO_ERROR",
                                           "__ERRNO__", $self->{backend}->errno(),
                                           "__ERRVAL__", $self->{backend}->errval());
***************
*** 258,262 ****
  
  		return $self->set_error (7921031,
!                                          "OPENCA_I18N_PKCS7_GET_PARSED_SIGNER_ERROR",
                                           "__ERRNO__", $self->errno(),
                                           "__ERRVAL__", $self->errval());
--- 258,262 ----
  
  		return $self->set_error (7921031,
!                                          "I18N_OPENCA_PKCS7_GET_PARSED_SIGNER_ERROR",
                                           "__ERRNO__", $self->errno(),
                                           "__ERRVAL__", $self->errval());
***************
*** 275,279 ****
          {
  		return $self->set_error (7921033,
!                                          "OPENCA_I18N_PKCS7_GET_PARSED_CERTIFICATES_MISSING",
                                           "__ERRNO__", $self->{backend}->errno(),
                                           "__ERRVAL__", $self->{backend}->errval());
--- 275,279 ----
          {
  		return $self->set_error (7921033,
!                                          "I18N_OPENCA_PKCS7_GET_PARSED_CERTIFICATES_MISSING",
                                           "__ERRNO__", $self->{backend}->errno(),
                                           "__ERRVAL__", $self->{backend}->errval());
***************
*** 327,331 ****
  	my ( $tmp, $ret );
  
! 	return $self->set_error (7922011, "OPENCA_I18N_PKCS7_GET_SIGNER_PARSER_ERROR")
  		if( not $self->{parsed} );
  	return $self->{parsed}->{SIGNER};
--- 327,331 ----
  	my ( $tmp, $ret );
  
! 	return $self->set_error (7922011, "I18N_OPENCA_PKCS7_GET_SIGNER_PARSER_ERROR")
  		if( not $self->{parsed} );
  	return $self->{parsed}->{SIGNER};
***************
*** 356,360 ****
  
  	return $self->set_error (7931021,
!                                  "OPENCA_I18N_PKCS7_VERIFY_CHAIN_CRYPTO_ERROR",
  			 	 "__ERRNO__", $self->{backend}->errno(),
                                   "__ERRVAL__", $self->{backend}->errval())
--- 356,360 ----
  
  	return $self->set_error (7931021,
!                                  "I18N_OPENCA_PKCS7_VERIFY_CHAIN_CRYPTO_ERROR",
  			 	 "__ERRNO__", $self->{backend}->errno(),
                                   "__ERRVAL__", $self->{backend}->errval())
***************
*** 363,367 ****
  	## Returns if signature is not valid (verify returned an error)
  	return $self->set_error (7931022,
!                                  "OPENCA_I18N_PKCS7_VERIFY_CHAIN_UNKNOWN_CRYPTO_ERROR")
  		if( $? != 0 );
  
--- 363,367 ----
  	## Returns if signature is not valid (verify returned an error)
  	return $self->set_error (7931022,
!                                  "I18N_OPENCA_PKCS7_VERIFY_CHAIN_UNKNOWN_CRYPTO_ERROR")
  		if( $? != 0 );
  
***************
*** 369,373 ****
  		print STDERR "Error on output of openca-sv.\n$tmp\n";
  		return $self->set_error (7931031,
!                                          "OPENCA_I18N_PKCS7_VERIFY_CHAIN_SIGNER_NOT_AVAILABLE",
                                           "__ERRNO__", $self->errno(),
                                           "__ERRVAL__", $self->errval());
--- 369,373 ----
  		print STDERR "Error on output of openca-sv.\n$tmp\n";
  		return $self->set_error (7931031,
!                                          "I18N_OPENCA_PKCS7_VERIFY_CHAIN_SIGNER_NOT_AVAILABLE",
                                           "__ERRNO__", $self->errno(),
                                           "__ERRVAL__", $self->errval());
***************
*** 391,395 ****
  	
  	return $self->set_error (7932011,
!                                  "OPENCA_I18N_PKCS7_PARSE_DEPTH_MISSING_DATA")
  		if (not $data);
  
--- 391,395 ----
  	
  	return $self->set_error (7932011,
!                                  "I18N_OPENCA_PKCS7_PARSE_DEPTH_MISSING_DATA")
  		if (not $data);
  
***************
*** 402,411 ****
  		    not $self->{ignoreErrorsHash}->{20}) {
  			$self->set_error (7932021,
!                                           "OPENCA_I18N_PKCS7_PARSE_DEPTH_CHAIN_INCOMPLETE");
  			$self->setstatus(20);
  		} elsif ($line =~ /^\s*error:18:/i and
  		    not $self->{ignoreErrorsHash}->{18}) {
  		        $self->set_error (7932023,
! 					  "OPENCA_I18N_PKCS7_PARSE_DEPTH_ONLY_SELF_SIGNED_CERT");
  			$self->setstatus(18);
  		} elsif ($line =~ /^\s*error:26:/i and
--- 402,411 ----
  		    not $self->{ignoreErrorsHash}->{20}) {
  			$self->set_error (7932021,
!                                           "I18N_OPENCA_PKCS7_PARSE_DEPTH_CHAIN_INCOMPLETE");
  			$self->setstatus(20);
  		} elsif ($line =~ /^\s*error:18:/i and
  		    not $self->{ignoreErrorsHash}->{18}) {
  		        $self->set_error (7932023,
! 					  "I18N_OPENCA_PKCS7_PARSE_DEPTH_ONLY_SELF_SIGNED_CERT");
  			$self->setstatus(18);
  		} elsif ($line =~ /^\s*error:26:/i and
***************
*** 413,417 ****
  		        ## OpenCA uses CA certs to sign the role
  		        $self->set_error (7932025,
! 					  "OPENCA_I18N_PKCS7_PARSE_DEPTH_WRONG_KEYUSAGE_IN_CHAIN",
  					  "__ERRVAL__", $line);
  			$self->setstatus(26);
--- 413,417 ----
  		        ## OpenCA uses CA certs to sign the role
  		        $self->set_error (7932025,
! 					  "I18N_OPENCA_PKCS7_PARSE_DEPTH_WRONG_KEYUSAGE_IN_CHAIN",
  					  "__ERRVAL__", $line);
  			$self->setstatus(26);
***************
*** 419,423 ****
  		    not $self->{ignoreErrorsHash}->{$1}) {
  			$self->set_error (7932039,
!                                           "OPENCA_I18N_PKCS7_PARSE_DEPTH_UNKNOWN_ERROR",
                                            "__ERRVAL__", $line);
  			$self->setstatus($1);
--- 419,423 ----
  		    not $self->{ignoreErrorsHash}->{$1}) {
  			$self->set_error (7932039,
!                                           "I18N_OPENCA_PKCS7_PARSE_DEPTH_UNKNOWN_ERROR",
                                            "__ERRVAL__", $line);
  			$self->setstatus($1);
***************
*** 446,450 ****
          		$self->debug ("OpenCA::DN failed");
  			return $self->set_error (7932081, 
!                                                  "OPENCA_I18N_PKCS7_PARSE_DEPTH_OPENCA_DN_FAILED");
  			return undef;
  		}
--- 446,450 ----
          		$self->debug ("OpenCA::DN failed");
  			return $self->set_error (7932081, 
!                                                  "I18N_OPENCA_PKCS7_PARSE_DEPTH_OPENCA_DN_FAILED");
  			return undef;
  		}
***************
*** 468,472 ****
  
  	return $self->set_error (7923011,
!                                  "OPENCA_I18N_PKCS7_GET_SIGNATURE_NO_SIGNATURE")
  		if( not $self->{signature} );
  	return $self->{signature};
--- 468,472 ----
  
  	return $self->set_error (7923011,
!                                  "I18N_OPENCA_PKCS7_GET_SIGNATURE_NO_SIGNATURE")
  		if( not $self->{signature} );
  	return $self->{signature};

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-ac AC.pm,1.79,1.80

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-ac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257/openca-0.9/src/modules/openca-ac

Modified Files:
	AC.pm 
Log Message:
OPENCA_I18N ==> I18N_OPENCA


Author of changes:  michaelbell

Index: AC.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-ac/AC.pm,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** AC.pm	26 Jul 2005 16:22:40 -0000	1.79
--- AC.pm	10 Aug 2005 16:03:47 -0000	1.80
***************
*** 35,76 ****
  our %ERRHASH = (
          "" => 0,
!         "OPENCA_I18N_AC_LOAD_SESSION_CONFIG_MISSING_DIR"      => 6271009,
!         "OPENCA_I18N_AC_LOAD_SESSION_CONFIG_MISSING_LIFETIME" => 6271010,
!         "OPENCA_I18N_AC_LOAD_LOGIN_CONFIG_MISSING_TYPE"       => 6271008,
!         "OPENCA_I18N_AC_LOAD_MODULE_ID_MISSING_ID"            => 6292009,
!         "OPENCA_I18N_AC_LOAD_MODULE_ID_XML_ERROR"             => 6292010,
!         "OPENCA_I18N_AC_LOAD_ROLE_CONFIG_XML_ERROR"           => 6293005,
!         "OPENCA_I18N_AC_LOAD_OPERATION_CONFIG_XML_ERROR"      => 6294005,
!         "OPENCA_I18N_AC_LOAD_ACL_MISSING_MODE"                => 6290004,
!         "OPENCA_I18N_AC_LOAD_ACL_MODE_XML_ERROR"              => 6290005,
!         "OPENCA_I18N_AC_LOAD_ACL_WRONG_MODE"                  => 6290010,
!         "OPENCA_I18N_AC_LOAD_ACL_FILE_XML_ERROR"              => 6291004,
!         "OPENCA_I18N_AC_LOAD_ACL_MISSING_FILE"                => 6291005,
!         "OPENCA_I18N_AC_LOAD_ACL_NO_PERMISSIONS"              => 6296010,
!         "OPENCA_I18N_AC_LOAD_ACL_LIST_XML_ERROR"              => 6296011,
!         "OPENCA_I18N_AC_LOGIN_FAILED"             => 6273166,
!         "OPENCA_I18N_AC_LOGIN_UNKNOWN_ALGORITHM"  => 6273130,
!         "OPENCA_I18N_AC_LOGIN_DATABASE_XML_ERROR" => 6273170,
!         "OPENCA_I18N_AC_LOGIN_UNKNOWN_DATABASE"   => 6273180,
!         "OPENCA_I18N_AC_LOGIN_PKCS7_ERROR"        => 6273250,
!         "OPENCA_I18N_AC_LOGIN_PKCS7_STATUS"       => 6273260, 
!         "OPENCA_I18N_AC_LOGIN_UNKNOWN_TYPE"       => 6273966,
!         "OPENCA_I18N_AC_GET_CONFIG_RBAC_CMD_DIR_XML_ERROR"  => 6291024,
!         "OPENCA_I18N_AC_GET_CONFIG_RBAC_MISSING_CMD_DIR"    => 6291025,
!         "OPENCA_I18N_AC_GET_CONFIG_RBAC_CMD_FILE_XML_ERROR" => 6291049,
!         "OPENCA_I18N_AC_GET_CONFIG_RBAC_MISSING_CMD_FILE"   => 6291050,
!         "OPENCA_I18N_AC_GET_CONFIG_RBAC_WRONG_FILE"         => 6291060,
!         "OPENCA_I18N_AC_GET_ROLE_WRONG_MAP_ROLE"   => 6293010,
!         "OPENCA_I18N_AC_GET_ROLE_MISSING_ROLE"     => 6293013,
!         "OPENCA_I18N_AC_GET_ROLE_UNSUPPORTED_LOGIN_TYPE" => 6293017,
!         "OPENCA_I18N_AC_GET_ROLE_CERT_LOAD_FAILED" => 6293020,
!         "OPENCA_I18N_AC_GET_OPERATION_WRONG_MAP_OPERATION" => 6294010,
!         "OPENCA_I18N_AC_GET_OWNER_MISSING_OWNER_METHOD" => 6295010,
!         "OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CERT"     => 6295020,
!         "OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CSR"      => 6295035,
!         "OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CRR"      => 6295040,
!         "OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CRR_CERT" => 6295050,
!         "OPENCA_I18N_AC_GET_OWNER_WRONG_OWNER_METHOD"   => 6295090,
!         "OPENCA_I18N_GET_ACCESS_PERMISSION_DENIED" => 6296060,
                 );
  
--- 35,76 ----
  our %ERRHASH = (
          "" => 0,
!         "I18N_OPENCA_AC_LOAD_SESSION_CONFIG_MISSING_DIR"      => 6271009,
!         "I18N_OPENCA_AC_LOAD_SESSION_CONFIG_MISSING_LIFETIME" => 6271010,
!         "I18N_OPENCA_AC_LOAD_LOGIN_CONFIG_MISSING_TYPE"       => 6271008,
!         "I18N_OPENCA_AC_LOAD_MODULE_ID_MISSING_ID"            => 6292009,
!         "I18N_OPENCA_AC_LOAD_MODULE_ID_XML_ERROR"             => 6292010,
!         "I18N_OPENCA_AC_LOAD_ROLE_CONFIG_XML_ERROR"           => 6293005,
!         "I18N_OPENCA_AC_LOAD_OPERATION_CONFIG_XML_ERROR"      => 6294005,
!         "I18N_OPENCA_AC_LOAD_ACL_MISSING_MODE"                => 6290004,
!         "I18N_OPENCA_AC_LOAD_ACL_MODE_XML_ERROR"              => 6290005,
!         "I18N_OPENCA_AC_LOAD_ACL_WRONG_MODE"                  => 6290010,
!         "I18N_OPENCA_AC_LOAD_ACL_FILE_XML_ERROR"              => 6291004,
!         "I18N_OPENCA_AC_LOAD_ACL_MISSING_FILE"                => 6291005,
!         "I18N_OPENCA_AC_LOAD_ACL_NO_PERMISSIONS"              => 6296010,
!         "I18N_OPENCA_AC_LOAD_ACL_LIST_XML_ERROR"              => 6296011,
!         "I18N_OPENCA_AC_LOGIN_FAILED"             => 6273166,
!         "I18N_OPENCA_AC_LOGIN_UNKNOWN_ALGORITHM"  => 6273130,
!         "I18N_OPENCA_AC_LOGIN_DATABASE_XML_ERROR" => 6273170,
!         "I18N_OPENCA_AC_LOGIN_UNKNOWN_DATABASE"   => 6273180,
!         "I18N_OPENCA_AC_LOGIN_PKCS7_ERROR"        => 6273250,
!         "I18N_OPENCA_AC_LOGIN_PKCS7_STATUS"       => 6273260, 
!         "I18N_OPENCA_AC_LOGIN_UNKNOWN_TYPE"       => 6273966,
!         "I18N_OPENCA_AC_GET_CONFIG_RBAC_CMD_DIR_XML_ERROR"  => 6291024,
!         "I18N_OPENCA_AC_GET_CONFIG_RBAC_MISSING_CMD_DIR"    => 6291025,
!         "I18N_OPENCA_AC_GET_CONFIG_RBAC_CMD_FILE_XML_ERROR" => 6291049,
!         "I18N_OPENCA_AC_GET_CONFIG_RBAC_MISSING_CMD_FILE"   => 6291050,
!         "I18N_OPENCA_AC_GET_CONFIG_RBAC_WRONG_FILE"         => 6291060,
!         "I18N_OPENCA_AC_GET_ROLE_WRONG_MAP_ROLE"   => 6293010,
!         "I18N_OPENCA_AC_GET_ROLE_MISSING_ROLE"     => 6293013,
!         "I18N_OPENCA_AC_GET_ROLE_UNSUPPORTED_LOGIN_TYPE" => 6293017,
!         "I18N_OPENCA_AC_GET_ROLE_CERT_LOAD_FAILED" => 6293020,
!         "I18N_OPENCA_AC_GET_OPERATION_WRONG_MAP_OPERATION" => 6294010,
!         "I18N_OPENCA_AC_GET_OWNER_MISSING_OWNER_METHOD" => 6295010,
!         "I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CERT"     => 6295020,
!         "I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CSR"      => 6295035,
!         "I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CRR"      => 6295040,
!         "I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CRR_CERT" => 6295050,
!         "I18N_OPENCA_AC_GET_OWNER_WRONG_OWNER_METHOD"   => 6295090,
!         "I18N_OPENCA_GET_ACCESS_PERMISSION_DENIED" => 6296060,
                 );
  
***************
*** 184,188 ****
      if (not defined $self->{config}->{session}->{dir})
      {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_SESSION_CONFIG_MISSING_DIR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
--- 184,188 ----
      if (not defined $self->{config}->{session}->{dir})
      {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_SESSION_CONFIG_MISSING_DIR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
***************
*** 195,199 ****
      if (not defined $self->{config}->{session}->{lifetime})
      {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_SESSION_CONFIG_MISSING_LIFETIME",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
--- 195,199 ----
      if (not defined $self->{config}->{session}->{lifetime})
      {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_SESSION_CONFIG_MISSING_LIFETIME",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
***************
*** 217,221 ****
      ## do not accept an empty list
      if (not defined $all) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_LOGIN_CONFIG_TYPE_FAILED",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
--- 217,221 ----
      ## do not accept an empty list
      if (not defined $all) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_LOGIN_CONFIG_TYPE_FAILED",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
***************
*** 223,227 ****
      }
      if (not $all) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_LOGIN_CONFIG_NO_TYPES");
          return undef;
      }
--- 223,227 ----
      }
      if (not $all) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_LOGIN_CONFIG_NO_TYPES");
          return undef;
      }
***************
*** 240,244 ****
      $self->{acl}->{server_id} = $self->{api}->get_required ("ServerID");
      if (not defined $self->{acl}->{server_id}) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_MODULE_ID_MISSING_ID",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
--- 240,244 ----
      $self->{acl}->{server_id} = $self->{api}->get_required ("ServerID");
      if (not defined $self->{acl}->{server_id}) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_MODULE_ID_MISSING_ID",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
***************
*** 246,250 ****
      } elsif (not $self->{acl}->{server_id} and
               $self->{acl}->{server_id} != 0) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_MODULE_ID_UNKNOWN_ERROR");
          return undef;
      }
--- 246,250 ----
      } elsif (not $self->{acl}->{server_id} and
               $self->{acl}->{server_id} != 0) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_MODULE_ID_UNKNOWN_ERROR");
          return undef;
      }
***************
*** 266,270 ****
                                      XPATH    => 'access_control/acl_config/map_role');
      if (not $self->{acl}->{map_role}) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ROLE_CONFIG_XML_ERROR");
          return undef;
      }
--- 266,270 ----
                                      XPATH    => 'access_control/acl_config/map_role');
      if (not $self->{acl}->{map_role}) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ROLE_CONFIG_XML_ERROR");
          return undef;
      }
***************
*** 283,287 ****
                                      XPATH    => 'access_control/acl_config/map_operation');
      if (not $self->{acl}->{map_operation}) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_OPERATION_CONFIG_XML_ERROR");
          return undef;
      }
--- 283,287 ----
                                      XPATH    => 'access_control/acl_config/map_operation');
      if (not $self->{acl}->{map_operation}) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_OPERATION_CONFIG_XML_ERROR");
          return undef;
      }
***************
*** 302,316 ****
      if (not defined $acl_mode)
      {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_MISSING_MODE",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
          return undef;
      } elsif (not $acl_mode) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_MODE_XML_ERROR");
          return undef;
      } elsif ( $acl_mode =~ /^no$/i) {
          return 1;
      } elsif ( $acl_mode !~ /^yes$/i) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_WRONG_MODE");
          return undef;
      } ## else is an activated ACL
--- 302,316 ----
      if (not defined $acl_mode)
      {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_MISSING_MODE",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
          return undef;
      } elsif (not $acl_mode) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_MODE_XML_ERROR");
          return undef;
      } elsif ( $acl_mode =~ /^no$/i) {
          return 1;
      } elsif ( $acl_mode !~ /^yes$/i) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_WRONG_MODE");
          return undef;
      } ## else is an activated ACL
***************
*** 323,332 ****
      if (not defined $self->{acl_file})
      {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_FILE_XML_ERROR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
          return undef;
      } elsif (not $self->{acl_file}) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_MISSING_FILE");
          return undef;
      }
--- 323,332 ----
      if (not defined $self->{acl_file})
      {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_FILE_XML_ERROR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
          return undef;
      } elsif (not $self->{acl_file}) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_MISSING_FILE");
          return undef;
      }
***************
*** 341,345 ****
  
      if (not defined $all) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_LIST_XML_ERROR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
--- 341,345 ----
  
      if (not defined $all) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_LIST_XML_ERROR",
                             "__ERRNO__", $self->{cache}->errno(),
                             "__ERRVAL__", $self->{cache}->errval());
***************
*** 347,351 ****
      }
      if (not $all) {
!         $self->set_error ("OPENCA_I18N_AC_LOAD_ACL_NO_PERMISSIONS");
          return undef;
      }
--- 347,351 ----
      }
      if (not $all) {
!         $self->set_error ("I18N_OPENCA_AC_LOAD_ACL_NO_PERMISSIONS");
          return undef;
      }
***************
*** 619,623 ****
  		
              if ($? != 0) {
! 		    $self->set_error ("OPENCA_I18N_AC_LOGIN_FAILED");
                      $self->{api}->log (FACILITY => "auth",
                                  PRIORITY => "warn",
--- 619,623 ----
  		
              if ($? != 0) {
! 		    $self->set_error ("I18N_OPENCA_AC_LOGIN_FAILED");
                      $self->{api}->log (FACILITY => "auth",
                                  PRIORITY => "warn",
***************
*** 663,667 ****
                  ($name ne $self->{ident}->{name}))
              {
!                 $self->set_error ("OPENCA_I18N_AC_LOGIN_FAILED");
                  $self->{api}->log (FACILITY => "auth",
                              PRIORITY => "warn",
--- 663,667 ----
                  ($name ne $self->{ident}->{name}))
              {
!                 $self->set_error ("I18N_OPENCA_AC_LOGIN_FAILED");
                  $self->{api}->log (FACILITY => "auth",
                              PRIORITY => "warn",
***************
*** 700,704 ****
                  $self->{ident}->{digest} = crypt ($passwd, $digest);
              } else {
!                 $self->set_error ("OPENCA_I18N_AC_LOGIN_UNKNOWN_ALGORITHM");
                  $self->{api}->log (FACILITY => "auth",
                              PRIORITY => "warn",
--- 700,704 ----
                  $self->{ident}->{digest} = crypt ($passwd, $digest);
              } else {
!                 $self->set_error ("I18N_OPENCA_AC_LOGIN_UNKNOWN_ALGORITHM");
                  $self->{api}->log (FACILITY => "auth",
                              PRIORITY => "warn",
***************
*** 723,727 ****
                                          "\nlogintype::=".$self->{ident}->{type}.
                                          "\nsession::=".$self->{session}->getID());
!                 $self->set_error ("OPENCA_I18N_AC_LOGIN_FAILED");
                  return undef;
              }
--- 723,727 ----
                                          "\nlogintype::=".$self->{ident}->{type}.
                                          "\nsession::=".$self->{session}->getID());
!                 $self->set_error ("I18N_OPENCA_AC_LOGIN_FAILED");
                  return undef;
              }
***************
*** 730,734 ****
                                   XPATH    => 'access_control/login/database'))
          {
!             $self->set_error ("OPENCA_I18N_AC_LOGIN_DATABASE_XML_ERROR",
                                 "__ERRNO__", $self->{cache}->errno(),
                                 "__ERRVAL__", $self->{cache}->errval());
--- 730,734 ----
                                   XPATH    => 'access_control/login/database'))
          {
!             $self->set_error ("I18N_OPENCA_AC_LOGIN_DATABASE_XML_ERROR",
                                 "__ERRNO__", $self->{cache}->errno(),
                                 "__ERRVAL__", $self->{cache}->errval());
***************
*** 740,744 ****
              return undef;
          } else {
!             $self->set_error ("OPENCA_I18N_AC_LOGIN_UNKNOWN_DATABASE");
              $self->{api}->log (FACILITY => "auth",
                          PRIORITY => "error",
--- 740,744 ----
              return undef;
          } else {
!             $self->set_error ("I18N_OPENCA_AC_LOGIN_UNKNOWN_DATABASE");
              $self->{api}->log (FACILITY => "auth",
                          PRIORITY => "error",
***************
*** 767,771 ****
          if (not $sig) {
              $self->stop_session();
!             $self->set_error ("OPENCA_I18N_AC_LOGIN_PKCS7_ERROR",
                                 "__ERRNO__", $OpenCA::PKCS7::errno,
                                 "__ERRVAL__", $OpenCA::PKCS7::errval);
--- 767,771 ----
          if (not $sig) {
              $self->stop_session();
!             $self->set_error ("I18N_OPENCA_AC_LOGIN_PKCS7_ERROR",
                                 "__ERRNO__", $OpenCA::PKCS7::errno,
                                 "__ERRVAL__", $OpenCA::PKCS7::errval);
***************
*** 780,784 ****
          if( $sig->status() != 0 ) {
              $self->stop_session();
!             $self->set_error ("OPENCA_I18N_AC_LOGIN_PKCS7_STATUS",
                                 "__ERRNO__", $OpenCA::PKCS7::errno,
                                 "__ERRVAL__", $OpenCA::PKCS7::errval);
--- 780,784 ----
          if( $sig->status() != 0 ) {
              $self->stop_session();
!             $self->set_error ("I18N_OPENCA_AC_LOGIN_PKCS7_STATUS",
                                 "__ERRNO__", $OpenCA::PKCS7::errno,
                                 "__ERRVAL__", $OpenCA::PKCS7::errval);
***************
*** 796,800 ****
  
      } else {
!         $self->set_error ("OPENCA_I18N_AC_LOGIN_UNKNOWN_TYPE",
                            "__TYPE__", $self->{ident}->{type});
          $self->{api}->log (FACILITY => "auth",
--- 796,800 ----
  
      } else {
!         $self->set_error ("I18N_OPENCA_AC_LOGIN_UNKNOWN_TYPE",
                            "__TYPE__", $self->{ident}->{type});
          $self->{api}->log (FACILITY => "auth",
***************
*** 904,908 ****
          return $self->{acl}->{role};
      } elsif ($self->{acl}->{map_role} !~ /^yes$/i) {
!         $self->set_error ("OPENCA_I18N_AC_GET_ROLE_WRONG_MAP_ROLE");
          return undef;
      } ## else --> we map the user to a role
--- 904,908 ----
          return $self->{acl}->{role};
      } elsif ($self->{acl}->{map_role} !~ /^yes$/i) {
!         $self->set_error ("I18N_OPENCA_AC_GET_ROLE_WRONG_MAP_ROLE");
          return undef;
      } ## else --> we map the user to a role
***************
*** 919,923 ****
          if (not $self->{ident}->{role})
          {
!             $self->set_error ("OPENCA_I18N_AC_GET_ROLE_MISSING_ROLE");
              return undef;
          } else {
--- 919,923 ----
          if (not $self->{ident}->{role})
          {
!             $self->set_error ("I18N_OPENCA_AC_GET_ROLE_MISSING_ROLE");
              return undef;
          } else {
***************
*** 930,934 ****
      ## this requires that ident performs a x509 identification
      if ($self->{ident}->{type} eq "x509") {
!         $self->set_error ("OPENCA_I18N_AC_GET_ROLE_UNSUPPORTED_LOGIN_TYPE");
          return undef;
      }
--- 930,934 ----
      ## this requires that ident performs a x509 identification
      if ($self->{ident}->{type} eq "x509") {
!         $self->set_error ("I18N_OPENCA_AC_GET_ROLE_UNSUPPORTED_LOGIN_TYPE");
          return undef;
      }
***************
*** 940,944 ****
                                   MODE    => "OBJECT");
      if (not $cert) {
!         $self->set_error ("OPENCA_I18N_AC_GET_ROLE_CERT_LOAD_FAILED",
                             "__SUBJECT__", $self->{ident}->{name});
          return undef;
--- 940,944 ----
                                   MODE    => "OBJECT");
      if (not $cert) {
!         $self->set_error ("I18N_OPENCA_AC_GET_ROLE_CERT_LOAD_FAILED",
                             "__SUBJECT__", $self->{ident}->{name});
          return undef;
***************
*** 960,964 ****
      if (not $cmd)
      {
!         $self->set_error ("OPENCA_I18N_AC_GET_OPERATION_MISSING_CMD");
          return undef;
      }
--- 960,964 ----
      if (not $cmd)
      {
!         $self->set_error ("I18N_OPENCA_AC_GET_OPERATION_MISSING_CMD");
          return undef;
      }
***************
*** 968,972 ****
          $self->{acl}->{operation} = $cmd;
      } elsif ($self->{acl}->{map_operation} !~ /^yes$/i) {
!         $self->set_error ("OPENCA_I18N_AC_GET_OPERATION_WRONG_MAP_OPERATION");
          return undef;
      } else {
--- 968,972 ----
          $self->{acl}->{operation} = $cmd;
      } elsif ($self->{acl}->{map_operation} !~ /^yes$/i) {
!         $self->set_error ("I18N_OPENCA_AC_GET_OPERATION_WRONG_MAP_OPERATION");
          return undef;
      } else {
***************
*** 976,980 ****
          if ($@)
          {
!             $self->set_error ("OPENCA_I18N_AC_GET_OPERATION_DAMAGED_COMMAND",
                                "__COMMAND__", $cmd,
                                "__ERRVAL__", $@);
--- 976,980 ----
          if ($@)
          {
!             $self->set_error ("I18N_OPENCA_AC_GET_OPERATION_DAMAGED_COMMAND",
                                "__COMMAND__", $cmd,
                                "__ERRVAL__", $@);
***************
*** 983,987 ****
          if (not $self->{acl}->{operation})
          {
!             $self->set_error ("OPENCA_I18N_AC_GET_OPERATION_MISSING_OPERATION",
                                "__COMMAND__", $cmd);
              return undef;
--- 983,987 ----
          if (not $self->{acl}->{operation})
          {
!             $self->set_error ("I18N_OPENCA_AC_GET_OPERATION_MISSING_OPERATION",
                                "__COMMAND__", $cmd);
              return undef;
***************
*** 1001,1005 ****
      if ($@)
      {
!         $self->set_error ("OPENCA_I18N_AC_GET_OWNER_DAMAGED_COMMAND",
                            "__COMMAND__", $cmd,
                            "__ERRVAL__", $@);
--- 1001,1005 ----
      if ($@)
      {
!         $self->set_error ("I18N_OPENCA_AC_GET_OWNER_DAMAGED_COMMAND",
                            "__COMMAND__", $cmd,
                            "__ERRVAL__", $@);
***************
*** 1029,1033 ****
                                       MODE  => "OBJECT");
          if (not $cert) {
!             $self->set_error ("OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CERT",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
--- 1029,1033 ----
                                       MODE  => "OBJECT");
          if (not $cert) {
!             $self->set_error ("I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CERT",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
***************
*** 1045,1049 ****
                                       MODE  => "OBJECT" );
          if (not $csr) {
!             $self->set_error ("OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CSR",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
--- 1045,1049 ----
                                       MODE  => "OBJECT" );
          if (not $csr) {
!             $self->set_error ("I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CSR",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
***************
*** 1055,1059 ****
                                       MODE  => "OBJECT" );
          if (not $csr) {
!             $self->set_error ("OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CRR",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
--- 1055,1059 ----
                                       MODE  => "OBJECT" );
          if (not $csr) {
!             $self->set_error ("I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CRR",
                                "__KEY__", $self->{PARAMS}->{KEY});
              return undef;
***************
*** 1064,1068 ****
                                       MODE  => "OBJECT");
          if (not $cert) {
!             $self->set_error ("OPENCA_I18N_AC_GET_OWNER_CANNOT_LOAD_CRR_CERT",
                                 "__KEY__", $csr->getParsed()->{REVOKE_CERTIFICATE_SERIAL});
              return undef;
--- 1064,1068 ----
                                       MODE  => "OBJECT");
          if (not $cert) {
!             $self->set_error ("I18N_OPENCA_AC_GET_OWNER_CANNOT_LOAD_CRR_CERT",
                                 "__KEY__", $csr->getParsed()->{REVOKE_CERTIFICATE_SERIAL});
              return undef;
***************
*** 1072,1076 ****
          $self->{acl}->{owner} = $self->{PARAMS}->{ROLE};
      } else {
!         $self->set_error ("OPENCA_I18N_AC_GET_OWNER_WRONG_OWNER_METHOD",
                            "__METHOD__", $self->{acl}->{owner_method},
                            "__CMD__", $self->{acl}->{cmd});
--- 1072,1076 ----
          $self->{acl}->{owner} = $self->{PARAMS}->{ROLE};
      } else {
!         $self->set_error ("I18N_OPENCA_AC_GET_OWNER_WRONG_OWNER_METHOD",
                            "__METHOD__", $self->{acl}->{owner_method},
                            "__CMD__", $self->{acl}->{cmd});
***************
*** 1110,1114 ****
          ## a simple permission denied for the caller is enough
  	## $self->stop_session();
!         $self->set_error ("OPENCA_I18N_GET_ACCESS_PERMISSION_DENIED");
          return undef;
      }
--- 1110,1114 ----
          ## a simple permission denied for the caller is enough
  	## $self->stop_session();
!         $self->set_error ("I18N_OPENCA_GET_ACCESS_PERMISSION_DENIED");
          return undef;
      }

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-openssl/OpenSSL SMIME.pm,1.14,1.15

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-openssl/OpenSSL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257/openca-0.9/src/modules/openca-openssl/OpenSSL

Modified Files:
	SMIME.pm 
Log Message:
OPENCA_I18N ==> I18N_OPENCA


Author of changes:  michaelbell

Index: SMIME.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-openssl/OpenSSL/SMIME.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SMIME.pm	28 Feb 2005 08:33:37 -0000	1.14
--- SMIME.pm	10 Aug 2005 16:03:49 -0000	1.15
***************
*** 90,103 ****
  	if(ref($data) && ref($data) eq 'GLOB') {
  		while(<$data>) {
! 			return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SAVE_TMP_WRITE_FAILED")
  				unless($tfh->print($_));
  		}
  	} else {
! 		return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SAVE_TMP_WRITE_FAILED")
  			unless($tfh->print($data));
  	}
  
  	return ($tfh, $tf) if(wantarray);
! 	return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SVAE_TMP_CLOSE_FAILED")
  		unless($tfh->close);
  	return $tf;
--- 90,103 ----
  	if(ref($data) && ref($data) eq 'GLOB') {
  		while(<$data>) {
! 			return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SAVE_TMP_WRITE_FAILED")
  				unless($tfh->print($_));
  		}
  	} else {
! 		return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SAVE_TMP_WRITE_FAILED")
  			unless($tfh->print($data));
  	}
  
  	return ($tfh, $tf) if(wantarray);
! 	return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SVAE_TMP_CLOSE_FAILED")
  		unless($tfh->close);
  	return $tf;
***************
*** 112,119 ****
  		$parser->output_under($self->{tmpDir});
  		$self->{entity} = $parser->parse_open($self->{file})
! 			or return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SYNC_DATA_PARSER_FAILED");
  		undef($parser);
  		
! 		return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SYNC_DATA_ENTITY_FAILED")
  			unless($self->{entity});
  
--- 112,119 ----
  		$parser->output_under($self->{tmpDir});
  		$self->{entity} = $parser->parse_open($self->{file})
! 			or return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SYNC_DATA_PARSER_FAILED");
  		undef($parser);
  		
! 		return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SYNC_DATA_ENTITY_FAILED")
  			unless($self->{entity});
  
***************
*** 122,128 ****
  		my($fh, $f) = $self->_save_tmp("") or return(undef);
  		$self->{entity}->print($fh)
! 			or return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SYNC_DATA_SAVE_FAILED");
  		$fh->close
! 			or return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SYNC_DATA_CLOSE_FAILED");
  		$self->{file} = $f;
  	}
--- 122,128 ----
  		my($fh, $f) = $self->_save_tmp("") or return(undef);
  		$self->{entity}->print($fh)
! 			or return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SYNC_DATA_SAVE_FAILED");
  		$fh->close
! 			or return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SYNC_DATA_CLOSE_FAILED");
  		$self->{file} = $f;
  	}
***************
*** 225,229 ****
  	my($modified);
  
! 	return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_STRIP_HEADERS_MISSING_ENTITY")
              unless ($self->{entity});
  
--- 225,229 ----
  	my($modified);
  
! 	return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_STRIP_HEADERS_MISSING_ENTITY")
              unless ($self->{entity});
  
***************
*** 272,278 ****
  	$self->set_params( @_ ) or return(undef);
  
! 	return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_NEW_MISSING_BACKEND")
  		unless($self->{backend});
! 	return $self->_set_error("OPENCA_I18N_OPENSSL_SMIME_NEW_WRONG_BACKEND")
  		unless(ref($self->{backend}));
  
--- 272,278 ----
  	$self->set_params( @_ ) or return(undef);
  
! 	return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_NEW_MISSING_BACKEND")
  		unless($self->{backend});
! 	return $self->_set_error("I18N_OPENCA_OPENSSL_SMIME_NEW_WRONG_BACKEND")
  		unless(ref($self->{backend}));
  
***************
*** 299,308 ****
  	# Check and save CA_CERTS
  	if($params->{CA_CERTS}) {
! 		return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SET_PARAMS_NO_CA_CERTS_ARRAY")
  			unless(ref($params->{CA_CERTS}) eq 'ARRAY');
  
  		my($data);
  		foreach(@{$params->{CA_CERTS}}) {
! 			return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SET_PARAMS_WRONG_CA_CERT")
  				unless(ref($_) && $_->getPEM());
  			$self->{ca_certs}->{$_->getParsed()->{DN}} = $_;
--- 299,308 ----
  	# Check and save CA_CERTS
  	if($params->{CA_CERTS}) {
! 		return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SET_PARAMS_NO_CA_CERTS_ARRAY")
  			unless(ref($params->{CA_CERTS}) eq 'ARRAY');
  
  		my($data);
  		foreach(@{$params->{CA_CERTS}}) {
! 			return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SET_PARAMS_WRONG_CA_CERT")
  				unless(ref($_) && $_->getPEM());
  			$self->{ca_certs}->{$_->getParsed()->{DN}} = $_;
***************
*** 315,319 ****
  	if($params->{ENTITY}) {
  
! 		return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SET_PARAMS_WRONG_ENTITY")
  			unless(ref($params->{ENTITY}));
  
--- 315,319 ----
  	if($params->{ENTITY}) {
  
! 		return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SET_PARAMS_WRONG_ENTITY")
  			unless(ref($params->{ENTITY}));
  
***************
*** 332,336 ****
  				or return(undef);
  		} else {
! 			return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SET_PARAMS_WRONG_DATA");
  		}
  
--- 332,336 ----
  				or return(undef);
  		} else {
! 			return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SET_PARAMS_WRONG_DATA");
  		}
  
***************
*** 347,351 ****
  
  	} elsif(! $self->{file} || ! $self->{entity}) {
! 		return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_SET_PARAMS_MISSING_DATA_SOURCE");
  	}
  
--- 347,351 ----
  
  	} elsif(! $self->{file} || ! $self->{entity}) {
! 		return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_SET_PARAMS_MISSING_DATA_SOURCE");
  	}
  
***************
*** 370,380 ****
  	my($certfile, $keyfile, $cafile, $oldentity, $oldfile, $oldhead);
  
! 	return ($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_MISSING_CERT"))
              unless($params{CERTIFICATE});
  
! 	return ($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
  
! 	return ($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_MISSING_PRIVATE_KEY"))
              unless($params{PRIVATE_KEY});
  
--- 370,380 ----
  	my($certfile, $keyfile, $cafile, $oldentity, $oldfile, $oldhead);
  
! 	return ($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_MISSING_CERT"))
              unless($params{CERTIFICATE});
  
! 	return ($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
  
! 	return ($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_MISSING_PRIVATE_KEY"))
              unless($params{PRIVATE_KEY});
  
***************
*** 415,422 ****
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_DUP_HEADER_FAILED"));
  	}
  	$oldentity = $self->{entity}->dup()
! 		or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_DUP_ENTITY_FAILED"));
  	$oldfile = $self->{file};
  
--- 415,422 ----
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_DUP_HEADER_FAILED"));
  	}
  	$oldentity = $self->{entity}->dup()
! 		or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_DUP_ENTITY_FAILED"));
  	$oldfile = $self->{file};
  
***************
*** 476,480 ****
  			$self->{file} = $oldfile;
  		}
! 		return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_SIGN_UNKNOWN_PROBLEM",
                                          "__ERRVAL__", $res));
  	}
--- 476,480 ----
  			$self->{file} = $oldfile;
  		}
! 		return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_SIGN_UNKNOWN_PROBLEM",
                                          "__ERRVAL__", $res));
  	}
***************
*** 499,507 ****
  	# Check parameters
  	unless(! $params{CERTIFICATE} || ref($params{CERTIFICATE})) {
! 		return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_WRONG_CERTIFICATE"));
  	}
  
  	unless($params{CERTIFICATE} || $params{USES_EMBEDDED_CERT}) {
! 		return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_MISSING_CERTS"));
  	}
  
--- 499,507 ----
  	# Check parameters
  	unless(! $params{CERTIFICATE} || ref($params{CERTIFICATE})) {
! 		return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_WRONG_CERTIFICATE"));
  	}
  
  	unless($params{CERTIFICATE} || $params{USES_EMBEDDED_CERT}) {
! 		return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_MISSING_CERTS"));
  	}
  
***************
*** 520,524 ****
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_DUP_HEADER_FAILED"));
  	}
  
--- 520,524 ----
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_DUP_HEADER_FAILED"));
  	}
  
***************
*** 582,590 ****
  			$self->_set_status(1105, 'corrupted message');
  		} elsif($res =~ /:no content type:/) {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_INVALID_MIME_STREAM"));
  		} elsif($res =~ /:No such file or directory:/) {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_MISSING_FILE"));
  		} else {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_VERIFY_UNKNOWN_ERROR",
                                                  "__ERRVAL__", $res));
  		}
--- 582,590 ----
  			$self->_set_status(1105, 'corrupted message');
  		} elsif($res =~ /:no content type:/) {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_INVALID_MIME_STREAM"));
  		} elsif($res =~ /:No such file or directory:/) {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_MISSING_FILE"));
  		} else {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_VERIFY_UNKNOWN_ERROR",
                                                  "__ERRVAL__", $res));
  		}
***************
*** 607,618 ****
  	my($certfile, $oldentity, $oldfile, $oldhead, $cipher);
  
! 	return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_MISSING_CERT"))
              unless($params{CERTIFICATE});
! 	return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
  
  	# Default for cipher, check correctness.
  	$cipher = lc($params{CIPHER} || $Ciphers[0]);
! 	return ($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_WRONG_CIPHER",
                                  "__CIPHER__", $cipher))
  	    unless(grep({ $_ eq $cipher } @Ciphers));
--- 607,618 ----
  	my($certfile, $oldentity, $oldfile, $oldhead, $cipher);
  
! 	return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_MISSING_CERT"))
              unless($params{CERTIFICATE});
! 	return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
  
  	# Default for cipher, check correctness.
  	$cipher = lc($params{CIPHER} || $Ciphers[0]);
! 	return ($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_WRONG_CIPHER",
                                  "__CIPHER__", $cipher))
  	    unless(grep({ $_ eq $cipher } @Ciphers));
***************
*** 631,638 ****
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_DUP_HEADER_FAILED"));
  	}
  	$oldentity = $self->{entity}->dup()
! 		or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_DUP_ENTITY_FAILED"));
  	$oldfile = $self->{file};
  
--- 631,638 ----
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_DUP_HEADER_FAILED"));
  	}
  	$oldentity = $self->{entity}->dup()
! 		or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_DUP_ENTITY_FAILED"));
  	$oldfile = $self->{file};
  
***************
*** 681,685 ****
                      $res = $self->errval;
                  }
! 		return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_ENCRYPT_UNKNOWN_PROBLEM",
  		                        "__ERRNO__", $ec,
                                          "__ERRVAL__", $res));
--- 681,685 ----
                      $res = $self->errval;
                  }
! 		return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_ENCRYPT_UNKNOWN_PROBLEM",
  		                        "__ERRNO__", $ec,
                                          "__ERRVAL__", $res));
***************
*** 700,708 ****
  	$self->_set_status(0, "");
  
! 	return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_MISSING_CERT"))
              unless($params{CERTIFICATE});
! 	return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
! 	return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_MISSING_PRIVATE_KEY"))
              unless($params{PRIVATE_KEY});
  
--- 700,708 ----
  	$self->_set_status(0, "");
  
! 	return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_MISSING_CERT"))
              unless($params{CERTIFICATE});
! 	return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_WRONG_CERT"))
              unless(ref($params{CERTIFICATE}));
! 	return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_MISSING_PRIVATE_KEY"))
              unless($params{PRIVATE_KEY});
  
***************
*** 724,728 ****
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_DUP_HEADER_FAILED"));
  	}
  
--- 724,728 ----
  	if($self->{headers_cache}) {
  		$oldhead = $self->{headers_cache}->dup()
! 			or return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_DUP_HEADER_FAILED"));
  	}
  
***************
*** 774,782 ****
  			$self->_set_status(1301, 'this certificate can\'t decrypt this message');
  		} elsif($res =~ /:no content type:/) {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_INVALID_MIME_STREAM"));
  		} elsif($res =~ /:No such file or directory:/) {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_MISSING_FILE"));
  		} else {
! 			return($self->set_error("OPENCA_I18N_OPENSSL_SMIME_DECRYPT_UNKNOWN_ERROR",
                                                  "__ERRVAL__", $res));
  		}
--- 774,782 ----
  			$self->_set_status(1301, 'this certificate can\'t decrypt this message');
  		} elsif($res =~ /:no content type:/) {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_INVALID_MIME_STREAM"));
  		} elsif($res =~ /:No such file or directory:/) {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_MISSING_FILE"));
  		} else {
! 			return($self->set_error("I18N_OPENCA_OPENSSL_SMIME_DECRYPT_UNKNOWN_ERROR",
                                                  "__ERRVAL__", $res));
  		}
***************
*** 836,842 ****
  	($tfh, $newf) = $self->_save_tmp("") or return(undef);
  	$self->{entity}->print($tfh)
! 		or return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_GET_MIME_SAVE_ERROR");
  	$tfh->close
! 		or return $self->set_error("OPENCA_I18N_OPENSSL_SMIME_GET_MIME_CLOSE_ERROR");
  	return($newe, $newf);
  }
--- 836,842 ----
  	($tfh, $newf) = $self->_save_tmp("") or return(undef);
  	$self->{entity}->print($tfh)
! 		or return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_GET_MIME_SAVE_ERROR");
  	$tfh->close
! 		or return $self->set_error("I18N_OPENCA_OPENSSL_SMIME_GET_MIME_CLOSE_ERROR");
  	return($newe, $newf);
  }

[openca-cvsdev] CVS: openca-0.9/src/modules/openca-dbi DBI.pm,1.160,1.161

[<ope...@li...>]

Update of /cvsroot/openca/openca-0.9/src/modules/openca-dbi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13257/openca-0.9/src/modules/openca-dbi

Modified Files:
	DBI.pm 
Log Message:
OPENCA_I18N ==> I18N_OPENCA


Author of changes:  michaelbell

Index: DBI.pm
===================================================================
RCS file: /cvsroot/openca/openca-0.9/src/modules/openca-dbi/DBI.pm,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** DBI.pm	1 Aug 2005 15:41:14 -0000	1.160
--- DBI.pm	10 Aug 2005 16:03:47 -0000	1.161
***************
*** 65,74 ****
    if (not $self->{crypto})
    {
!     $self->set_error ("OPENCA_I18N_DBI_MISSING_BACKEND");
      return undef;
    }
    if (not $self->{api})
    {
!     $self->set_error ("OPENCA_I18N_DBI_MISSING_API");
      return undef;
    }
--- 65,74 ----
    if (not $self->{crypto})
    {
!     $self->set_error ("I18N_OPENCA_DBI_MISSING_BACKEND");
      return undef;
    }
    if (not $self->{api})
    {
!     $self->set_error ("I18N_OPENCA_DBI_MISSING_API");
      return undef;
    }