/[winpt]/trunk/Src/wptKeygenDlg.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeygenDlg.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 187 by twoaday, Wed Mar 22 11:04:20 2006 UTC revision 190 by twoaday, Mon Mar 27 10:05:14 2006 UTC
# Line 427  keygen_dlg_proc (HWND dlg, UINT msg, WPA Line 427  keygen_dlg_proc (HWND dlg, UINT msg, WPA
427                  return FALSE;                  return FALSE;
428              }              }
429              if (!GetDlgItemText (dlg, IDC_KEYGEN_EMAIL, email, sizeof (email) -1)              if (!GetDlgItemText (dlg, IDC_KEYGEN_EMAIL, email, sizeof (email) -1)
430                  || !strchr (email, '@')) {                  || check_email_address (email)) {
431                  msg_box (dlg, _("Please enter a valid email address."),                  msg_box (dlg, _("Please enter a valid email address."),
432                           _("Key Generation"), MB_ERR);                           _("Key Generation"), MB_ERR);
433                  return FALSE;                  return FALSE;
# Line 472  keygen_dlg_proc (HWND dlg, UINT msg, WPA Line 472  keygen_dlg_proc (HWND dlg, UINT msg, WPA
472                  char *utf8_name, *utf8_comment;                  char *utf8_name, *utf8_comment;
473                  utf8_name = native_to_utf8 (name);                  utf8_name = native_to_utf8 (name);
474                  utf8_comment = native_to_utf8 (comment);                  utf8_comment = native_to_utf8 (comment);
475                  if (!utf8_name || !utf8_comment)                  if( !utf8_name || !utf8_comment )
476                      BUG (0);                      BUG (0);
477                  p = gpg_genkey_params (keytype, bits, utf8_name, utf8_comment,                  p = gpg_genkey_params (keytype, bits, utf8_name, utf8_comment,
478                                         email, expire, pwd);                                         email, expire, pwd);
# Line 572  keygen_wizard_dlg_proc (HWND dlg, UINT m Line 572  keygen_wizard_dlg_proc (HWND dlg, UINT m
572                           _("Key Generation Wizard"), MB_WARN);                           _("Key Generation Wizard"), MB_WARN);
573                  return FALSE;                  return FALSE;
574              }              }
575              if( !GetDlgItemText( dlg, IDC_KEYWIZARD_EMAIL, email, sizeof email-1 )              if (!GetDlgItemText(dlg, IDC_KEYWIZARD_EMAIL, email, sizeof email-1 )
576                  || !strchr( email, '@' ) ) {                  || check_email_address (email)) {
577                  msg_box( dlg, _("Please enter a valid email address."),                  msg_box (dlg, _("Please enter a valid email address."),
578                           _("Key Generation Wizard"), MB_ERR );                           _("Key Generation Wizard"), MB_ERR);
579                  return FALSE;                  return FALSE;
580              }              }
581              if (strchr (email, '<') || strchr (email, '>')) {              if (strchr (email, '<') || strchr (email, '>')) {
# Line 587  keygen_wizard_dlg_proc (HWND dlg, UINT m Line 587  keygen_wizard_dlg_proc (HWND dlg, UINT m
587              if (cancel)              if (cancel)
588                  return FALSE;                  return FALSE;
589              utf8_name = native_to_utf8 (name);              utf8_name = native_to_utf8 (name);
590              if( !utf8_name )              if (!utf8_name)
591                  BUG( NULL );                  BUG (0);
592              if (IsDlgButtonChecked (dlg, IDC_KEYWIZARD_USERSA))              if (IsDlgButtonChecked (dlg, IDC_KEYWIZARD_USERSA))
593                  pubkey_algo = GPG_KEYGEN_DSA_RSA;                  pubkey_algo = GPG_KEYGEN_DSA_RSA;
594              p = gpg_genkey_params (pubkey_algo, DFAULT_KEYSIZE, utf8_name,              p = gpg_genkey_params (pubkey_algo, DFAULT_KEYSIZE, utf8_name,
Legend:
Removed from v.187  
changed lines
  Added in v.190
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26