chunk: Add helper function to create a chunk from data read from a file descriptor

diff --git a/src/libstrongswan/utils/chunk.c b/src/libstrongswan/utils/chunk.c
index f5b3ac675d0c30d1b3479f854d96b46ff1938151..644b8060fe6ba2df62b8c7a01e54ec3910b72362 100644 (file)
--- a/src/libstrongswan/utils/chunk.c
+++ b/src/libstrongswan/utils/chunk.c
@@ -243,6 +243,38 @@ bool chunk_write(chunk_t chunk, char *path, char *label, mode_t mask, bool force
        return good;
 }
 
+/**
+ * Described in header.
+ */
+chunk_t chunk_from_fd(int fd)
+{
+       char buf[8096];
+       char *pos = buf;
+       ssize_t len, total = 0;
+
+       while (TRUE)
+       {
+               len = read(fd, pos, buf + sizeof(buf) - pos);
+               if (len < 0)
+               {
+                       DBG1(DBG_LIB, "reading from file descriptor failed: %s",
+                                strerror(errno));
+                       return chunk_empty;
+               }
+               if (len == 0)
+               {
+                       break;
+               }
+               total += len;
+               if (total == sizeof(buf))
+               {
+                       DBG1(DBG_LIB, "buffer too small to read from file descriptor");
+                       return chunk_empty;
+               }
+       }
+       return chunk_clone(chunk_create(buf, total));
+}
+
 
 /** hex conversion digits */
 static char hexdig_upper[] = "0123456789ABCDEF";

diff --git a/src/libstrongswan/utils/chunk.h b/src/libstrongswan/utils/chunk.h
index 36f6f260e774bc4f8be7e660a74a763d2c527cfe..d3751da704394a2186be13bd2311718e633832ae 100644 (file)
--- a/src/libstrongswan/utils/chunk.h
+++ b/src/libstrongswan/utils/chunk.h
@@ -99,6 +99,14 @@ void chunk_split(chunk_t chunk, const char *mode, ...);
  */
 bool chunk_write(chunk_t chunk, char *path, char *label, mode_t mask, bool force);
 
+/**
+ * Store data read from FD into a chunk
+ *
+ * @param fd                   file descriptor to read from
+ * @return                             chunk or chunk_empty on failure
+ */
+chunk_t chunk_from_fd(int fd);
+
 /**
  * Convert a chunk of data to hex encoding.
  *