[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU shishi branch, master, updated. shishi-1-0-2-16-gc11ad1d
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU shishi branch, master, updated. shishi-1-0-2-16-gc11ad1d |
|
Date: |
Tue, 21 May 2013 21:33:49 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".
http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=c11ad1da65c6dc131b19168e2b8f4f8dfaba57c3
The branch, master has been updated
via c11ad1da65c6dc131b19168e2b8f4f8dfaba57c3 (commit)
via 80a4b4b1732174bb2767989dccc69ce0fe0b8965 (commit)
from 754b091599eceb7f770a8b007dd720b09e4edcb9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c11ad1da65c6dc131b19168e2b8f4f8dfaba57c3
Author: Mats Erik Andersson <address@hidden>
Date: Tue May 21 00:01:13 2013 +0200
Format string directives for size_t.
Many format string warnings on 64-bit systems
are mended. Most of them have "%d" replaced
by "%zu". A few other conversions are made.
commit 80a4b4b1732174bb2767989dccc69ce0fe0b8965
Author: Mats Erik Andersson <address@hidden>
Date: Mon May 20 22:19:51 2013 +0200
tests: Small fixes.
Setting LD_LIBRARY_PATH in TESTS_ENVIRONMENT avoids
false negatives on NetBSD. Fix multiple format
strings to use "%zu" when printing type size_t.
-----------------------------------------------------------------------
Summary of changes:
db/file.c | 4 ++--
examples/server.c | 6 +++---
lib/apreq.c | 8 ++++----
lib/crypto.c | 28 ++++++++++++++--------------
lib/kdcrep.c | 8 ++++----
lib/kdcreq.c | 8 ++++----
lib/keytab.c | 8 ++++----
lib/password.c | 6 +++---
lib/starttls.c | 8 ++++----
lib/tkt.c | 4 ++--
lib/tktccache.c | 2 +-
lib/tkts.c | 10 +++++-----
src/ccache2shishi.c | 4 ++--
src/kdc.c | 6 +++---
src/keytab2shishi.c | 8 ++++----
src/server.c | 24 ++++++++++++------------
src/starttls.c | 40 ++++++++++++++++++++--------------------
tests/Makefile.am | 1 +
tests/crypto-ctx.c | 10 +++++-----
tests/crypto.c | 28 ++++++++++++++--------------
tests/rijndael.c | 10 +++++-----
tests/ticketset.c | 14 +++++++-------
tests/utils.c | 2 +-
23 files changed, 124 insertions(+), 123 deletions(-)
diff --git a/db/file.c b/db/file.c
index 3ff77b6..a6d09a1 100644
--- a/db/file.c
+++ b/db/file.c
@@ -600,7 +600,7 @@ shisa_file_key_add (Shisa * dbh,
do
{
free (file);
- asprintf (&file, "keys/%d-%d-%d.key", key->kvno, key->etype, num++);
+ asprintf (&file, "keys/%d-%d-%zu.key", key->kvno, key->etype, num++);
}
while (_shisa_isfile4 (info->path, realm, principal, file));
fh = _shisa_fopen4 (info->path, realm, principal, file, "w");
@@ -611,7 +611,7 @@ shisa_file_key_add (Shisa * dbh,
return SHISA_ADD_KEY_ERROR;
}
- fprintf (fh, "%u %u %u %u %u %u\n", key->etype, key->keylen,
+ fprintf (fh, "%u %zu %zu %zu %zu %u\n", key->etype, key->keylen,
key->saltlen, key->str2keyparamlen, passwdlen, key->priority);
if (key->keylen > 0)
fwrite (key->key, 1, key->keylen, fh);
diff --git a/examples/server.c b/examples/server.c
index 9e1e691..5b89cae 100644
--- a/examples/server.c
+++ b/examples/server.c
@@ -158,17 +158,17 @@ auth (Shishi * h, int verbose, const char *cname, const
char *sname)
rc = shishi_authenticator_client (h, shishi_ap_authenticator (ap),
&buf, &buflen);
- printf ("Client name (from authenticator): %.*s\n", buflen, buf);
+ printf ("Client name (from authenticator): %.*s\n", (int) buflen, buf);
free (buf);
rc = shishi_encticketpart_clientrealm
(h, shishi_tkt_encticketpart (shishi_ap_tkt (ap)), &buf, &buflen);
- printf ("Client name (from encticketpart): %.*s\n", buflen, buf);
+ printf ("Client name (from encticketpart): %.*s\n", (int) buflen, buf);
free (buf);
rc = shishi_ticket_server (h, shishi_tkt_ticket (shishi_ap_tkt (ap)),
&buf, &buflen);
- printf ("Server name (from ticket): %.*s\n", buflen, buf);
+ printf ("Server name (from ticket): %.*s\n", (int) buflen, buf);
free (buf);
/* User is authenticated. */
diff --git a/lib/apreq.c b/lib/apreq.c
index 23f6fca..f73ba5a 100644
--- a/lib/apreq.c
+++ b/lib/apreq.c
@@ -468,13 +468,13 @@ shishi_apreq_set_ticket (Shishi * handle, Shishi_asn1
apreq,
if (res != SHISHI_OK)
return res;
- asprintf (&format, "sname.name-string.?%d", i);
+ asprintf (&format, "sname.name-string.?%zu", i);
res = shishi_asn1_read (handle, ticket, format, &buf, &buflen);
free (format);
if (res != SHISHI_OK)
return res;
- asprintf (&format, "ticket.sname.name-string.?%d", i);
+ asprintf (&format, "ticket.sname.name-string.?%zu", i);
res = shishi_asn1_write (handle, apreq, format, buf, buflen);
free (format);
free (buf);
@@ -740,13 +740,13 @@ shishi_apreq_get_ticket (Shishi * handle,
if (res != SHISHI_OK)
goto error;
- asprintf (&format, "ticket.sname.name-string.?%d", i);
+ asprintf (&format, "ticket.sname.name-string.?%zu", i);
res = shishi_asn1_read (handle, apreq, format, &buf, &buflen);
free (format);
if (res != SHISHI_OK)
goto error;
- asprintf (&format, "sname.name-string.?%d", i);
+ asprintf (&format, "sname.name-string.?%zu", i);
res = shishi_asn1_write (handle, *ticket, format, buf, buflen);
free (format);
free (buf);
diff --git a/lib/crypto.c b/lib/crypto.c
index a323be0..84f6035 100644
--- a/lib/crypto.c
+++ b/lib/crypto.c
@@ -228,7 +228,7 @@ _shishi_simplified_derivekey (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
- printf ("\t ;; simplified_derivekey out (%d):\n",
+ printf ("\t ;; simplified_derivekey out (%zu):\n",
shishi_key_length (derivedkey));
_shishi_hexprint (shishi_key_value (derivedkey),
shishi_key_length (derivedkey));
@@ -1055,7 +1055,7 @@ shishi_checksum (Shishi * handle,
{
printf ("checksum (%s, %d, in, out)\n",
shishi_key_name (key), cksumtype);
- printf ("\t ;; key (%d):\n", shishi_key_length (key));
+ printf ("\t ;; key (%zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
printf ("\t ;; in:\n");
_shishi_escapeprint (in, inlen);
@@ -1117,7 +1117,7 @@ shishi_verify (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
printf ("verify (%s, %d, in, out)\n", shishi_key_name (key), cksumtype);
- printf ("\t ;; key (%d):\n", shishi_key_length (key));
+ printf ("\t ;; key (%zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
printf ("\t ;; data:\n");
_shishi_escapeprint (in, inlen);
@@ -1197,14 +1197,14 @@ shishi_encrypt_ivupdate_etype (Shishi * handle,
{
printf ("encrypt (type=%s, usage=%d, key, in)\n",
shishi_key_name (key), keyusage);
- printf ("\t ;; key (%d):\n", shishi_key_length (key));
+ printf ("\t ;; key (%zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
- printf ("\t ;; in (%d):\n", inlen);
+ printf ("\t ;; in (%zu):\n", inlen);
_shishi_escapeprint (in, inlen);
_shishi_hexprint (in, inlen);
if (iv)
{
- printf ("\t ;; iv (%d):\n", ivlen);
+ printf ("\t ;; iv (%zu):\n", ivlen);
_shishi_escapeprint (iv, ivlen);
_shishi_hexprint (iv, ivlen);
}
@@ -1507,14 +1507,14 @@ shishi_decrypt_ivupdate_etype (Shishi * handle,
{
printf ("decrypt (type=%s, usage=%d, key, in, out)\n",
shishi_key_name (key), keyusage);
- printf ("\t ;; key (%d):\n", shishi_key_length (key));
+ printf ("\t ;; key (%zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
- printf ("\t ;; in (%d):\n", inlen);
+ printf ("\t ;; in (%zu):\n", inlen);
_shishi_escapeprint (in, inlen);
_shishi_hexprint (in, inlen);
if (iv)
{
- printf ("\t ;; iv (%d):\n", ivlen);
+ printf ("\t ;; iv (%zu):\n", ivlen);
_shishi_escapeprint (iv, ivlen);
_shishi_hexprint (iv, ivlen);
}
@@ -1913,9 +1913,9 @@ shishi_dr (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
- printf ("dr (%s, key, prfconstant, %d)\n",
+ printf ("dr (%s, key, prfconstant, %zu)\n",
shishi_cipher_name (shishi_key_type (key)), derivedrandomlen);
- printf ("\t ;; key (length %d):\n", shishi_key_length (key));
+ printf ("\t ;; key (length %zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
_shishi_binprint (shishi_key_value (key), shishi_key_length (key));
printf ("\t ;; prfconstant %s':\n", prfconstant);
@@ -1939,7 +1939,7 @@ shishi_dr (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
- printf ("\t ;; possibly nfolded prfconstant (length %d):\n", blocksize);
+ printf ("\t ;; possibly nfolded prfconstant (length %zu):\n", blocksize);
_shishi_escapeprint (nfoldprfconstant, blocksize);
_shishi_hexprint (nfoldprfconstant, blocksize);
_shishi_binprint (nfoldprfconstant, blocksize);
@@ -1965,7 +1965,7 @@ shishi_dr (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
- printf ("\t ;; derived random (length %d):\n", derivedrandomlen);
+ printf ("\t ;; derived random (length %zu):\n", derivedrandomlen);
_shishi_hexprint (derivedrandom, derivedrandomlen);
_shishi_binprint (derivedrandom, derivedrandomlen);
}
@@ -1998,7 +1998,7 @@ shishi_dk (Shishi * handle,
if (VERBOSECRYPTO (handle))
{
printf ("dk (%s, key, prfconstant)\n", shishi_key_name (key));
- printf ("\t ;; key (length %d):\n", shishi_key_length (key));
+ printf ("\t ;; key (length %zu):\n", shishi_key_length (key));
_shishi_hexprint (shishi_key_value (key), shishi_key_length (key));
_shishi_binprint (shishi_key_value (key), shishi_key_length (key));
printf ("\t ;; prfconstant:\n");
diff --git a/lib/kdcrep.c b/lib/kdcrep.c
index 966ba6a..0f9bace 100644
--- a/lib/kdcrep.c
+++ b/lib/kdcrep.c
@@ -433,13 +433,13 @@ shishi_kdcrep_get_ticket (Shishi * handle,
if (res != SHISHI_OK)
goto error;
- format = xasprintf ("ticket.sname.name-string.?%d", i);
+ format = xasprintf ("ticket.sname.name-string.?%zu", i);
res = shishi_asn1_read (handle, kdcrep, format, &buf, &buflen);
free (format);
if (res != SHISHI_OK)
goto error;
- format = xasprintf ("sname.name-string.?%d", i);
+ format = xasprintf ("sname.name-string.?%zu", i);
res = shishi_asn1_write (handle, *ticket, format, buf, buflen);
free (format);
free (buf);
@@ -549,13 +549,13 @@ shishi_kdcrep_set_ticket (Shishi * handle, Shishi_asn1
kdcrep,
if (res != SHISHI_OK)
return res;
- format = xasprintf ("sname.name-string.?%d", i);
+ format = xasprintf ("sname.name-string.?%zu", i);
res = shishi_asn1_read (handle, ticket, format, &buf, &buflen);
free (format);
if (res != SHISHI_OK)
return res;
- format = xasprintf ("ticket.sname.name-string.?%d", i);
+ format = xasprintf ("ticket.sname.name-string.?%zu", i);
res = shishi_asn1_write (handle, kdcrep, format, buf, buflen);
free (format);
free (buf);
diff --git a/lib/kdcreq.c b/lib/kdcreq.c
index f882716..01d04bb 100644
--- a/lib/kdcreq.c
+++ b/lib/kdcreq.c
@@ -1142,7 +1142,7 @@ shishi_kdcreq_get_padata (Shishi * handle,
{
int32_t patype;
- asprintf (&format, "padata.?%d.padata-type", i);
+ asprintf (&format, "padata.?%zu.padata-type", i);
res = shishi_asn1_read_int32 (handle, kdcreq, format, &patype);
free (format);
if (res != SHISHI_OK)
@@ -1150,7 +1150,7 @@ shishi_kdcreq_get_padata (Shishi * handle,
if (patype == (int32_t) padatatype)
{
- asprintf (&format, "padata.?%d.padata-value", i);
+ asprintf (&format, "padata.?%zu.padata-value", i);
res = shishi_asn1_read (handle, kdcreq, format, out, outlen);
free (format);
if (res != SHISHI_OK)
@@ -1234,13 +1234,13 @@ shishi_kdcreq_add_padata (Shishi * handle,
if (res != SHISHI_OK)
return res;
- asprintf (&format, "padata.?%d.padata-value", i);
+ asprintf (&format, "padata.?%zu.padata-value", i);
res = shishi_asn1_write (handle, kdcreq, format, data, datalen);
free (format);
if (res != SHISHI_OK)
return res;
- asprintf (&format, "padata.?%d.padata-type", i);
+ asprintf (&format, "padata.?%zu.padata-type", i);
res = shishi_asn1_write_uint32 (handle, kdcreq, format, padatatype);
free (format);
if (res != SHISHI_OK)
diff --git a/lib/keytab.c b/lib/keytab.c
index 6bd72dd..46a3c33 100644
--- a/lib/keytab.c
+++ b/lib/keytab.c
@@ -56,7 +56,7 @@ shishi_keys_add_keytab_mem (Shishi * handle,
if (VERBOSENOISE (handle))
{
- printf ("keytab len %d (0x%x)\n", len, len);
+ printf ("keytab len %zu (0x%zx)\n", len, len);
_shishi_hexprint (data, len);
}
@@ -80,7 +80,7 @@ shishi_keys_add_keytab_mem (Shishi * handle,
if (VERBOSENOISE (handle))
{
printf ("keytab size %d (%x)\n", size, size);
- printf ("keytab pos %d < %d\n", entrystartpos + size, len);
+ printf ("keytab pos %zu < %zu\n", entrystartpos + size, len);
}
if (entrystartpos + size > len)
@@ -204,7 +204,7 @@ shishi_keys_add_keytab_mem (Shishi * handle,
pos += 2;
if (VERBOSENOISE (handle))
- printf ("keytab keylen %d (0x%x) eq? %d\n", keylen, keylen,
+ printf ("keytab keylen %d (0x%x) eq? %zu\n", keylen, keylen,
shishi_key_length (key));
if (VERBOSENOISE (handle))
@@ -538,7 +538,7 @@ shishi_keys_to_keytab_mem (Shishi * handle,
if (VERBOSENOISE (handle))
{
- printf ("keys_to_keytab len %d (0x%x)\n", *len, *len);
+ printf ("keys_to_keytab len %zu (0x%zx)\n", *len, *len);
_shishi_hexprint (*out, *len);
}
diff --git a/lib/password.c b/lib/password.c
index e33d096..698df79 100644
--- a/lib/password.c
+++ b/lib/password.c
@@ -124,7 +124,7 @@ shishi_prompt_password (Shishi * handle, char **s, const
char *format, ...)
if (VERBOSENOISE (handle))
{
size_t i;
- printf ("Read password (length %d): ", strlen (*s));
+ printf ("Read password (length %zu): ", strlen (*s));
for (i = 0; i < strlen (*s); i++)
printf ("%02x ", (*s)[i] & 0xFF);
printf ("\n");
@@ -151,7 +151,7 @@ shishi_prompt_password (Shishi * handle, char **s, const
char *format, ...)
if (VERBOSENOISE (handle))
{
size_t i;
- printf ("Password converted to %s (length %d): ",
+ printf ("Password converted to %s (length %zu): ",
strcasecmp (handle->stringprocess, "stringprep") == 0 ?
"UTF-8" : handle->stringprocess, strlen (*s));
for (i = 0; i < strlen (*s); i++)
@@ -175,7 +175,7 @@ shishi_prompt_password (Shishi * handle, char **s, const
char *format, ...)
if (VERBOSENOISE (handle))
{
size_t i;
- printf ("Stringprep'ed password (length %d): ", strlen (*s));
+ printf ("Stringprep'ed password (length %zu): ", strlen (*s));
for (i = 0; i < strlen (*s); i++)
printf ("%02x ", (*s)[i] & 0xFF);
printf ("\n");
diff --git a/lib/starttls.c b/lib/starttls.c
index bc46345..b8f27c0 100644
--- a/lib/starttls.c
+++ b/lib/starttls.c
@@ -168,14 +168,14 @@ _shishi_sendrecv_tls1 (Shishi * handle,
bytes_sent = gnutls_record_send (session, tmpbuf, 4);
if (bytes_sent != 4)
{
- shishi_error_printf (handle, "Bad TLS write (%d < 4)", bytes_sent);
+ shishi_error_printf (handle, "Bad TLS write (%zu < 4)", bytes_sent);
return SHISHI_SENDTO_ERROR;
}
bytes_sent = gnutls_record_send (session, indata, inlen);
if (bytes_sent != (ssize_t) inlen)
{
- shishi_error_printf (handle, "Bad TLS write (%d < %d)",
+ shishi_error_printf (handle, "Bad TLS write (%zu < %zu)",
bytes_sent, inlen);
return SHISHI_SENDTO_ERROR;
}
@@ -183,7 +183,7 @@ _shishi_sendrecv_tls1 (Shishi * handle,
bytes_read = gnutls_record_recv (session, tmpbuf, 4);
if (bytes_read != 4)
{
- shishi_error_printf (handle, "Bad TLS read (%d < 4)", bytes_read);
+ shishi_error_printf (handle, "Bad TLS read (%zu < 4)", bytes_read);
return SHISHI_SENDTO_ERROR;
}
@@ -207,7 +207,7 @@ _shishi_sendrecv_tls1 (Shishi * handle,
}
else if (bytes_read != (ssize_t) * outlen)
{
- shishi_error_printf (handle, "TLS Read error (%d != %d)",
+ shishi_error_printf (handle, "TLS Read error (%zu != %zu)",
*outlen, bytes_read);
free (*outdata);
return SHISHI_RECVFROM_ERROR;
diff --git a/lib/tkt.c b/lib/tkt.c
index ae57bb5..a6b7f2a 100644
--- a/lib/tkt.c
+++ b/lib/tkt.c
@@ -1063,7 +1063,7 @@ shishi_tkt_lastreq (Shishi_tkt * tkt,
for (i = 1; i <= n; i++)
{
- asprintf (&format, "last-req.?%d.lr-type", i);
+ asprintf (&format, "last-req.?%zu.lr-type", i);
res = shishi_asn1_read_int32 (tkt->handle, tkt->enckdcreppart,
format, &tmplrtype);
free (format);
@@ -1072,7 +1072,7 @@ shishi_tkt_lastreq (Shishi_tkt * tkt,
if (lrtype == tmplrtype)
{
- asprintf (&format, "last-req.?%d.lr-value", i);
+ asprintf (&format, "last-req.?%zu.lr-value", i);
res = shishi_asn1_read (tkt->handle, tkt->enckdcreppart,
format, lrtime, lrtimelen);
free (format);
diff --git a/lib/tktccache.c b/lib/tktccache.c
index 0a193d2..129174f 100644
--- a/lib/tktccache.c
+++ b/lib/tktccache.c
@@ -124,7 +124,7 @@ shishi_tkts_add_ccache_mem (Shishi * handle,
if (VERBOSENOISE (handle))
{
- printf ("ccache len %d (0x%x)\n", len, len);
+ printf ("ccache len %zu (0x%zx)\n", len, len);
_shishi_hexprint (data, len);
}
diff --git a/lib/tkts.c b/lib/tkts.c
index a92e78f..8b2b503 100644
--- a/lib/tkts.c
+++ b/lib/tkts.c
@@ -990,7 +990,7 @@ recover_preauth_info (Shishi_tkts * tkts,
char *format;
int32_t etype;
- format = xasprintf ("?%d.etype", i);
+ format = xasprintf ("?%zu.etype", i);
rc = shishi_asn1_read_int32 (tkts->handle, einfos, format, &etype);
free (format);
if (rc == SHISHI_OK)
@@ -1010,7 +1010,7 @@ recover_preauth_info (Shishi_tkts * tkts,
/* XXX mem leak. */
- format = xasprintf ("?%d.salt", i);
+ format = xasprintf ("?%zu.salt", i);
rc = shishi_asn1_read (tkts->handle, einfos, format,
&lochint->preauthsalt,
&lochint->preauthsaltlen);
@@ -1020,7 +1020,7 @@ recover_preauth_info (Shishi_tkts * tkts,
if (isinfo2)
{
- format = xasprintf ("?%d.s2kparams", i);
+ format = xasprintf ("?%zu.s2kparams", i);
rc = shishi_asn1_read (tkts->handle, einfos, format,
&lochint->preauths2kparams,
&lochint->preauths2kparamslen);
@@ -1076,7 +1076,7 @@ recover_preauth (Shishi_tkts * tkts,
{
for (i = 1; i <= n; i++)
{
- char *format = xasprintf ("?%d.padata-type", i);
+ char *format = xasprintf ("?%zu.padata-type", i);
int32_t padatatype;
rc = shishi_asn1_read_int32 (tkts->handle, pas, format,
@@ -1099,7 +1099,7 @@ recover_preauth (Shishi_tkts * tkts,
size_t len;
Shishi_asn1 einfos;
- format = xasprintf ("?%d.padata-value", i);
+ format = xasprintf ("?%zu.padata-value", i);
rc = shishi_asn1_read (tkts->handle, pas, format,
&der, &len);
free (format);
diff --git a/src/ccache2shishi.c b/src/ccache2shishi.c
index d859d36..37aff65 100644
--- a/src/ccache2shishi.c
+++ b/src/ccache2shishi.c
@@ -135,8 +135,8 @@ main (int argc, char *argv[])
if (ntkts == 0)
printf (_("No tickets written.\n"));
else
- printf (ngettext ("%d ticket written.\n",
- "%d tickets written.\n", ntkts), ntkts);
+ printf (ngettext ("%zu ticket written.\n",
+ "%zu tickets written.\n", ntkts), ntkts);
}
shishi_tkts_done (&tkts);
diff --git a/src/kdc.c b/src/kdc.c
index f060eca..2c23c51 100644
--- a/src/kdc.c
+++ b/src/kdc.c
@@ -355,8 +355,8 @@ asreq1 (Shishi_as * as)
if (tilllen != 16 || strlen (till) != 15)
{
- syslog (LOG_ERR, "Invalid 'till' field in request (%d): %s", tilllen,
- till);
+ syslog (LOG_ERR, "Invalid 'till' field in request (%zu): %s",
+ tilllen, till);
goto fatal;
}
@@ -1070,7 +1070,7 @@ process (const char *in, size_t inlen, char **out)
node = shishi_der2asn1 (handle, in, inlen);
if (node == NULL)
{
- syslog (LOG_ERR, "Received %d bytes of unknown data", inlen);
+ syslog (LOG_ERR, "Received %zu bytes of unknown data", inlen);
return -1;
}
diff --git a/src/keytab2shishi.c b/src/keytab2shishi.c
index 46033c1..0021e15 100644
--- a/src/keytab2shishi.c
+++ b/src/keytab2shishi.c
@@ -136,8 +136,8 @@ main (int argc, char *argv[])
if (nkeys == 0)
printf (_("No keys written.\n"));
else
- printf (ngettext ("%d key written.\n",
- "%d keys written.\n", nkeys), nkeys);
+ printf (ngettext ("%zu key written.\n",
+ "%zu keys written.\n", nkeys), nkeys);
}
shishi_keys_done (&keys);
@@ -169,8 +169,8 @@ main (int argc, char *argv[])
if (nkeys == 0)
printf (_("No keys written.\n"));
else
- printf (ngettext ("%d key written.\n",
- "%d keys written.\n", nkeys), nkeys);
+ printf (ngettext ("%zu key written.\n",
+ "%zu keys written.\n", nkeys), nkeys);
}
shishi_keys_done (&keys);
diff --git a/src/server.c b/src/server.c
index 459723d..b7461e8 100644
--- a/src/server.c
+++ b/src/server.c
@@ -122,13 +122,13 @@ kdc_send1 (struct listenspec *ls)
while (sent_bytes == -1 && errno == EAGAIN);
if (sent_bytes < 0)
- syslog (LOG_ERR, "Error writing %d bytes to %s on socket %d: %s",
+ syslog (LOG_ERR, "Error writing %zu bytes to %s on socket %d: %s",
ls->bufpos, ls->str, ls->sockfd, strerror (errno));
else if ((size_t) sent_bytes > ls->bufpos)
- syslog (LOG_ERR, "Overlong write (%d > %d) to %s on socket %d",
+ syslog (LOG_ERR, "Overlong write (%zu > %zu) to %s on socket %d",
sent_bytes, ls->bufpos, ls->str, ls->sockfd);
else if ((size_t) sent_bytes < ls->bufpos)
- syslog (LOG_ERR, "Short write (%d < %d) to %s on socket %d",
+ syslog (LOG_ERR, "Short write (%zu < %zu) to %s on socket %d",
sent_bytes, ls->bufpos, ls->str, ls->sockfd);
}
@@ -139,12 +139,12 @@ kdc_send (struct listenspec *ls)
{
if (ls->ai.ai_socktype == SOCK_DGRAM)
syslog (LOG_DEBUG | LOG_DAEMON,
- "Sending %d bytes to %s socket %d via UDP",
+ "Sending %zu bytes to %s socket %d via UDP",
ls->bufpos, ls->clientaddrname, ls->sockfd);
else
{
syslog (LOG_DEBUG | LOG_DAEMON,
- "Sending %d bytes to %s socket %d via %s",
+ "Sending %zu bytes to %s socket %d via %s",
ls->bufpos, ls->str, ls->sockfd, ls->usetls ? "TLS" : "TCP");
if (ls->bufpos + 4 >= sizeof (ls->buf))
@@ -245,12 +245,12 @@ kdc_read (struct listenspec *ls)
{
#ifdef USE_STARTTLS
if (ls->usetls)
- syslog (LOG_ERR, "Corrupt TLS data from %s on socket %d (%d): %s",
+ syslog (LOG_ERR, "Corrupt TLS data from %s on socket %d (%zd): %s",
ls->str, ls->sockfd, read_bytes,
gnutls_strerror (read_bytes));
else
#endif
- syslog (LOG_ERR, "Error reading from %s on socket %d (%d): %s",
+ syslog (LOG_ERR, "Error reading from %s on socket %d (%zd): %s",
ls->str, ls->sockfd, read_bytes, strerror (read_bytes));
return -1;
}
@@ -275,12 +275,12 @@ kdc_read (struct listenspec *ls)
strcpy (ls->clientaddrname, "unknown address");
syslog (LOG_DEBUG | LOG_DAEMON,
- "Read %d bytes from %s on socket %d\n",
+ "Read %zu bytes from %s on socket %d\n",
ls->bufpos, ls->clientaddrname, ls->sockfd);
}
else
syslog (LOG_DEBUG | LOG_DAEMON,
- "Read %d bytes from %s on socket %d\n",
+ "Read %zu bytes from %s on socket %d\n",
ls->bufpos, ls->str, ls->sockfd);
return 0;
@@ -304,7 +304,7 @@ kdc_ready (struct listenspec *ls)
if (ls->ai.ai_socktype == SOCK_STREAM)
syslog (LOG_DEBUG | LOG_DAEMON,
- "Got %d bytes of %d bytes from %s on socket %d\n",
+ "Got %zu bytes of %zu bytes from %s on socket %d\n",
ls->bufpos, waitfor + 4, ls->str, ls->sockfd);
return 0;
@@ -318,7 +318,7 @@ kdc_process (struct listenspec *ls)
ssize_t plen;
syslog (LOG_DEBUG | LOG_DAEMON,
- "Processing %d bytes on socket %d",
+ "Processing %zu bytes on socket %d",
ls->bufpos, ls->sockfd);
if (ls->ai.ai_socktype == SOCK_DGRAM)
@@ -340,7 +340,7 @@ kdc_process (struct listenspec *ls)
}
syslog (LOG_DEBUG | LOG_DAEMON,
- "Generated %d bytes response for socket %d",
+ "Generated %zu bytes response for socket %d",
ls->bufpos, ls->sockfd);
}
diff --git a/src/starttls.c b/src/starttls.c
index fefcf96..c7ae931 100644
--- a/src/starttls.c
+++ b/src/starttls.c
@@ -66,8 +66,8 @@ logcertinfo (gnutls_session session)
GNUTLS_X509_FMT_DER);
if (rc < 0)
{
- syslog (LOG_ERR, "TLS xci[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xci[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
@@ -76,8 +76,8 @@ logcertinfo (gnutls_session session)
md5fingerprint, &md5fingerprintlen);
if (rc != GNUTLS_E_SUCCESS)
{
- syslog (LOG_ERR, "TLS f[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS f[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
@@ -88,16 +88,16 @@ logcertinfo (gnutls_session session)
expiration_time = gnutls_x509_crt_get_expiration_time (cert);
if (expiration_time == (time_t) - 1)
{
- syslog (LOG_ERR, "TLS xcget[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcget[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
activation_time = gnutls_x509_crt_get_activation_time (cert);
if (expiration_time == (time_t) - 1)
{
- syslog (LOG_ERR, "TLS xcgat[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgat[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
@@ -112,32 +112,32 @@ logcertinfo (gnutls_session session)
rc = gnutls_x509_crt_get_dn (cert, NULL, &subjectlen);
if (rc != GNUTLS_E_SUCCESS && rc != GNUTLS_E_SHORT_MEMORY_BUFFER)
{
- syslog (LOG_ERR, "TLS xcgd[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgd[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
subject = xmalloc (++subjectlen);
rc = gnutls_x509_crt_get_dn (cert, subject, &subjectlen);
if (rc != GNUTLS_E_SUCCESS)
{
- syslog (LOG_ERR, "TLS xcgd2[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgd2[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
rc = gnutls_x509_crt_get_issuer_dn (cert, NULL, &issuerlen);
if (rc != GNUTLS_E_SUCCESS && rc != GNUTLS_E_SHORT_MEMORY_BUFFER)
{
- syslog (LOG_ERR, "TLS xcgid[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgid[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
issuer = xmalloc (++issuerlen);
rc = gnutls_x509_crt_get_issuer_dn (cert, issuer, &issuerlen);
if (rc != GNUTLS_E_SUCCESS)
{
- syslog (LOG_ERR, "TLS xcgid2[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgid2[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
@@ -145,16 +145,16 @@ logcertinfo (gnutls_session session)
rc = gnutls_x509_crt_get_serial (cert, NULL, &seriallen);
if (rc != GNUTLS_E_SUCCESS && rc != GNUTLS_E_SHORT_MEMORY_BUFFER)
{
- syslog (LOG_ERR, "TLS xcgs[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgs[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
serial = xmalloc (seriallen);
rc = gnutls_x509_crt_get_serial (cert, serial, &seriallen);
if (rc != GNUTLS_E_SUCCESS)
{
- syslog (LOG_ERR, "TLS xcgs2[%d] failed (%d): %s", i,
- rc, gnutls_strerror (rc));
+ syslog (LOG_ERR, "TLS xcgs2[%zu] failed (%d): %s",
+ i, rc, gnutls_strerror (rc));
goto cleanup;
}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 30d2cb5..81e3546 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,6 +36,7 @@ check_PROGRAMS = authenticator crypto gztime priv safe
ticketset \
TESTS = $(check_PROGRAMS)
TESTS_ENVIRONMENT = \
+ LD_LIBRARY_PATH = $(top_builddir)/lib/.libs \
KEYTAB1=$(srcdir)/keytab1.bin \
CCACHE1=$(srcdir)/ccache1.bin \
$(VALGRIND)
diff --git a/tests/crypto-ctx.c b/tests/crypto-ctx.c
index 80e682f..1849cef 100644
--- a/tests/crypto-ctx.c
+++ b/tests/crypto-ctx.c
@@ -73,7 +73,7 @@ test (Shishi * handle)
len = shishi_cipher_randomlen (tvp->etype);
if (len == (size_t) - 1)
{
- fail ("shishi_cipher_randomlen(%d) failed: %d\n", tvp->etype, len);
+ fail ("shishi_cipher_randomlen(%d) failed: %zu\n", tvp->etype, len);
continue;
}
@@ -87,7 +87,7 @@ test (Shishi * handle)
len = shishi_cipher_blocksize (tvp->etype);
if (len == (size_t) - 1)
{
- fail ("shishi_cipher_blocksize (%d) failed: %d\n", tvp->etype, len);
+ fail ("shishi_cipher_blocksize (%d) failed: %zu\n", tvp->etype, len);
continue;
}
@@ -126,7 +126,7 @@ test (Shishi * handle)
err = shishi_crypto_encrypt (ctx, in, j, &out, &len);
if (err)
{
- fail ("shishi_crypto_encrypt(etype=%d, len=%d) failed (%d)\n",
+ fail ("shishi_crypto_encrypt(etype=%d, len=%zu) failed (%d)\n",
tvp->etype, j, err);
continue;
}
@@ -134,7 +134,7 @@ test (Shishi * handle)
err = shishi_crypto_decrypt (ctx2, out, len, &out2, &len2);
if (err)
{
- fail ("shishi_crypto_decrypt(etype=%d, len=%d) failed (%d)\n",
+ fail ("shishi_crypto_decrypt(etype=%d, len=%zu) failed (%d)\n",
tvp->etype, j, err);
continue;
}
@@ -154,7 +154,7 @@ test (Shishi * handle)
fail ("shishi_crypto_encrypt (in1, %d) failed\n", tvp->etype);
continue;
}
- success ("shishi_crypto_encrypt/decrypt(etype=%d, len=%d) OK\n",
+ success ("shishi_crypto_encrypt/decrypt(etype=%d, len=%zu) OK\n",
tvp->etype, j);
}
diff --git a/tests/crypto.c b/tests/crypto.c
index 7778ab3..e64445b 100644
--- a/tests/crypto.c
+++ b/tests/crypto.c
@@ -367,7 +367,7 @@ test (Shishi * handle)
for (i = 0; i < sizeof (drdk) / sizeof (drdk[0]); i++)
{
if (debug)
- printf ("DR entry %d\n", i);
+ printf ("DR entry %zu\n", i);
res = shishi_key_from_value (handle, drdk[i].type, drdk[i].key, &key);
@@ -379,7 +379,7 @@ test (Shishi * handle)
if (res != SHISHI_OK)
{
- fail ("shishi_dr() entry %d failed (%s)\n",
+ fail ("shishi_dr() entry %zu failed (%s)\n",
i, shishi_error (handle));
continue;
}
@@ -419,7 +419,7 @@ test (Shishi * handle)
if (memcmp (drdk[i].dr, out, strlen (drdk[i].dr)) != 0)
{
- fail ("shishi_dr() entry %d failed\n", i);
+ fail ("shishi_dr() entry %zu failed\n", i);
if (debug)
printf ("ERROR\n");
}
@@ -438,7 +438,7 @@ test (Shishi * handle)
if (res != SHISHI_OK)
{
- fail ("shishi_dk() entry %d failed (%s)\n",
+ fail ("shishi_dk() entry %zu failed (%s)\n",
i, shishi_error (handle));
continue;
}
@@ -480,7 +480,7 @@ test (Shishi * handle)
memcmp (drdk[i].dk, shishi_key_value (key2),
strlen (drdk[i].dk)) == 0))
{
- fail ("shishi_dk() entry %d failed\n", i);
+ fail ("shishi_dk() entry %zu failed\n", i);
if (debug)
printf ("ERROR\n");
}
@@ -493,14 +493,14 @@ test (Shishi * handle)
for (i = 0; i < sizeof (nfold) / sizeof (nfold[0]); i++)
{
if (debug)
- printf ("N-FOLD entry %d\n", i);
+ printf ("N-FOLD entry %zu\n", i);
res = shishi_n_fold (handle,
nfold[i].in, strlen (nfold[i].in),
out, nfold[i].n / 8);
if (res != SHISHI_OK)
{
- fail ("shishi_n_fold() entry %d failed (%s)\n",
+ fail ("shishi_n_fold() entry %zu failed (%s)\n",
i, shishi_error (handle));
continue;
}
@@ -531,7 +531,7 @@ test (Shishi * handle)
if (memcmp (nfold[i].out, out, nfold[i].n / 8) != 0)
{
- fail ("shishi_n_fold() entry %d failed\n", i);
+ fail ("shishi_n_fold() entry %zu failed\n", i);
if (debug)
printf ("ERROR\n");
}
@@ -547,7 +547,7 @@ test (Shishi * handle)
const char *name = shishi_cipher_name (str2key[i].etype);
if (debug)
- printf ("STRING-TO-KEY entry %d (key type %s)\n", i,
+ printf ("STRING-TO-KEY entry %zu (key type %s)\n", i,
name ? name : "NO NAME");
res = shishi_key_from_string (handle, str2key[i].etype,
@@ -556,7 +556,7 @@ test (Shishi * handle)
str2key[i].parameters, &key);
if (res != SHISHI_OK)
{
- fail ("shishi_string_to_key() entry %d failed (%s)\n",
+ fail ("shishi_string_to_key() entry %zu failed (%s)\n",
i, shishi_error (handle));
continue;
}
@@ -594,7 +594,7 @@ test (Shishi * handle)
if (memcmp (str2key[i].key, shishi_key_value (key), keylen) != 0)
{
- fail ("shishi_string_to_key() entry %d failed\n", i);
+ fail ("shishi_string_to_key() entry %zu failed\n", i);
if (debug)
printf ("ERROR\n");
@@ -608,7 +608,7 @@ test (Shishi * handle)
for (i = 0; i < sizeof (pkcs5) / sizeof (pkcs5[0]); i++)
{
if (debug)
- printf ("PKCS5 entry %d\n", i);
+ printf ("PKCS5 entry %zu\n", i);
res = shishi_pbkdf2_sha1 (handle,
pkcs5[i].password, strlen (pkcs5[i].password),
@@ -616,7 +616,7 @@ test (Shishi * handle)
pkcs5[i].iterations, pkcs5[i].dklen, out);
if (res != SHISHI_OK)
{
- fail ("PKCS5 entry %d failed fatally: %d\n", i, res);
+ fail ("PKCS5 entry %zu failed fatally: %d\n", i, res);
continue;
}
@@ -653,7 +653,7 @@ test (Shishi * handle)
if (memcmp (pkcs5[i].expected, out, pkcs5[i].dklen) != 0)
{
- fail ("PKCS5 entry %d failed\n", i);
+ fail ("PKCS5 entry %zu failed\n", i);
if (debug)
printf ("ERROR\n");
diff --git a/tests/rijndael.c b/tests/rijndael.c
index 8269d31..0ddb135 100644
--- a/tests/rijndael.c
+++ b/tests/rijndael.c
@@ -124,18 +124,18 @@ test (Shishi * handle)
}
if (err)
- fail ("shishi_aes_cts(%d) failed: %d\n", i, err);
+ fail ("shishi_aes_cts(%zu) failed: %d\n", i, err);
else
{
if (memcmp (out, tv[i].out, tv[i].outlen) == 0)
- success ("shishi_aes_cts(%d) OK\n", i);
+ success ("shishi_aes_cts(%zu) OK\n", i);
else
- fail ("shishi_aes_cts(%d) failure\n", i);
+ fail ("shishi_aes_cts(%zu) failure\n", i);
if (memcmp (ivout, tv[i].nextiv, IVLEN) == 0)
- success ("shishi_aes_cts(%d) IV OK\n", i);
+ success ("shishi_aes_cts(%zu) IV OK\n", i);
else
- fail ("shishi_aes_cts(%d) failure IV\n", i);
+ fail ("shishi_aes_cts(%zu) failure IV\n", i);
free (out);
free (ivout);
diff --git a/tests/ticketset.c b/tests/ticketset.c
index 3d8cc34..2aa6271 100644
--- a/tests/ticketset.c
+++ b/tests/ticketset.c
@@ -139,7 +139,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 0)
success ("shishi_tkts_size() OK\n");
else
@@ -220,7 +220,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 1)
success ("shishi_tkts_size() OK\n");
else
@@ -248,7 +248,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 0)
success ("shishi_tkts_size() OK\n");
else
@@ -271,7 +271,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 1)
success ("shishi_tkts_size() OK\n");
else
@@ -310,7 +310,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 2)
success ("shishi_tkts_size() OK\n");
else
@@ -442,7 +442,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 0)
success ("shishi_tkts_size() OK\n");
else
@@ -478,7 +478,7 @@ test (Shishi * handle)
/* shishi_tkts_size () */
n = shishi_tkts_size (tktset);
if (debug)
- printf ("shishi_tkts_size () => `%d'.\n", n);
+ printf ("shishi_tkts_size () => `%zu'.\n", n);
if (n == 2)
success ("shishi_tkts_size() OK\n");
else
diff --git a/tests/utils.c b/tests/utils.c
index 7084dc9..67f8721 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -64,7 +64,7 @@ escapeprint (const char *str, size_t len)
{
size_t i;
- printf (" (length %d bytes):\n\t", len);
+ printf (" (length %zu bytes):\n\t", len);
for (i = 0; i < len; i++)
{
if (((str[i] & 0xFF) >= 'A' && (str[i] & 0xFF) <= 'Z') ||
hooks/post-receive
--
GNU shishi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU shishi branch, master, updated. shishi-1-0-2-16-gc11ad1d,
Mats Erik Andersson <=