diff options
| author | Werner Koch <[email protected]> | 2009-12-15 11:03:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-12-15 11:03:17 +0000 |
| commit | 34baa18187d51ff54bd44e46cea8c997046f58ff (patch) | |
| tree | 9f67c94a59d6aeff040a2f84a40ad75488dd50ba /scd | |
| parent | Fix bug#1162: error creating home directory (diff) | |
| download | gnupg-34baa18187d51ff54bd44e46cea8c997046f58ff.tar.gz gnupg-34baa18187d51ff54bd44e46cea8c997046f58ff.zip | |
Do not use the VMC C reserved word readonly.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 5 | ||||
| -rw-r--r-- | scd/app-p15.c | 2 | ||||
| -rw-r--r-- | scd/iso7816.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index fed5e0e46..91694a056 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,8 @@ +2009-12-15 Werner Koch <[email protected]> + + * iso7816.c (do_generate_keypair): s/readonly/read_only/ because + the first is a keyword in VMS C. + 2009-12-03 Werner Koch <[email protected]> * scdaemon.c (set_debug): Allow for numerical debug leveles. Print diff --git a/scd/app-p15.c b/scd/app-p15.c index 7d8329366..26fb29d98 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2178,7 +2178,7 @@ TokenInfo ::= SEQUENCE { } (CONSTRAINED BY { -- Each AlgorithmInfo.reference value must be unique --}) TokenFlags ::= BIT STRING { - readonly (0), + readOnly (0), loginRequired (1), prnGeneration (2), eidCompliant (3) diff --git a/scd/iso7816.c b/scd/iso7816.c index e3f2c1beb..b55da4148 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -640,7 +640,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) @@ -653,7 +653,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); |