security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

Fixed a temporary file name collision between gpg and gpgsm under Windows.

Browse Source
This commit is contained in:
Werner Koch 2008-11-20 16:26:40 +00:00
parent 31af1b3f03
commit b7ff1109f9
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -38,6 +38,9 @@ Noteworthy changes in version 2.0.10 (unreleased)
* [w32] The gnupg2.nls directory is not anymore used. The standard * [w32] The gnupg2.nls directory is not anymore used. The standard
locale directory is now used. locale directory is now used.
* [w32] Fixed a race condition bteween gpg and gpgsm in the use of
temporary file names.
* The gpg-preset-passphrase mechanism works again. * The gpg-preset-passphrase mechanism works again.
* Admin PINs are cached again (bug in 2.0.9). * Admin PINs are cached again (bug in 2.0.9).

5
kbx/ChangeLog
View File

@ -1,3 +1,8 @@
2008-11-20 Werner Koch <wk@g10code.com>
* keybox-update.c (create_tmp_file) [USE_ONLY_8DOT3]: Use other
suffixes to avoid conflicts with gpg uses filenames.
2008-11-11 Werner Koch <wk@g10code.com> 2008-11-11 Werner Koch <wk@g10code.com>
* Makefile.am (kbxutil_LDADD): Change order of libs. * Makefile.am (kbxutil_LDADD): Change order of libs.

2
kbx/keybox-file.c
View File

@ -1,4 +1,4 @@
/* keybox-file.c - file oeprations /* keybox-file.c - File operations
* Copyright (C) 2001, 2003 Free Software Foundation, Inc. * Copyright (C) 2001, 2003 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.

15
kbx/keybox-update.c
View File

@ -75,7 +75,9 @@ create_tmp_file (const char *template,
/* Here is another Windoze bug?: /* Here is another Windoze bug?:
* you cant rename("pubring.kbx.tmp", "pubring.kbx"); * you cant rename("pubring.kbx.tmp", "pubring.kbx");
* but rename("pubring.kbx.tmp", "pubring.aaa"); * but rename("pubring.kbx.tmp", "pubring.aaa");
* works. So we replace .kbx by .bak or .tmp * works. So we replace ".kbx" by ".kb_" or ".k__". Note that we
* can't use ".bak" and ".tmp", because these suffixes are used by
* gpg and would lead to a sharing violation or data corruption.
*/ */
if (strlen (template) > 4 if (strlen (template) > 4
&& !strcmp (template+strlen(template)-4, EXTSEP_S "kbx") ) && !strcmp (template+strlen(template)-4, EXTSEP_S "kbx") )
@ -84,7 +86,7 @@ create_tmp_file (const char *template,
if (!bakfname) if (!bakfname)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
strcpy (bakfname, template); strcpy (bakfname, template);
strcpy (bakfname+strlen(template)-4, EXTSEP_S "bak"); strcpy (bakfname+strlen(template)-4, EXTSEP_S "kb_");
tmpfname = xtrymalloc (strlen (template) + 1); tmpfname = xtrymalloc (strlen (template) + 1);
if (!tmpfname) if (!tmpfname)
@ -94,14 +96,15 @@ create_tmp_file (const char *template,
return tmperr; return tmperr;
} }
strcpy (tmpfname,template); strcpy (tmpfname,template);
strcpy (tmpfname + strlen (template)-4, EXTSEP_S "tmp"); strcpy (tmpfname + strlen (template)-4, EXTSEP_S "k__");
} }
else else
{ /* File does not end with kbx; hmmm. */ { /* File does not end with kbx, thus we hope we are working on a
modern file system and appending a suffix works. */
bakfname = xtrymalloc ( strlen (template) + 5); bakfname = xtrymalloc ( strlen (template) + 5);
if (!bakfname) if (!bakfname)
return gpg_error_from_syserror (); return gpg_error_from_syserror ();
strcpy (stpcpy (bakfname, template), EXTSEP_S "bak"); strcpy (stpcpy (bakfname, template), EXTSEP_S "kb_");
tmpfname = xtrymalloc ( strlen (template) + 5); tmpfname = xtrymalloc ( strlen (template) + 5);
if (!tmpfname) if (!tmpfname)
@ -110,7 +113,7 @@ create_tmp_file (const char *template,
xfree (bakfname); xfree (bakfname);
return tmperr; return tmperr;
} }
strcpy (stpcpy (tmpfname, template), EXTSEP_S "tmp"); strcpy (stpcpy (tmpfname, template), EXTSEP_S "k__");
} }
# else /* Posix file names */ # else /* Posix file names */
bakfname = xtrymalloc (strlen (template) + 2); bakfname = xtrymalloc (strlen (template) + 2);

2
sm/ChangeLog
View File

@ -1,7 +1,7 @@
2008-11-18 Werner Koch <wk@g10code.com> 2008-11-18 Werner Koch <wk@g10code.com>
* gpgsm.c (make_libversion): New. * gpgsm.c (make_libversion): New.
(my_strusage): Use new fucntion. (my_strusage): Use new function.
(build_lib_list): Remove. (build_lib_list): Remove.
2008-11-13 Werner Koch <wk@g10code.com> 2008-11-13 Werner Koch <wk@g10code.com>