[Winpt-commits] r78 - in trunk: . Po Src w32gpgme
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 15 09:54:46 CET 2005
Author: twoaday
Date: 2005-11-15 09:54:44 +0100 (Tue, 15 Nov 2005)
New Revision: 78
Modified:
trunk/NEWS
trunk/Po/de.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptGPG.cpp
trunk/Src/wptGPGPrefsDlg.cpp
trunk/Src/wptKeyEditDlgs.cpp
trunk/Src/wptKeyManagerDlg.cpp
trunk/Src/wptMainProc.cpp
trunk/Src/wptPassphraseDlg.cpp
trunk/Src/wptProxySettingsDlg.cpp
trunk/w32gpgme/w32-clip.c
Log:
2005-11-14 Timo Schulz <ts at g10code.com>
* wptGPG.cpp (check_gnupg_engine): Fix version check.
* wptMainProc.cpp (winpt_main_proc): Check keyring
file permissions always and do not use interative output
when the windows session ends.
* wptProxySettingsDlg.cpp (proxy_settings_dlg_proc):
Localize all strings.
* wptPassphraseDlg.cpp (passwd_dlg_proc): Likewise.
* wptGPGPrefsDlg.cpp (gpg_prefs_dlg): Likewise.
* wptKeyEditDlgs.cpp (do_init_keylist): Skip all
non-valid keys.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/NEWS 2005-11-15 08:54:44 UTC (rev 78)
@@ -653,6 +653,8 @@
Noteworthy changes in version 0.11.x (2005-xx-xx)
=================================================
+(0.11.0)
+
* Fix the problem that the original files are not deleted if
requested.
* Fix a couple of problems related to the signature verification
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Po/de.po 2005-11-15 08:54:44 UTC (rev 78)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: WinPT 0.10.2\n"
"POT-Creation-Date: 2005-10-20 19:52+0200\n"
-"PO-Revision-Date: 2005-10-24 07:28+0100\n"
+"PO-Revision-Date: 2005-10-27 07:28+0100\n"
"Last-Translator: Timo Schulz <ts at g10code.de>\n"
"Language-Team: DE <twoaday at freakmail.de>\n"
"MIME-Version: 1.0\n"
@@ -434,7 +434,7 @@
# c:\oss\winpt-gpgme\src\wptPassphraseCB.cpp:124
msgid "Bad passphrase; Enter passphrase again"
-msgstr "Ungültiges Password; Bitte Passwort erneut eingeben"
+msgstr "Ungültiges Passwort; Bitte Passwort erneut eingeben"
# c:\oss\winpt-gpgme\src\wptClipDecryptDlg.cpp:137
msgid "Broken OpenPGP message (maybe: quoted printable character in armor)."
@@ -2942,11 +2942,11 @@
#: c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:886
msgid "Copy Key ID to Clipboard"
-msgstr "Kopiere Key ID in Ablage"
+msgstr "Kopiere Schlüssel ID in Ablage"
#: c:\oss\winpt-gpgme\src\wptKeyManagerDlg.cpp:888
msgid "Copy Key Info to Clipboard"
-msgstr "Kopiere Key Info in Ablage"
+msgstr "Kopiere SchlüsselInfo in Ablage"
msgid "Copy User ID to Clipboard"
msgstr "Kopiere Benutzerkennung in Ablage"
@@ -2977,7 +2977,7 @@
#: c:\oss\winpt-gpgme\src\wptAboutDlgs.cpp:97
msgid "&About GPG..."
-msgstr "Ueber &GPG"
+msgstr "Über &GPG"
#: c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:425
msgid "&List Packets"
@@ -3058,7 +3058,7 @@
msgstr "Als &Standard"
msgid "Skip key validation and assume that keys are always fully trusted"
-msgstr ""
+msgstr "Benutze Trust-Model 'immer gültig' und prüfe Schlüssel nie"
msgid "&Automatic keyring backup when WinPT closes"
msgstr "&Automatisch Backups erstellen wenn WinPT beendet wird"
@@ -3069,6 +3069,27 @@
msgid "Backup to:"
msgstr "Backup nach:"
-msgid "Photo-ID not checked."
+msgid "Photo-ID not validated."
msgstr "Foto-ID nicht geprüft."
+msgid "Ask for the signature class during key sign"
+msgstr "Signaturlevel erfragen während Key-Sign"
+
+msgid "Proxy host name or IP address"
+msgstr "Proxy Rechnername oder IP Adresse"
+
+msgid "Server requires &authentication"
+msgstr "Server benötigt &Authentifikation"
+
+msgid "User name"
+msgstr "Benutzername"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "Comment in armored files"
+msgstr "Kommentar in Armor-Dateien"
+
+msgid "Encrypt to this key"
+msgstr ""
+
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/ChangeLog 2005-11-15 08:54:44 UTC (rev 78)
@@ -1,3 +1,16 @@
+2005-11-14 Timo Schulz <ts at g10code.com>
+
+ * wptGPG.cpp (check_gnupg_engine): Fix version check.
+ * wptMainProc.cpp (winpt_main_proc): Check keyring
+ file permissions always and do not use interative output
+ when the windows session ends.
+ * wptProxySettingsDlg.cpp (proxy_settings_dlg_proc):
+ Localize all strings.
+ * wptPassphraseDlg.cpp (passwd_dlg_proc): Likewise.
+ * wptGPGPrefsDlg.cpp (gpg_prefs_dlg): Likewise.
+ * wptKeyEditDlgs.cpp (do_init_keylist): Skip all
+ non-valid keys.
+
2005-11-12 Timo Schulz <ts at g10code.com>
Fix more GCC warnings.
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/WinPT-en.rc 2005-11-15 08:54:44 UTC (rev 78)
@@ -544,9 +544,10 @@
CONTROL "Ask for the signature class during key sign",
IDC_GPGPREFS_ASKLEVEL,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,11,156,166,10
- LTEXT "Comment in armored files",IDC_STATIC,11,169,79,8
+ LTEXT "Comment in armored files",IDC_GPGPREFS_CMTINF,11,169,
+ 124,8
EDITTEXT IDC_GPGPREFS_COMMENT,11,180,188,12,ES_AUTOHSCROLL
- LTEXT "Encrypt to this key",IDC_STATIC,11,199,59,8
+ LTEXT "Encrypt to this key",IDC_GPGPREFS_ENCINF,11,199,59,8
EDITTEXT IDC_GPGPREFS_ENCTO,78,197,121,13,ES_AUTOHSCROLL
PUSHBUTTON "&OK",IDC_GPGPREFS_SAVE,159,219,55,14
GROUPBOX "",IDC_STATIC,6,70,209,34
@@ -585,8 +586,8 @@
CONTROL "List1",IDC_KEYSIG_LIST,"SysListView32",LVS_REPORT |
LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,8,8,335,134
DEFPUSHBUTTON "&OK",IDOK,8,145,55,14
- PUSHBUTTON "&Receive Key",IDC_KEYSIG_RECVKEY,65,145,63,14
- PUSHBUTTON "&Properties",IDC_KEYSIG_SIGPROPS,132,145,55,14
+ PUSHBUTTON "&Receive Key",IDC_KEYSIG_RECVKEY,65,145,75,14
+ PUSHBUTTON "&Properties",IDC_KEYSIG_SIGPROPS,143,145,55,14
END
IDD_WINPT_VERIFY DIALOG DISCARDABLE 0, 0, 394, 87
@@ -601,16 +602,16 @@
EDITTEXT IDC_VERIFY_INFO,6,53,377,12,ES_AUTOHSCROLL | WS_DISABLED
END
-IDD_WINPT_OWNERTRUST DIALOG DISCARDABLE 0, 0, 182, 58
+IDD_WINPT_OWNERTRUST DIALOG DISCARDABLE 0, 0, 182, 76
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Ownertrust"
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Here it is possible to save or restore the ownertrust from the trustdb file. This could be very useful because the values are NOT stored in the keyring.",
- IDC_OWNERTRUST_DESC,8,5,163,27
- PUSHBUTTON "&Export",IDC_OWNERTRUST_EXPORT,8,39,50,14
- PUSHBUTTON "&Import",IDC_OWNERTRUST_IMPORT,60,39,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,112,39,50,14
+ IDC_OWNERTRUST_DESC,8,5,163,43
+ PUSHBUTTON "&Export",IDC_OWNERTRUST_EXPORT,8,57,50,14
+ PUSHBUTTON "&Import",IDC_OWNERTRUST_IMPORT,60,57,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,112,57,50,14
END
IDD_WINPT_KEYEDIT_ADDUID DIALOG DISCARDABLE 0, 0, 166, 82
@@ -845,7 +846,7 @@
DEFPUSHBUTTON "&OK",IDOK,9,34,50,14
PUSHBUTTON "&Cancel",IDCANCEL,62,34,50,14
CONTROL "&Hide Typing",IDC_PASSWD_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,157,7,54,10
+ WS_TABSTOP,136,7,54,10
END
IDD_WINPT_DATE DIALOG DISCARDABLE 0, 0, 93, 58
@@ -919,7 +920,7 @@
LTEXT "Port",IDC_PROXY_PORTINF,143,9,29,8
EDITTEXT IDC_PROXY_PORT,142,19,32,12
CONTROL "Server requires authentication",IDC_PROXY_AUTH,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,6,35,110,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,6,35,142,10
GROUPBOX "Authentication",IDC_STATIC,6,53,171,40
LTEXT "User name",IDC_PROXY_USERINF,14,65,76,8
EDITTEXT IDC_PROXY_USER,14,75,88,12,ES_AUTOHSCROLL
@@ -1571,7 +1572,7 @@
LEFTMARGIN, 3
RIGHTMARGIN, 176
TOPMARGIN, 2
- BOTTOMMARGIN, 54
+ BOTTOMMARGIN, 72
END
IDD_WINPT_KEYEDIT_ADDUID, DIALOG
@@ -1936,8 +1937,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,10,4,0
- PRODUCTVERSION 0,10,4,0
+ FILEVERSION 0,10,5,0
+ PRODUCTVERSION 0,10,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1955,14 +1956,14 @@
VALUE "Comments", "This is free software under the terms of the GNU GPL v2\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "Windows Privacy Tray (WinPT)\0"
- VALUE "FileVersion", "0.10.4\0"
+ VALUE "FileVersion", "0.10.5\0"
VALUE "InternalName", "WinPT\0"
VALUE "LegalCopyright", " Copyright (C) 2005 Timo Schulz\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "WinPT.exe\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Windows Privacy Tray\0"
- VALUE "ProductVersion", "0.10.4\0"
+ VALUE "ProductVersion", "0.10.5\0"
VALUE "SpecialBuild", "\0"
END
END
@@ -2042,7 +2043,7 @@
END
MENUITEM SEPARATOR
MENUITEM "&Encrypt", ID_FILEMISC_ENCRYPT
- MENUITEM "Encrypt and ZIP", ID_FILEMISC_ENCRYPT_ZIP
+ MENUITEM "Encrypt and ZIP", ID_FILEMISC_ENCRYPT_ZIP
MENUITEM "&Decrypt", ID_FILEMISC_DECRYPT
MENUITEM SEPARATOR
MENUITEM "S&ymmetric", ID_FILEMISC_SYMENC
@@ -2197,7 +2198,7 @@
POPUP "Context menu"
BEGIN
MENUITEM "Encrypt", ID_FILECTX_ENCRYPT
- MENUITEM "Encrypt into ZIP", ID_FILECTX_ENCRYPT_ZIP
+ MENUITEM "Encrypt into ZIP", ID_FILECTX_ENCRYPT_ZIP
MENUITEM "Decrypt", ID_FILECTX_DECRYPT
MENUITEM SEPARATOR
MENUITEM "Sign && Encrypt", ID_FILECTX_SIGNENC
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/resource.h 2005-11-15 08:54:44 UTC (rev 78)
@@ -578,6 +578,8 @@
#define IDC_KEYSIGN_SHOWIMG 1464
#define IDC_KEYPROPS_OTINF 1465
#define IDC_KEYPROPS_IMGINF 1466
+#define IDC_GPGPREFS_ENCINF 1467
+#define IDC_GPGPREFS_CMTINF 1468
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -741,14 +743,14 @@
#define ID_FILEMISC_MD_SHA256 40173
#define ID_FILECTX_ENCRYPT_ZIP 40174
#define ID_FILEMISC_ENCRYPT_ZIP 40175
-
+
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 230
-#define _APS_NEXT_COMMAND_VALUE 40174
-#define _APS_NEXT_CONTROL_VALUE 1467
+#define _APS_NEXT_COMMAND_VALUE 40176
+#define _APS_NEXT_CONTROL_VALUE 1469
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptGPG.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -342,7 +342,7 @@
tmp[i] = 0; buf++;
*minor = atol (tmp);
i=0;
- while (buf && isdigit( *buf ) && i < 8)
+ while (buf && isdigit (*buf) && i < 8)
tmp[i++] = *buf++;
tmp[i] = 0;
*patch = atol (tmp);
@@ -358,9 +358,9 @@
{
gpgme_ctx_t ctx;
gpgme_engine_info_t inf;
- char * eng = NULL;
+ char *eng = NULL;
int major=0, minor=0, patch=0;
- int rc;
+ int rc = 1;
gpgme_new (&ctx);
inf = gpgme_ctx_get_engine_info (ctx);
@@ -368,25 +368,27 @@
gpgme_release (ctx);
return -1;
}
+
/* We need to exec GPG again to find out if IDEA is available. */
if (gpg_get_version (&eng))
return -1;
if (strstr (eng, "IDEA"))
idea_available = 1;
free (eng);
- rc = parse_version_nr( inf->version, &major, &minor, &patch );
- if( rc ) {
+ rc = parse_version_nr (inf->version, &major, &minor, &patch);
+ if (rc) {
gpgme_release (ctx);
return rc;
}
- /* FIXME: This check is wrong! */
- if (major < *r_major || minor < *r_minor)
- rc = 1;
- else {
- if (patch < *r_patch)
- rc = 1;
+
+ if (major > *r_major)
rc = 0;
- }
+ else if (major == *r_major && minor > *r_minor)
+ rc = 0;
+ else if (major == *r_major && minor == *r_minor &&
+ patch >= *r_patch)
+ rc = 0;
+
*r_major = major;
*r_minor = minor;
*r_patch = patch;
@@ -787,6 +789,10 @@
}
+/* Check the file permissions of the public keyring.
+ If @showmsg is 1 output a message in case of errors.
+ Return value: 1 if read-only attribute
+ 2 if file is opened by another process exclusively. */
int
gpg_check_permissions (int showmsg)
{
@@ -813,10 +819,7 @@
}
}
else if (ans == IDNO) {
- /*
- msg_box (NULL, _("All commands with write access to the keyring\n"
- "will be disabled."), _("GPG Information"), MB_INFO);
- */
+ /* All commands with write access will be disabled. */
failed = 1;
}
}
@@ -834,7 +837,7 @@
}
free_if_alloc (name);
return failed;
-} /* gpg_check_permissions */
+}
/* Check the GPG home dir. If all methods failed, try to
Modified: trunk/Src/wptGPGPrefsDlg.cpp
===================================================================
--- trunk/Src/wptGPGPrefsDlg.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptGPGPrefsDlg.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -71,7 +71,9 @@
SetDlgItemText( dlg, IDC_GPGPREFS_LOCALINF,
_("Locale directory (to access the translation files)") );
SetDlgItemText (dlg, IDC_GPGPREFS_ASKLEVEL, _("Ask for the signature class during key sign"));
-
+ SetDlgItemText (dlg, IDC_GPGPREFS_CMTINF, _("Comment in armored files"));
+ SetDlgItemText (dlg, IDC_GPGPREFS_ENCINF, _("Encrypt to this key"));
+
for( n=0; (s = opts[n].name); n++ ) {
p = get_reg_entry_gpg( s );
if( p ) {
Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptKeyEditDlgs.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -136,6 +136,10 @@
gpg_keycache_rewind (pub);
while( !gpg_keycache_next_key( pub, 0, &key ) ) {
+ if (key->expired || key->revoked ||
+ key->disabled || key->invalid)
+ continue;
+
s = key->uids->uid;
kid = key->subkeys->keyid;
if (!s || !strcmp (kid+8, k->keyid+2))
Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptKeyManagerDlg.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -573,7 +573,7 @@
case 0: return;
case 3: resids = key_resids; break;
case 1: resids = edit_resids;break;
- default: return;
+ default: resids = edit_resids; return;
}
for (i=0; resids[i] != 0; i++)
Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptMainProc.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -391,7 +391,7 @@
agent_flush_cache ();
if (!gpg_clip_istext_avail (&has_data) && has_data) {
int chk = get_reg_winpt_flag ("WipeClipboard");
- if (chk == -1)
+ if (chk == -1 && msg != WM_ENDSESSION)
DialogBoxParam (glob_hinst, (LPCTSTR)IDD_WINPT_CONFDELCLIP,
GetDesktopWindow (), confirm_delclipboard_dlg,
0);
@@ -461,7 +461,8 @@
break;
case WM_LBUTTONDBLCLK:
- SendMessage( hwnd, WM_COMMAND, ID_WINPT_KEY, 0 );
+ gpg_read_only = gpg_check_permissions (0) == 0? 0 : 1;
+ SendMessage (hwnd, WM_COMMAND, ID_WINPT_KEY, 0);
break;
}
break;
Modified: trunk/Src/wptPassphraseDlg.cpp
===================================================================
--- trunk/Src/wptPassphraseDlg.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptPassphraseDlg.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -66,6 +66,7 @@
SetDlgItemText (dlg, IDC_PASSWD_INFO, _("Repeat Passphrase"));
else
SetDlgItemText (dlg, IDC_PASSWD_INFO, _("Enter Passphrase"));
+ SetDlgItemText (dlg, IDC_PASSWD_HIDE, _("&Hide Typing"));
SetFocus (GetDlgItem (dlg, IDC_PASSWD_PWD ));
center_window2 (dlg, NULL, HWND_TOPMOST);
center_window (dlg, NULL);
Modified: trunk/Src/wptProxySettingsDlg.cpp
===================================================================
--- trunk/Src/wptProxySettingsDlg.cpp 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/Src/wptProxySettingsDlg.cpp 2005-11-15 08:54:44 UTC (rev 78)
@@ -17,7 +17,6 @@
* along with WinPT; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -111,7 +110,7 @@
keyserver_proxy_dlg_proc (HWND dlg, UINT msg, WPARAM wparam, LPARAM lparam)
{
const char *proxy = NULL, *user=NULL, *pass = NULL;
- int port = 0, auth = 0;
+ int port = 0, auth = 0;
switch (msg) {
case WM_INITDIALOG:
@@ -131,10 +130,13 @@
auth++;
}
}
- enable_proxy_auth (dlg, auth);
- center_window (dlg, NULL);
+ enable_proxy_auth (dlg, auth);
+ SetDlgItemText (dlg, IDC_PROXY_HOSTINF, _("Proxy host name or IP address"));
SetDlgItemText (dlg, IDC_PROXY_AUTH, _("Server requires &authentication"));
+ SetDlgItemText (dlg, IDC_PROXY_USERINF, _("User name"));
+ SetDlgItemText (dlg, IDC_PROXY_PWDINF, _("Password"));
SetWindowText (dlg, _("Proxy Settings"));
+ center_window (dlg, NULL);
SetForegroundWindow (dlg);
break;
Modified: trunk/w32gpgme/w32-clip.c
===================================================================
--- trunk/w32gpgme/w32-clip.c 2005-11-14 15:01:01 UTC (rev 77)
+++ trunk/w32gpgme/w32-clip.c 2005-11-15 08:54:44 UTC (rev 78)
@@ -24,7 +24,7 @@
int gpg_data_wrap_lines (gpgme_data_t *r_dh, size_t wraplen);
//FIXME #include "wptVersion.h"
-#define PGM_VERSION "0.10.4-beta"
+#define PGM_VERSION "0.11.0-beta"
/* Retrieve the thext of the clipboard.
Return value: the text as a string, NULL otherwise. */
More information about the Winpt-commits
mailing list