Module Name: src
Committed By: agc
Date: Tue Mar 11 17:38:48 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c
Log Message:
cast arguments to the correct type for format strings
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 Tue Mar 11 17:21:05 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Tue Mar 11 17:38:48 2014
@@ -1994,7 +1994,7 @@ setup_data(pgpv_cursor_t *cursor, pgpv_t
if (is_armored(buf, sizeof(buf))) {
read_ascii_armor_file(cursor, p);
} else {
- read_binary_file(pgp, "signature", "%s", p);
+ read_binary_file(pgp, "signature", "%s", (const char *)p);
}
fclose(fp);
} else {
@@ -2672,7 +2672,7 @@ pgpv_read_pubring(pgpv_t *pgp, const voi
if (keyring) {
return (size > 0) ?
read_binary_memory(pgp, "pubring", keyring, (size_t)size) :
- read_binary_file(pgp, "pubring", "%s", keyring);
+ read_binary_file(pgp, "pubring", "%s", (const char *)keyring);
}
return read_binary_file(pgp, "pubring", "%s/%s", nonnull_getenv("HOME"), ".gnupg/pubring.gpg");
}
@@ -2687,7 +2687,7 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const
return 0;
}
if (keyring) {
- if (!read_ssh_file(pgp, &primary, "%s", keyring)) {
+ if (!read_ssh_file(pgp, &primary, "%s", (const char *)keyring)) {
return 0;
}
} else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
