diff options
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/iso7816.c | 4 | ||||
| -rw-r--r-- | g10/keydb.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7bbe53601..e08a6ddb2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2009-12-15 Werner Koch <[email protected]> + * 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 the directory. Fixes bug#1169. Reported by Daniel Leidert. diff --git a/g10/iso7816.c b/g10/iso7816.c index 151d56197..e024a08f3 100644 --- a/g10/iso7816.c +++ b/g10/iso7816.c @@ -642,7 +642,7 @@ iso7816_internal_authenticate (int slot, int extended_mode, returned. In that case a value of -1 uses a large default (e.g. 4096 bytes), a value larger 256 used that value. */ 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, int le, unsigned char **result, size_t *resultlen) @@ -655,7 +655,7 @@ do_generate_keypair (int slot, int extended_mode, int readonly, *resultlen = 0; 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, le >= 0 && le < 256? 256:le, result, resultlen); diff --git a/g10/keydb.c b/g10/keydb.c index 82962c7e3..a0c0e5747 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -205,12 +205,12 @@ keydb_add_resource (const char *url, int flags, int secret) const char *resname = url; char *filename = NULL; int force=(flags&1); - int readonly=!!(flags&8); + int read_only=!!(flags&8); int rc = 0; KeydbResourceType rt = KEYDB_RESOURCE_TYPE_NONE; void *token; - if (readonly) + if (read_only) force = 0; /* Do we have an URL? @@ -240,7 +240,7 @@ keydb_add_resource (const char *url, int flags, int secret) else filename = xstrdup (resname); - if (!force && !readonly) + if (!force && !read_only) force = secret? !any_secret : !any_public; /* see whether we can determine the filetype */ |