aboutsummaryrefslogtreecommitdiffstats
path: root/src/pki/commands/req.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/req.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/req.c')
-rw-r--r--src/pki/commands/req.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/pki/commands/req.c b/src/pki/commands/req.c
index 628463e7b..64609597d 100644
--- a/src/pki/commands/req.c
+++ b/src/pki/commands/req.c
@@ -16,6 +16,7 @@
*/
#include <time.h>
+#include <errno.h>
#include "pki.h"
@@ -118,7 +119,11 @@ static int req()
{
chunk_t chunk;
- chunk = chunk_from_fd(0);
+ if (!chunk_from_fd(0, &chunk))
+ {
+ fprintf(stderr, "reading private key failed: %s\n", strerror(errno));
+ return 1;
+ }
private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, type,
BUILD_BLOB, chunk, BUILD_END);
free(chunk.ptr);