aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-support.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-09-13 18:46:41 +0000
committerWerner Koch <[email protected]>2016-09-13 18:46:41 +0000
commit4491ef0a9a15d3b307d1ade37ff620ef9fcb2478 (patch)
tree77fb1d5d29642ab7efa62d4a5e02d004f041b9b1 /tests/gpg/t-support.h
parentcore: Do not pass const char* to functions taking a char*. (diff)
downloadgpgme-4491ef0a9a15d3b307d1ade37ff620ef9fcb2478.tar.gz
gpgme-4491ef0a9a15d3b307d1ade37ff620ef9fcb2478.zip
tests: Use gpgme_io_write in passhrase callbacks.
* tests/gpg/t-support.h (passphrase_cb): Use gpgme_io_write. * tests/gpgsm/t-support.h (passphrase_cb): Ditto. * tests/run-support.h (passphrase_cb): Ditto. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tests/gpg/t-support.h')
-rw-r--r--tests/gpg/t-support.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h
index 6a18b5cb..7a0b9f9b 100644
--- a/tests/gpg/t-support.h
+++ b/tests/gpg/t-support.h
@@ -76,27 +76,25 @@ gpgme_error_t
passphrase_cb (void *opaque, const char *uid_hint, const char *passphrase_info,
int last_was_bad, int fd)
{
-#ifdef HAVE_W32_SYSTEM
- DWORD written;
- WriteFile ((HANDLE) fd, "abc\n", 4, &written, 0);
-#else
int res;
- char *pass = "abc\n";
+ char pass[] = "abc\n";
int passlen = strlen (pass);
int off = 0;
+ (void)opaque;
+ (void)uid_hint;
+ (void)passphrase_info;
+ (void)last_was_bad;
+
do
{
- res = write (fd, &pass[off], passlen - off);
+ res = gpgme_io_write (fd, &pass[off], passlen - off);
if (res > 0)
off += res;
}
while (res > 0 && off != passlen);
return off == passlen ? 0 : gpgme_error_from_errno (errno);
-#endif
-
- return 0;
}