From scm-commit at wald.intevation.org Tue Dec 13 11:40:30 2011 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Tue, 13 Dec 2011 11:40:30 +0100 (CET) Subject: [Gpgoe-commits] r24 - in trunk: . init src Message-ID: <20111213104030.65A6A867E948@pyrosoma.intevation.org> Author: twoaday Date: 2011-12-13 11:40:30 +0100 (Tue, 13 Dec 2011) New Revision: 24 Modified: trunk/NEWS trunk/README trunk/init/GPGOEInit.c trunk/src/GPGOE.c trunk/src/GPGOE.h trunk/src/OEDlgVerify.c trunk/src/OEDlgViewer.c trunk/src/OEMainProc.c trunk/src/OEMisc.c trunk/src/OENLS.c trunk/src/OEPassphraseCBDlg.c trunk/src/OEProc.c Log: Commit code for backup purposes. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/NEWS 2011-12-13 10:40:30 UTC (rev 24) @@ -1,14 +1,10 @@ -Noteworthy changes in version 0.9.1 (unreleased) ------------------------------------------------- - - Noteworthy changes in version 0.9.0 (2006-06-03) ------------------------------------------------ * Allow to cache one or more passphrases. * The verify dialog now also contains the signed text plus some additional timestamp information. - +* THIS IS THE LAST RELEASE. Noteworthy changes in version 0.8.1 (2006-04-11) ------------------------------------------------ Modified: trunk/README =================================================================== --- trunk/README 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/README 2011-12-13 10:40:30 UTC (rev 24) @@ -3,17 +3,19 @@ ------------------------------------------ -Some important information --------------------------- -Please consider this work as a beta version. Don't except that everything -works and be prepared for some unexpected behvaiours! So please use it -with some caution. -Even so I tested the plugin several times and what I can say is, that it -seems to work with W2K/WXP and Outlook Express (6.X). Because I don't -have any access to a machine with Vista, I cannot say anything how it -works with the new Outlook Express version. +IMPORTANT INFORMATION +--------------------- +After almost two years and the fact that there is no guarantee that +it will work with the next Outlook Express version (or that the Express +version still exists), I decided to end the support for this project. +The 0.9.0 release will be the last release. +Since the 0.8 release there was minimal feedback and due to time +constraints it is impossible for me to continue. If you have a choice, +use a mailer with real OpenPGP support. + + Installation ------------ Modified: trunk/init/GPGOEInit.c =================================================================== --- trunk/init/GPGOEInit.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/init/GPGOEInit.c 2011-12-13 10:40:30 UTC (rev 24) @@ -105,22 +105,6 @@ } -#if 0 -/* Set the menu item @muid to the state @state. */ -void -set_menu_state (HMENU menu, UINT muid, UINT state) -{ - MENUITEMINFO mii; - - memset (&mii, 0, sizeof (mii)); - mii.cbSize = sizeof (mii); - mii.fMask = MIIM_STATE; - mii.fState = state; - SetMenuItemInfo (menu, muid, FALSE, &mii); -} -#endif - - /* Get an option with the name @name from the registry. */ int get_gpgoe_option (const char *name) @@ -328,7 +312,7 @@ char buf[256]; _snprintf (buf, sizeof (buf)-1, "GPGoe found an instance of a program which\n" - "might be effect the functionality of the plugin.\n" + "might effect the functionality of the plugin.\n" "\n" "Name of the process: %s\n" "\n" Modified: trunk/src/GPGOE.c =================================================================== --- trunk/src/GPGOE.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/GPGOE.c 2011-12-13 10:40:30 UTC (rev 24) @@ -43,8 +43,8 @@ /* Supported GPGOE feature modes. */ int gpgoe_active_modes ATTR_SEC = 0; -/* FIXME: we currently limit the passphrase to 256 octets. */ -char gpgoe_pass_cache[HASH_BUCKETS][256]; +/* FIXME: we currently limit the passphrase to N octets. */ +char gpgoe_pass_cache[HASH_BUCKETS][MAX_PASS_LEN]; #ifndef __GNUC__ #pragma data_seg() #endif Modified: trunk/src/GPGOE.h =================================================================== --- trunk/src/GPGOE.h 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/GPGOE.h 2011-12-13 10:40:30 UTC (rev 24) @@ -26,6 +26,7 @@ /* How many items we can store in the dictionary */ #define HASH_BUCKETS 3 +#define MAX_PASS_LEN 2048 /* gettext support. */ const char *gettext (const char *msgid); Modified: trunk/src/OEDlgVerify.c =================================================================== --- trunk/src/OEDlgVerify.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEDlgVerify.c 2011-12-13 10:40:30 UTC (rev 24) @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with GPGOE; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CONFIG_H Modified: trunk/src/OEDlgViewer.c =================================================================== --- trunk/src/OEDlgViewer.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEDlgViewer.c 2011-12-13 10:40:30 UTC (rev 24) @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with GPGOE; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CONFIG_H Modified: trunk/src/OEMainProc.c =================================================================== --- trunk/src/OEMainProc.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEMainProc.c 2011-12-13 10:40:30 UTC (rev 24) @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with GPGOE; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include Modified: trunk/src/OEMisc.c =================================================================== --- trunk/src/OEMisc.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEMisc.c 2011-12-13 10:40:30 UTC (rev 24) @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with GPGOE; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CONFIG_H Modified: trunk/src/OENLS.c =================================================================== --- trunk/src/OENLS.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OENLS.c 2011-12-13 10:40:30 UTC (rev 24) @@ -14,10 +14,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this software; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifdef HAVE_CONFIG_H Modified: trunk/src/OEPassphraseCBDlg.c =================================================================== --- trunk/src/OEPassphraseCBDlg.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEPassphraseCBDlg.c 2011-12-13 10:40:30 UTC (rev 24) @@ -37,7 +37,7 @@ /* Reference to the passphrase cache. */ -extern char gpgoe_pass_cache[HASH_BUCKETS][256]; +extern char gpgoe_pass_cache[HASH_BUCKETS][MAX_PASS_LEN]; DWORD hash_string (const char *str_param); @@ -45,14 +45,15 @@ /* Store the passphrase @pass in the hash table using the keyid @keyid as the index. */ static void -passphrase_put (char ctx[HASH_BUCKETS][256], const char *keyid, const char *pass) +passphrase_put (char ctx[HASH_BUCKETS][MAX_PASS_LEN], const char *keyid, + const char *pass) { int pos = hash_string (keyid) % HASH_BUCKETS; int n, passlen; /* We cannot store passphrase of that size. */ passlen = strlen (pass); - if (passlen > 255) + if (passlen > MAX_PASS_LEN-1) return; n = 0; @@ -72,7 +73,7 @@ using the keyid @keyid as the index. Or NULL if there is no stored passphrase. */ static const char* -passphrase_get (char ctx[HASH_BUCKETS][256], const char *keyid) +passphrase_get (char ctx[HASH_BUCKETS][MAX_PASS_LEN], const char *keyid) { const char *item; int pos = hash_string (keyid) % HASH_BUCKETS; Modified: trunk/src/OEProc.c =================================================================== --- trunk/src/OEProc.c 2007-08-18 10:55:14 UTC (rev 23) +++ trunk/src/OEProc.c 2011-12-13 10:40:30 UTC (rev 24) @@ -12,10 +12,6 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with GPGOE; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CONFIG_H