security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-31 22:18:03 +02:00
Code Activity

Do not use the VMC C reserved word readonly.

Browse Source
This commit is contained in:
Werner Koch 2009-12-15 11:03:17 +00:00
parent c9271f6d58
commit 34baa18187
8 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/protect.c
View File

@ -161,7 +161,7 @@ calibrate_s2k_count (void)
if (opt.verbose) if (opt.verbose)
{ {
ms = calibrate_s2k_count_one (count); ms = calibrate_s2k_count_one (count);
log_info ("S2K calibration: %lu iterations for %lums\n", count, ms); log_info ("S2K calibration: %lu -> %lums\n", count, ms);
} }
return count; return count;

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>
* keydb.c (keydb_add_resource): s/readonly/read_only/g.
* keyring.c (keyring_register_filename): 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.

8
g10/keydb.c
View File

@ -219,12 +219,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?
@ -254,7 +254,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. */
@ -289,7 +289,7 @@ keydb_add_resource (const char *url, int flags, int secret)
if (rc) if (rc)
goto leave; goto leave;
if(keyring_register_filename (filename, secret, readonly, &token)) if(keyring_register_filename (filename, secret, read_only, &token))
{ {
if (used_resources >= MAX_KEYDB_RESOURCES) if (used_resources >= MAX_KEYDB_RESOURCES)
rc = G10ERR_RESOURCE_LIMIT; rc = G10ERR_RESOURCE_LIMIT;

20
g10/keyring.c
View File

@ -54,7 +54,7 @@ struct keyring_name
{ {
struct keyring_name *next; struct keyring_name *next;
int secret; int secret;
int readonly; int read_only;
dotlock_t lockhd; dotlock_t lockhd;
int is_locked; int is_locked;
int did_full_scan; int did_full_scan;
@ -201,7 +201,7 @@ update_offset_hash_table_from_kb (OffsetHashTable tbl, KBNODE node, off_t off)
* if a new keyring was registered. * if a new keyring was registered.
*/ */
int int
keyring_register_filename (const char *fname, int secret, int readonly, keyring_register_filename (const char *fname, int secret, int read_only,
void **ptr) void **ptr)
{ {
KR_NAME kr; KR_NAME kr;
@ -214,8 +214,8 @@ keyring_register_filename (const char *fname, int secret, int readonly,
if (same_file_p (kr->fname, fname)) if (same_file_p (kr->fname, fname))
{ {
/* Already registered. */ /* Already registered. */
if (readonly) if (read_only)
kr->readonly = 1; kr->read_only = 1;
*ptr=kr; *ptr=kr;
return 0; return 0;
} }
@ -227,7 +227,7 @@ keyring_register_filename (const char *fname, int secret, int readonly,
kr = xmalloc (sizeof *kr + strlen (fname)); kr = xmalloc (sizeof *kr + strlen (fname));
strcpy (kr->fname, fname); strcpy (kr->fname, fname);
kr->secret = !!secret; kr->secret = !!secret;
kr->readonly = readonly; kr->read_only = read_only;
kr->lockhd = NULL; kr->lockhd = NULL;
kr->is_locked = 0; kr->is_locked = 0;
kr->did_full_scan = 0; kr->did_full_scan = 0;
@ -249,7 +249,7 @@ keyring_is_writable (void *token)
{ {
KR_NAME r = token; KR_NAME r = token;
return r? (r->readonly || !access (r->fname, W_OK)) : 0; return r? (r->read_only || !access (r->fname, W_OK)) : 0;
} }
@ -516,7 +516,7 @@ keyring_update_keyblock (KEYRING_HANDLE hd, KBNODE kb)
if (!hd->found.kr) if (!hd->found.kr)
return -1; /* no successful prior search */ return -1; /* no successful prior search */
if (hd->found.kr->readonly) if (hd->found.kr->read_only)
return gpg_error (GPG_ERR_EACCES); return gpg_error (GPG_ERR_EACCES);
if (!hd->found.n_packets) { if (!hd->found.n_packets) {
@ -562,13 +562,13 @@ keyring_insert_keyblock (KEYRING_HANDLE hd, KBNODE kb)
else if (hd->found.kr) else if (hd->found.kr)
{ {
fname = hd->found.kr->fname; fname = hd->found.kr->fname;
if (hd->found.kr->readonly) if (hd->found.kr->read_only)
return gpg_error (GPG_ERR_EACCES); return gpg_error (GPG_ERR_EACCES);
} }
else if (hd->current.kr) else if (hd->current.kr)
{ {
fname = hd->current.kr->fname; fname = hd->current.kr->fname;
if (hd->current.kr->readonly) if (hd->current.kr->read_only)
return gpg_error (GPG_ERR_EACCES); return gpg_error (GPG_ERR_EACCES);
} }
else else
@ -603,7 +603,7 @@ keyring_delete_keyblock (KEYRING_HANDLE hd)
if (!hd->found.kr) if (!hd->found.kr)
return -1; /* no successful prior search */ return -1; /* no successful prior search */
if (hd->found.kr->readonly) if (hd->found.kr->read_only)
return gpg_error (GPG_ERR_EACCES); return gpg_error (GPG_ERR_EACCES);
if (!hd->found.n_packets) { if (!hd->found.n_packets) {

2
g10/keyring.h
View File

@ -24,7 +24,7 @@
typedef struct keyring_handle *KEYRING_HANDLE; typedef struct keyring_handle *KEYRING_HANDLE;
int keyring_register_filename (const char *fname, int secret, int readonly, int keyring_register_filename (const char *fname, int secret, int read_only,
void **ptr); void **ptr);
int keyring_is_writable (void *token); int keyring_is_writable (void *token);

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2009-12-15 Werner Koch <wk@g10code.com>
* iso7816.c (do_generate_keypair): s/readonly/read_only/ because
the first is a keyword in VMS C.
2009-12-03 Werner Koch <wk@g10code.com> 2009-12-03 Werner Koch <wk@g10code.com>
* scdaemon.c (set_debug): Allow for numerical debug leveles. Print * scdaemon.c (set_debug): Allow for numerical debug leveles. Print

2
scd/app-p15.c
View File

@ -2178,7 +2178,7 @@ TokenInfo ::= SEQUENCE {
} (CONSTRAINED BY { -- Each AlgorithmInfo.reference value must be unique --}) } (CONSTRAINED BY { -- Each AlgorithmInfo.reference value must be unique --})
TokenFlags ::= BIT STRING { TokenFlags ::= BIT STRING {
readonly (0), readOnly (0),
loginRequired (1), loginRequired (1),
prnGeneration (2), prnGeneration (2),
eidCompliant (3) eidCompliant (3)

4
scd/iso7816.c
View File

@ -640,7 +640,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)
@ -653,7 +653,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);