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

W32 fix for trustdb creation.

Browse Source
This commit is contained in:
Werner Koch 2008-01-30 13:26:32 +00:00
parent 843d6c69ef
commit b680d034fa
6 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-29 Justin Pryzby <jpryzby+d@quoininc.com> (wk)
* gpg-agent.texi (Agent Options): Grammar fixes
* qualified.txt: Spelling fixes.
2008-01-28 Justin Pryzby <jpryzby+d@quoininc.com> (wk) 2008-01-28 Justin Pryzby <jpryzby+d@quoininc.com> (wk)
* gpg-agent.texi, yat2m.c, scdaemon.texi, qualified.txt * gpg-agent.texi, yat2m.c, scdaemon.texi, qualified.txt
@ -559,7 +565,7 @@
* Makefile.am, gpgsm.texi: New. * Makefile.am, gpgsm.texi: New.
Copyright 2002, 2004, 2005 Free Software Foundation, Inc. Copyright 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

4
doc/DETAILS
View File

@ -319,8 +319,8 @@ more arguments in future versions.
indicate how trustworthy the signature is. The error token indicate how trustworthy the signature is. The error token
values are currently only emitted by gpgsm. VALIDATION_MODEL values are currently only emitted by gpgsm. VALIDATION_MODEL
describes the algorithm used to check the validity of the key. describes the algorithm used to check the validity of the key.
The default is the standard gpg Web of Trust model respective The defaults are the standard Web of Trust model for gpg and the
the standard X.509 model. The defined values are the standard X.509 model for gpgsm. The defined values are
"pgp" for the standard PGP WoT. "pgp" for the standard PGP WoT.
"shell" for the standard X.509 model. "shell" for the standard X.509 model.

10
doc/gpg-agent.texi
View File

@ -268,9 +268,9 @@ debugging.
@opindex c @opindex c
@opindex csh @opindex csh
Format the info output in daemon mode for use with the standard Bourne Format the info output in daemon mode for use with the standard Bourne
shell respective the C-shell. The default is to guess it based on the shell or the C-shell respectively. The default is to guess it based on
environment variable @code{SHELL} which is in almost all cases the environment variable @code{SHELL} which is correct in almost all
correct. cases.
@item --write-env-file @var{file} @item --write-env-file @var{file}
@opindex write-env-file @opindex write-env-file
@ -436,8 +436,8 @@ information.
@itemx --keep-display @itemx --keep-display
@opindex keep-tty @opindex keep-tty
@opindex keep-display @opindex keep-display
Ignore requests to change the current @code{tty} respective the X Ignore requests to change the current @code{tty} or X window system's
window system's @code{DISPLAY} variable. This is useful to lock the @code{DISPLAY} variable respectively. This is useful to lock the
pinentry to pop up at the @code{tty} or display you started the agent. pinentry to pop up at the @code{tty} or display you started the agent.
@anchor{option --enable-ssh-support} @anchor{option --enable-ssh-support}

6
doc/qualified.txt
View File

@ -4,9 +4,9 @@
# signatures are. Comments like this one and empty lines are allowed # signatures are. Comments like this one and empty lines are allowed
# Lines do have a length limit but this is not a serious limitation as # Lines do have a length limit but this is not a serious limitation as
# the format of the entries is fixed and checked by gpgsm: A # the format of the entries is fixed and checked by gpgsm: A
# non-comment line starts with optional white spaces, followed by # non-comment line starts with optional whitespaces, followed by
# exactly 40 hex character, white space and a lowercased 2 letter # exactly 40 hex character, whitespace and a lowercased 2 letter
# country code. Additional data delimited with by a white space is # country code. Additional data delimited with by a whitespace is
# current ignored but might late be used for other purposes. # current ignored but might late be used for other purposes.
# #
# Note: The subversion copy of this file carries a gpg:signature # Note: The subversion copy of this file carries a gpg:signature

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-30 Werner Koch <wk@g10code.com>
* tdbio.c (tdbio_set_dbname): Also test for forward slash.
2008-01-29 Werner Koch <wk@g10code.com> 2008-01-29 Werner Koch <wk@g10code.com>
* keydb.c (maybe_create_keyring): Take care of a missing slash. * keydb.c (maybe_create_keyring): Take care of a missing slash.

15
g10/tdbio.c
View File

@ -505,14 +505,25 @@ tdbio_set_dbname( const char *new_dbname, int create )
int rc; int rc;
char *p = strrchr( fname, DIRSEP_C ); char *p = strrchr( fname, DIRSEP_C );
mode_t oldmask; mode_t oldmask;
int save_slash;
assert(p); #if HAVE_W32_SYSTEM
{
/* Windows may either have a slash or a backslash. Take
care of it. */
char *pp = strrchr (fname, '/');
if (!p || pp > p)
p = pp;
}
#endif /*HAVE_W32_SYSTEM*/
assert (p);
save_slash = *p;
*p = 0; *p = 0;
if( access( fname, F_OK ) ) { if( access( fname, F_OK ) ) {
try_make_homedir( fname ); try_make_homedir( fname );
log_fatal( _("%s: directory does not exist!\n"), fname ); log_fatal( _("%s: directory does not exist!\n"), fname );
} }
*p = DIRSEP_C; *p = save_slash;
xfree(db_name); xfree(db_name);
db_name = fname; db_name = fname;