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

minor changes for VMS

Browse Source
This commit is contained in:
Werner Koch 2009-12-15 11:07:43 +00:00
parent 03c414b650
commit a929b77b1c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2009-12-15 Werner Koch <wk@g10code.com> 2009-12-15 Werner Koch <wk@g10code.com>
* iso7816.c (do_generate_keypair): s/readonly/read_only/.
* keydb.c (keydb_add_resource): Ditto.
* tdbio.c (tdbio_set_dbname): Do not call log_fatal after creating * tdbio.c (tdbio_set_dbname): Do not call log_fatal after creating
the directory. Fixes bug#1169. Reported by Daniel Leidert. the directory. Fixes bug#1169. Reported by Daniel Leidert.

4
g10/iso7816.c
View File

@ -642,7 +642,7 @@ iso7816_internal_authenticate (int slot, int extended_mode,
returned. In that case a value of -1 uses a large default returned. In that case a value of -1 uses a large default
(e.g. 4096 bytes), a value larger 256 used that value. */ (e.g. 4096 bytes), a value larger 256 used that value. */
static gpg_error_t static gpg_error_t
do_generate_keypair (int slot, int extended_mode, int readonly, do_generate_keypair (int slot, int extended_mode, int read_only,
const unsigned char *data, size_t datalen, const unsigned char *data, size_t datalen,
int le, int le,
unsigned char **result, size_t *resultlen) unsigned char **result, size_t *resultlen)
@ -655,7 +655,7 @@ do_generate_keypair (int slot, int extended_mode, int readonly,
*resultlen = 0; *resultlen = 0;
sw = apdu_send_le (slot, extended_mode, sw = apdu_send_le (slot, extended_mode,
0x00, CMD_GENERATE_KEYPAIR, readonly? 0x81:0x80, 0, 0x00, CMD_GENERATE_KEYPAIR, read_only? 0x81:0x80, 0,
datalen, (const char*)data, datalen, (const char*)data,
le >= 0 && le < 256? 256:le, le >= 0 && le < 256? 256:le,
result, resultlen); result, resultlen);

6
g10/keydb.c
View File

@ -205,12 +205,12 @@ keydb_add_resource (const char *url, int flags, int secret)
const char *resname = url; const char *resname = url;
char *filename = NULL; char *filename = NULL;
int force=(flags&1); int force=(flags&1);
int readonly=!!(flags&8); int read_only=!!(flags&8);
int rc = 0; int rc = 0;
KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE; KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE;
void *token; void *token;
if (readonly) if (read_only)
force = 0; force = 0;
/* Do we have an URL? /* Do we have an URL?
@ -240,7 +240,7 @@ keydb_add_resource (const char *url, int flags, int secret)
else else
filename = xstrdup (resname); filename = xstrdup (resname);
if (!force && !readonly) if (!force && !read_only)
force = secret? !any_secret : !any_public; force = secret? !any_secret : !any_public;
/* see whether we can determine the filetype */ /* see whether we can determine the filetype */