aboutsummaryrefslogtreecommitdiffstats
path: root/src/pki/commands/print.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2013-11-21 12:19:20 +0100
committerMartin Willi <martin@revosec.ch>2014-01-23 15:55:32 +0100
commit1c4a3459f72da4391c1befe22e62356d838af46d (patch)
treea60e5be4cf8c95c05b891f84df5ffa1069ec65ef /src/pki/commands/print.c
parent595b6d9a828538072dcf65c276b848a02698fdfe (diff)
downloadstrongswan-1c4a3459f72da4391c1befe22e62356d838af46d.tar.bz2
strongswan-1c4a3459f72da4391c1befe22e62356d838af46d.tar.xz
chunk: Use dynamically allocated buffer in chunk_from_fd()
When acting on files, we can use fstat() to estimate the buffer size. On non-file FDs, we dynamically increase an allocated buffer. Additionally we slightly change the function signature to properly handle zero-length files and add appropriate unit tests.
Diffstat (limited to 'src/pki/commands/print.c')
-rw-r--r--src/pki/commands/print.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pki/commands/print.c b/src/pki/commands/print.c
index 2261e44ff..077c1ef3e 100644
--- a/src/pki/commands/print.c
+++ b/src/pki/commands/print.c
@@ -22,6 +22,7 @@
#include <selectors/traffic_selector.h>
#include <time.h>
+#include <errno.h>
/**
* Print public key information
@@ -510,7 +511,11 @@ static int print()
{
chunk_t chunk;
- chunk = chunk_from_fd(0);
+ if (!chunk_from_fd(0, &chunk))
+ {
+ fprintf(stderr, "reading input failed: %s\n", strerror(errno));
+ return 1;
+ }
cred = lib->creds->create(lib->creds, type, subtype,
BUILD_BLOB, chunk, BUILD_END);
free(chunk.ptr);