oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

size_t vs int + fix printf

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14725 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-04-04 11:12:31 +00:00
parent 5a1b9bec7a
commit 401620865e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/aes-test.c
View File

@@ -57,7 +57,7 @@ struct {
int saltlen; int saltlen;
int iterations; int iterations;
krb5_enctype enctype; krb5_enctype enctype;
int keylen; size_t keylen;
char *pbkdf2; char *pbkdf2;
char *key; char *key;
} keys[] = { } keys[] = {
@@ -256,8 +256,8 @@ string_to_key_test(krb5_context context)
} }
if (memcmp(key.keyvalue.data, keys[i].pbkdf2, keys[i].keylen) != 0) { if (memcmp(key.keyvalue.data, keys[i].pbkdf2, keys[i].keylen) != 0) {
krb5_warnx(context, "%d: key pbkdf2 pl %d", krb5_warnx(context, "%d: key pbkdf2 pl %lu",
i, password.length); i, (unsigned long)password.length);
val = 1; val = 1;
continue; continue;
} }
@@ -280,8 +280,9 @@ string_to_key_test(krb5_context context)
} }
if (key.keyvalue.length != keys[i].keylen) { if (key.keyvalue.length != keys[i].keylen) {
krb5_warnx(context, "%d: key wrong length (%d/%d)", krb5_warnx(context, "%d: key wrong length (%lu/%lu)",
i, key.keyvalue.length, keys[i].keylen); i, (unsigned long)key.keyvalue.length,
(unsigned long)keys[i].keylen);
val = 1; val = 1;
continue; continue;
} }
@@ -511,7 +512,7 @@ samep(int testn, char *type, const char *p1, const char *p2, size_t len)
} }
static int static int
encryption_test(krb5_context context, char *key, int keylen, encryption_test(krb5_context context, char *key, size_t keylen,
struct enc_test *enc, int numenc) struct enc_test *enc, int numenc)
{ {
char iv[AES_BLOCK_SIZE]; char iv[AES_BLOCK_SIZE];
@@ -653,8 +654,8 @@ krb_enc_mit(krb5_context context,
return ret; return ret;
if (len != cipher->length) { if (len != cipher->length) {
krb5_warnx(context, "c_encrypt_length wrong %d != %d", krb5_warnx(context, "c_encrypt_length wrong %lu != %lu",
len, cipher->length); (unsigned long)len, (unsigned long)cipher->length);
return EINVAL; return EINVAL;
} }