james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rework some stuff to size_t

Browse Source
This commit is contained in:
Klas Lindfors
2014-06-24 15:02:26 +02:00
parent 05a30e1da5
commit c5696d4b45
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ykpiv.c
+5 -4
View File
@@ -61,7 +61,7 @@ static int set_length(unsigned char *buffer, int length) {
} }
} }
static int get_length(unsigned char *buffer, int *len) { static int get_length(unsigned char *buffer, size_t *len) {
if(buffer[0] < 0x81) { if(buffer[0] < 0x81) {
*len = buffer[0]; *len = buffer[0];
return 1; return 1;
@@ -69,7 +69,8 @@ static int get_length(unsigned char *buffer, int *len) {
*len = buffer[1]; *len = buffer[1];
return 2; return 2;
} else if((*buffer & 0x7f) == 2) { } else if((*buffer & 0x7f) == 2) {
*len = (buffer[1] << 8) + buffer[2]; size_t tmp = buffer[1];
*len = (tmp << 8) + buffer[2];
return 3; return 3;
} }
return 0; return 0;
@@ -461,7 +462,7 @@ ykpiv_rc ykpiv_parse_key(ykpiv_state *state,
ykpiv_rc ykpiv_sign_data(ykpiv_state *state, ykpiv_rc ykpiv_sign_data(ykpiv_state *state,
const unsigned char *sign_in, int in_len, const unsigned char *sign_in, int in_len,
unsigned char *sign_out, int *out_len, unsigned char *sign_out, size_t *out_len,
unsigned char algorithm, unsigned char key) { unsigned char algorithm, unsigned char key) {
unsigned char indata[1024]; unsigned char indata[1024];
@@ -471,7 +472,7 @@ ykpiv_rc ykpiv_sign_data(ykpiv_state *state,
unsigned long recv_len = sizeof(data); unsigned long recv_len = sizeof(data);
int sw; int sw;
int bytes; int bytes;
int len = 0; size_t len = 0;
ykpiv_rc res; ykpiv_rc res;
if(in_len > 1000) { if(in_len > 1000) {
lib/ykpiv.h
+1 -1
View File
@@ -74,7 +74,7 @@ extern "C"
ykpiv_rc ykpiv_parse_key(ykpiv_state *state, ykpiv_rc ykpiv_parse_key(ykpiv_state *state,
const char *key_in, unsigned char *key_out); const char *key_in, unsigned char *key_out);
ykpiv_rc ykpiv_sign_data(ykpiv_state *state, const unsigned char *sign_in, ykpiv_rc ykpiv_sign_data(ykpiv_state *state, const unsigned char *sign_in,
int in_len,unsigned char *sign_out, int *out_len, int in_len,unsigned char *sign_out, size_t *out_len,
unsigned char algorithm, unsigned char key); unsigned char algorithm, unsigned char key);
ykpiv_rc ykpiv_get_version(ykpiv_state *state, char *version, size_t len); ykpiv_rc ykpiv_get_version(ykpiv_state *state, char *version, size_t len);
ykpiv_rc ykpiv_verify(ykpiv_state *state, const char *pin, int *tries); ykpiv_rc ykpiv_verify(ykpiv_state *state, const char *pin, int *tries);
tool/yubico-piv-tool.c
+2 -2
View File
@@ -601,7 +601,7 @@ static bool request_certificate(ykpiv_state *state, enum enum_key_format key_for
} }
{ {
unsigned char signature[1024]; unsigned char signature[1024];
int sig_len = sizeof(signature); size_t sig_len = sizeof(signature);
if(ykpiv_sign_data(state, signinput, len, signature, &sig_len, algorithm, key) if(ykpiv_sign_data(state, signinput, len, signature, &sig_len, algorithm, key)
!= YKPIV_OK) { != YKPIV_OK) {
goto request_out; goto request_out;
@@ -737,7 +737,7 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo
} }
{ {
unsigned char signature[1024]; unsigned char signature[1024];
int sig_len = sizeof(signature); size_t sig_len = sizeof(signature);
if(ykpiv_sign_data(state, signinput, len, signature, &sig_len, algorithm, key) if(ykpiv_sign_data(state, signinput, len, signature, &sig_len, algorithm, key)
!= YKPIV_OK) { != YKPIV_OK) {
goto selfsign_out; goto selfsign_out;