diff options
| author | NIIBE Yutaka <[email protected]> | 2016-10-18 11:40:09 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-10-18 11:48:08 +0000 |
| commit | f1845f25dbea79c191427710fa56ed01e63a045b (patch) | |
| tree | 5f3e397bb85705eda8fae6aed0de80bc8c982f08 /scd/iso7816.c | |
| parent | Register DCO for Arnaud Fontaine (diff) | |
| download | gnupg-f1845f25dbea79c191427710fa56ed01e63a045b.tar.gz gnupg-f1845f25dbea79c191427710fa56ed01e63a045b.zip | |
scd: minor cleanup to merge other works.
* scd/iso7816.c (do_generate_keypair): Use const char * for DATA.
(iso7816_generate_keypair, iso7816_read_public_key): Likewise.
* scd/app-openpgp.c (get_public_key): Follow the change.
(do_genkey): Ditto. Use ERR instead of RC. Use u32 for CREATED_AT.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/iso7816.c')
| -rw-r--r-- | scd/iso7816.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scd/iso7816.c b/scd/iso7816.c index 515e21fe6..28cd2eb96 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -604,8 +604,7 @@ iso7816_internal_authenticate (int slot, int extended_mode, (e.g. 4096 bytes), a value larger 256 used that value. */ static gpg_error_t do_generate_keypair (int slot, int extended_mode, int read_only, - const unsigned char *data, size_t datalen, - int le, + const char *data, size_t datalen, int le, unsigned char **result, size_t *resultlen) { int sw; @@ -617,7 +616,7 @@ do_generate_keypair (int slot, int extended_mode, int read_only, sw = apdu_send_le (slot, extended_mode, 0x00, CMD_GENERATE_KEYPAIR, read_only? 0x81:0x80, 0, - datalen, (const char*)data, + datalen, data, le >= 0 && le < 256? 256:le, result, resultlen); if (sw != SW_SUCCESS) @@ -635,7 +634,7 @@ do_generate_keypair (int slot, int extended_mode, int read_only, gpg_error_t iso7816_generate_keypair (int slot, int extended_mode, - const unsigned char *data, size_t datalen, + const char *data, size_t datalen, int le, unsigned char **result, size_t *resultlen) { @@ -646,7 +645,7 @@ iso7816_generate_keypair (int slot, int extended_mode, gpg_error_t iso7816_read_public_key (int slot, int extended_mode, - const unsigned char *data, size_t datalen, + const char *data, size_t datalen, int le, unsigned char **result, size_t *resultlen) { |