10:17 p.m.
This argument seems to always be hard coded to zero.
---
ell/pem.c | 41 ++++++++++++++++++-----------------------
ell/pem.h | 5 ++---
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/ell/pem.c b/ell/pem.c
index 352d461..721a05b 100644
--- a/ell/pem.c
+++ b/ell/pem.c
@@ -124,7 +124,7 @@ static bool is_end_boundary(const uint8_t *buf, size_t buf_len,
return true;
}
-static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len, int index,
+static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
char **type_label, size_t *len,
const uint8_t **endp)
{
@@ -149,24 +149,19 @@ static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
int index,
if (label)
base64_data = eol;
} else if (is_end_boundary(buf, eol - buf, label, label_len)) {
- if (index == 0) {
- data = l_base64_decode(
- (const char *) base64_data,
- buf - base64_data, len);
- if (!data)
- return NULL;
-
- *type_label = l_strndup((const char *) label,
- label_len);
+ data = l_base64_decode(
+ (const char *) base64_data,
+ buf - base64_data, len);
+ if (!data)
+ return NULL;
- if (endp)
- *endp = eol + 1;
+ *type_label = l_strndup((const char *) label,
+ label_len);
- return data;
- }
+ if (endp)
+ *endp = eol + 1;
- base64_data = NULL;
- index--;
+ return data;
}
if (eol == buf + buf_len)
@@ -189,10 +184,10 @@ static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
int index,
}
LIB_EXPORT uint8_t *l_pem_load_buffer(const uint8_t *buf, size_t buf_len,
- int index, char **type_label,
+ char **type_label,
size_t *out_len)
{
- return pem_load_buffer(buf, buf_len, index, type_label, out_len, NULL);
+ return pem_load_buffer(buf, buf_len, type_label, out_len, NULL);
}
struct pem_file_info {
@@ -232,7 +227,7 @@ static void pem_file_close(struct pem_file_info *info)
close(info->fd);
}
-LIB_EXPORT uint8_t *l_pem_load_file(const char *filename, int index,
+LIB_EXPORT uint8_t *l_pem_load_file(const char *filename,
char **type_label, size_t *len)
{
struct pem_file_info file;
@@ -241,7 +236,7 @@ LIB_EXPORT uint8_t *l_pem_load_file(const char *filename, int index,
if (pem_file_open(&file, filename) < 0)
return NULL;
- result = pem_load_buffer(file.data, file.st.st_size, index,
+ result = pem_load_buffer(file.data, file.st.st_size,
type_label, len, NULL);
pem_file_close(&file);
return result;
@@ -300,7 +295,7 @@ LIB_EXPORT struct l_queue *l_pem_load_certificate_list_from_data(
char *label;
struct l_cert *cert;
- der = pem_load_buffer(ptr, end - ptr, 0, &label, &der_len, &ptr);
+ der = pem_load_buffer(ptr, end - ptr, &label, &der_len, &ptr);
if (!der || strcmp(label, "CERTIFICATE")) {
if (der)
@@ -470,7 +465,7 @@ LIB_EXPORT struct l_key *l_pem_load_private_key_from_data(const void
*buf,
if (encrypted)
*encrypted = false;
- content = pem_load_buffer(buf, buf_len, 0, &label, &len, NULL);
+ content = pem_load_buffer(buf, buf_len, &label, &len, NULL);
if (!content)
return NULL;
@@ -505,7 +500,7 @@ LIB_EXPORT struct l_key *l_pem_load_private_key(const char *filename,
if (encrypted)
*encrypted = false;
- content = l_pem_load_file(filename, 0, &label, &len);
+ content = l_pem_load_file(filename, &label, &len);
if (!content)
return NULL;
diff --git a/ell/pem.h b/ell/pem.h
index 41583e2..da5e273 100644
--- a/ell/pem.h
+++ b/ell/pem.h
@@ -33,9 +33,8 @@ struct l_cert;
struct l_certchain;
uint8_t *l_pem_load_buffer(const uint8_t *buf, size_t buf_len,
- int index, char **type_label, size_t *out_len);
-uint8_t *l_pem_load_file(const char *filename, int index,
- char **type_label, size_t *len);
+ char **type_label, size_t *out_len);
+uint8_t *l_pem_load_file(const char *filename, char **type_label, size_t *len);
struct l_certchain *l_pem_load_certificate_chain(const char *filename);
struct l_certchain *l_pem_load_certificate_chain_from_data(const void *buf,
--
2.17.1
10:17 p.m.
New subject: [PATCH v2 2/6] unit: remove index from pem APIs
---
unit/test-key.c | 2 +-
unit/test-pem.c | 2 +-
unit/test-tls.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/unit/test-key.c b/unit/test-key.c
index 1b23059..697ff47 100644
--- a/unit/test-key.c
+++ b/unit/test-key.c
@@ -399,7 +399,7 @@ static struct l_cert *load_cert_file(const char *filename)
char *label;
struct l_cert *cert;
- der = l_pem_load_file(filename, 0, &label, &len);
+ der = l_pem_load_file(filename, &label, &len);
if (!der)
return NULL;
diff --git a/unit/test-pem.c b/unit/test-pem.c
index df396ce..6a927fc 100644
--- a/unit/test-pem.c
+++ b/unit/test-pem.c
@@ -230,7 +230,7 @@ static void test_pem(const void *data)
size_t decoded_size;
decoded = l_pem_load_buffer((const uint8_t *) test->input,
- strlen(test->input), 0,
+ strlen(test->input),
&label, &decoded_size);
if (!test->valid) {
diff --git a/unit/test-tls.c b/unit/test-tls.c
index f4c5cb1..9243e16 100644
--- a/unit/test-tls.c
+++ b/unit/test-tls.c
@@ -214,7 +214,7 @@ static struct l_cert *load_cert_file(const char *filename)
char *label;
struct l_cert *cert;
- der = l_pem_load_file(filename, 0, &label, &len);
+ der = l_pem_load_file(filename, &label, &len);
if (!der)
return NULL;
--
2.17.1
10:17 p.m.
New subject: [PATCH v2 3/6] pem: convert l_pem_load_buffer to take void*
This handles both cases of PEM's being loaded as text data and
as raw bytes. is_{start,end}_boundary was also converted.
---
ell/pem.c | 55 ++++++++++++++++++++++++++++++-------------------------
ell/pem.h | 4 ++--
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/ell/pem.c b/ell/pem.c
index 721a05b..671f162 100644
--- a/ell/pem.c
+++ b/ell/pem.c
@@ -49,11 +49,12 @@
#define PEM_START_BOUNDARY "-----BEGIN "
#define PEM_END_BOUNDARY "-----END "
-static const uint8_t *is_start_boundary(const uint8_t *buf, size_t buf_len,
+static const void *is_start_boundary(const void *buf, size_t buf_len,
size_t *label_len)
{
const uint8_t *start, *end, *ptr;
int prev_special, special;
+ const uint8_t *buf_ptr = buf;
if (buf_len < strlen(PEM_START_BOUNDARY))
return NULL;
@@ -74,7 +75,7 @@ static const uint8_t *is_start_boundary(const uint8_t *buf, size_t
buf_len,
end = start;
prev_special = 1;
- while (end < buf + buf_len && l_ascii_isprint(*end)) {
+ while (end < buf_ptr + buf_len && l_ascii_isprint(*end)) {
special = *end == ' ' || *end == '-';
if (prev_special && special)
@@ -89,11 +90,11 @@ static const uint8_t *is_start_boundary(const uint8_t *buf, size_t
buf_len,
end--;
/* Check we have a "-----" (RFC7468 section 2) */
- if (end + 5 > buf + buf_len || memcmp(end, "-----", 5))
+ if (end + 5 > buf_ptr + buf_len || memcmp(end, "-----", 5))
return NULL;
/* Check all remaining characters are horizontal whitespace (WSP) */
- for (ptr = end + 5; ptr < buf + buf_len; ptr++)
+ for (ptr = end + 5; ptr < buf_ptr + buf_len; ptr++)
if (*ptr != ' ' && *ptr != '\t')
return NULL;
@@ -102,33 +103,36 @@ static const uint8_t *is_start_boundary(const uint8_t *buf, size_t
buf_len,
return start;
}
-static bool is_end_boundary(const uint8_t *buf, size_t buf_len,
- const uint8_t *label, size_t label_len)
+static bool is_end_boundary(const void *buf, size_t buf_len,
+ const char *label, size_t label_len)
{
+ const uint8_t *buf_ptr = buf;
size_t len = strlen(PEM_END_BOUNDARY) + label_len + 5;
if (buf_len < len)
return false;
- if (memcmp(buf, PEM_END_BOUNDARY, strlen(PEM_END_BOUNDARY)) ||
- memcmp(buf + strlen(PEM_END_BOUNDARY),
+ if (memcmp(buf_ptr, PEM_END_BOUNDARY, strlen(PEM_END_BOUNDARY)) ||
+ memcmp(buf_ptr + strlen(PEM_END_BOUNDARY),
label, label_len) ||
- memcmp(buf + (len - 5), "-----", 5))
+ memcmp(buf_ptr + (len - 5), "-----", 5))
return false;
/* Check all remaining characters are horizontal whitespace (WSP) */
for (; len < buf_len; len++)
- if (buf[len] != ' ' && buf[len] != '\t')
+ if (buf_ptr[len] != ' ' && buf_ptr[len] != '\t')
return false;
return true;
}
-static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
+static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
char **type_label, size_t *len,
const uint8_t **endp)
{
- const uint8_t *base64_data = NULL, *label = NULL, *eol;
+ const char *buf_ptr = buf;
+ const char *base64_data = NULL, *eol;
+ const char *label = NULL;
uint8_t *data;
size_t label_len = 0;
@@ -139,19 +143,21 @@ static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
* are not confused for actual PEM "textual encoding".
*/
while (buf_len) {
- for (eol = buf; eol < buf + buf_len; eol++)
+ for (eol = buf_ptr; eol < buf_ptr + buf_len; eol++)
if (*eol == '\r' || *eol == '\n')
break;
if (!base64_data) {
- label = is_start_boundary(buf, eol - buf, &label_len);
+ label = is_start_boundary(buf, eol - buf_ptr,
+ &label_len);
if (label)
base64_data = eol;
- } else if (is_end_boundary(buf, eol - buf, label, label_len)) {
+ } else if (is_end_boundary(buf_ptr, eol - buf_ptr, label,
+ label_len)) {
data = l_base64_decode(
(const char *) base64_data,
- buf - base64_data, len);
+ buf_ptr - base64_data, len);
if (!data)
return NULL;
@@ -159,19 +165,19 @@ static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
label_len);
if (endp)
- *endp = eol + 1;
+ *endp = (uint8_t *)eol + 1;
return data;
}
- if (eol == buf + buf_len)
+ if (eol == buf_ptr + buf_len)
break;
- buf_len -= eol + 1 - buf;
- buf = eol + 1;
+ buf_len -= eol + 1 - buf_ptr;
+ buf_ptr = eol + 1;
- if (buf_len && *eol == '\r' && *buf == '\n') {
- buf++;
+ if (buf_len && *eol == '\r' && *buf_ptr == '\n') {
+ buf_ptr++;
buf_len--;
}
}
@@ -183,9 +189,8 @@ static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
return NULL;
}
-LIB_EXPORT uint8_t *l_pem_load_buffer(const uint8_t *buf, size_t buf_len,
- char **type_label,
- size_t *out_len)
+LIB_EXPORT uint8_t *l_pem_load_buffer(const void *buf, size_t buf_len,
+ char **type_label, size_t *out_len)
{
return pem_load_buffer(buf, buf_len, type_label, out_len, NULL);
}
diff --git a/ell/pem.h b/ell/pem.h
index da5e273..1c93e7a 100644
--- a/ell/pem.h
+++ b/ell/pem.h
@@ -32,8 +32,8 @@ struct l_key;
struct l_cert;
struct l_certchain;
-uint8_t *l_pem_load_buffer(const uint8_t *buf, size_t buf_len,
- char **type_label, size_t *out_len);
+uint8_t *l_pem_load_buffer(const void *buf, size_t buf_len, char **type_label,
+ size_t *out_len);
uint8_t *l_pem_load_file(const char *filename, char **type_label, size_t *len);
struct l_certchain *l_pem_load_certificate_chain(const char *filename);
--
2.17.1
10:17 p.m.
New subject: [PATCH v2 4/6] pem: refactor to expose pem iterator privately
This refactors pem.c to expose a new internal API, pem_next. This
API will allow iteration/parsing of PEM(s). Other APIs in pem.c were
updated to use pem_next.
pem_next behaves similar to pem_load_buffer, except it does not do
any base64 decoding. Instead it just returns the start of the PEM as
a string, and the length as an out parameter. This allows simple
PEM iteration loops. Strictly for pem.c usage we decode the base64
string in the loop, but settings.c will need this for parsing PEMs
from settings files and returning the PEM as a full string, including
the start/end tags.
---
ell/pem-private.h | 31 ++++++++++++++
ell/pem.c | 103 ++++++++++++++++++++++++++++++----------------
2 files changed, 98 insertions(+), 36 deletions(-)
create mode 100644 ell/pem-private.h
diff --git a/ell/pem-private.h b/ell/pem-private.h
new file mode 100644
index 0000000..0073e65
--- /dev/null
+++ b/ell/pem-private.h
@@ -0,0 +1,31 @@
+/*
+ *
+ * Embedded Linux library
+ *
+ * Copyright (C) 2019 Intel Corporation. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <sys/types.h>
+
+const char *pem_next(const void *buf, size_t buf_len, char **type_label,
+ size_t *len);
diff --git a/ell/pem.c b/ell/pem.c
index 671f162..530d8c5 100644
--- a/ell/pem.c
+++ b/ell/pem.c
@@ -45,10 +45,25 @@
#include "cipher.h"
#include "cert-private.h"
#include "missing.h"
+#include "pem-private.h"
#define PEM_START_BOUNDARY "-----BEGIN "
#define PEM_END_BOUNDARY "-----END "
+/*
+ * Gets the base64 data offset of a PEM string (advances past BEGIN tag)
+ */
+#define PEM_BASE64_OFFSET(pem, label) \
+ (pem + strlen(label) + strlen("-----BEGIN -----\n"))
+
+/*
+ * Gets the base64 length from a PEM string. This takes the total PEM length
+ * and subtracts the length of the BEGIN and END tags
+ */
+#define PEM_BASE64_LEN_OFFSET(label, len) \
+ (len - (strlen(label) + strlen(label) + \
+ strlen("-----BEGIN -----\n") + strlen("-----END -----\n")))
+
static const void *is_start_boundary(const void *buf, size_t buf_len,
size_t *label_len)
{
@@ -126,48 +141,36 @@ static bool is_end_boundary(const void *buf, size_t buf_len,
return true;
}
-static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
- char **type_label, size_t *len,
- const uint8_t **endp)
+const char *pem_next(const void *buf, size_t buf_len, char **type_label,
+ size_t *len)
{
const char *buf_ptr = buf;
- const char *base64_data = NULL, *eol;
+ const char *eol;
const char *label = NULL;
- uint8_t *data;
size_t label_len = 0;
+ const char *start = NULL;
- /*
- * The base64 parser uses the RFC7468 laxbase64text grammar but we
- * do full checks on the encapsulation boundary lines, i.e. no
- * leading spaces allowed, making sure quoted text and similar
- * are not confused for actual PEM "textual encoding".
- */
while (buf_len) {
for (eol = buf_ptr; eol < buf_ptr + buf_len; eol++)
if (*eol == '\r' || *eol == '\n')
break;
- if (!base64_data) {
- label = is_start_boundary(buf, eol - buf_ptr,
+ if (!start) {
+ label = is_start_boundary(buf_ptr, eol - buf_ptr,
&label_len);
-
if (label)
- base64_data = eol;
- } else if (is_end_boundary(buf_ptr, eol - buf_ptr, label,
- label_len)) {
- data = l_base64_decode(
- (const char *) base64_data,
- buf_ptr - base64_data, len);
- if (!data)
+ start = label - strlen("-----BEGIN ");
+ else
return NULL;
- *type_label = l_strndup((const char *) label,
- label_len);
+ } else if (start && is_end_boundary(buf_ptr, eol - buf_ptr,
+ label, label_len)) {
+ *len = eol - start + 1;
- if (endp)
- *endp = (uint8_t *)eol + 1;
+ if (type_label)
+ *type_label = l_strndup(label, label_len);
- return data;
+ return start;
}
if (eol == buf_ptr + buf_len)
@@ -182,17 +185,35 @@ static uint8_t *pem_load_buffer(const void *buf, size_t buf_len,
}
}
- /* If we found no label signal EOF rather than parse error */
- if (!base64_data && endp)
- *endp = NULL;
-
return NULL;
}
+static uint8_t *pem_load_buffer(const uint8_t *buf, size_t buf_len,
+ char **type_label, size_t *len)
+{
+ const char *pem = (const char *)buf;
+ size_t out_len;
+
+ /*
+ * The base64 parser uses the RFC7468 laxbase64text grammar but we
+ * do full checks on the encapsulation boundary lines, i.e. no
+ * leading spaces allowed, making sure quoted text and similar
+ * are not confused for actual PEM "textual encoding".
+ */
+
+ pem = pem_next(buf, buf_len, type_label, &out_len);
+ if (!pem)
+ return NULL;
+
+ return l_base64_decode(PEM_BASE64_OFFSET(pem, *type_label),
+ PEM_BASE64_LEN_OFFSET(*type_label, out_len),
+ len);
+}
+
LIB_EXPORT uint8_t *l_pem_load_buffer(const void *buf, size_t buf_len,
char **type_label, size_t *out_len)
{
- return pem_load_buffer(buf, buf_len, type_label, out_len, NULL);
+ return pem_load_buffer(buf, buf_len, type_label, out_len);
}
struct pem_file_info {
@@ -242,7 +263,7 @@ LIB_EXPORT uint8_t *l_pem_load_file(const char *filename,
return NULL;
result = pem_load_buffer(file.data, file.st.st_size,
- type_label, len, NULL);
+ type_label, len);
pem_file_close(&file);
return result;
}
@@ -297,17 +318,27 @@ LIB_EXPORT struct l_queue *l_pem_load_certificate_list_from_data(
while (ptr && ptr < end) {
uint8_t *der;
size_t der_len;
- char *label;
+ char *label = NULL;
struct l_cert *cert;
+ size_t out_len = 0;
+ const char *pem;
+
+ pem = pem_next(ptr, len, &label, &out_len);
+ if (!pem)
+ break;
+
+ der = l_base64_decode(PEM_BASE64_OFFSET(pem, label),
+ PEM_BASE64_LEN_OFFSET(label, out_len),
+ &der_len);
- der = pem_load_buffer(ptr, end - ptr, &label, &der_len, &ptr);
+ ptr += out_len;
if (!der || strcmp(label, "CERTIFICATE")) {
if (der)
l_free(label);
l_free(der);
- if (!ptr) /* EOF */
+ if (ptr >= end) /* EOF */
break;
else
goto error;
@@ -470,7 +501,7 @@ LIB_EXPORT struct l_key *l_pem_load_private_key_from_data(const void
*buf,
if (encrypted)
*encrypted = false;
- content = pem_load_buffer(buf, buf_len, &label, &len, NULL);
+ content = pem_load_buffer(buf, buf_len, &label, &len);
if (!content)
return NULL;
--
2.17.1
10:17 p.m.
New subject: [PATCH v2 5/6] settings: introduce extended groups concept
This patch introduces a new extended format for settings files. This new
format allows raw data to be provided under a given group rather than
key/value pairs. A group using an extended format will contain both the
extended type and group name in the format, for example:
[@[email protected]]
Where 'pem' is the type and 'certificate' is the name. The type of
format requires an extension specific parser implementation in settings
as the parser must know when to start/stop parsing data. This allows for
any textual characters to be present after the group is declared,
including special characters like [] (its completely up to the parser to
decide whats valid and what is not).
Three new l_settings APIs were added:
l_settings_has_embedded_group
l_settings_get_embedded_groups
l_settings_get_embedded_value
In this patch, the 'pem' extension type is also introduced, and for now
is the only extended type. The pem extended type expects a base64 encoded
PEM (or list of PEMs) after the group. The pem parser will stop after the
last PEM is found. Examples can be found in unit/test-settings.c
---
ell/ell.sym | 3 +
ell/settings.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++---
ell/settings.h | 7 ++
3 files changed, 230 insertions(+), 11 deletions(-)
diff --git a/ell/ell.sym b/ell/ell.sym
index e02f0fe..32d94f5 100644
--- a/ell/ell.sym
+++ b/ell/ell.sym
@@ -425,6 +425,9 @@ global:
l_settings_set_float;
l_settings_remove_group;
l_settings_remove_key;
+ l_settings_has_embedded_group;
+ l_settings_get_embedded_groups;
+ l_settings_get_embedded_value;
/* signal */
l_signal_create;
l_signal_remove;
diff --git a/ell/settings.c b/ell/settings.c
index 98f0cfd..da38cb7 100644
--- a/ell/settings.c
+++ b/ell/settings.c
@@ -48,15 +48,23 @@
#include "settings.h"
#include "private.h"
#include "missing.h"
+#include "pem-private.h"
struct setting_data {
char *key;
char *value;
};
+struct embedded_group_data {
+ char type[32];
+ size_t len;
+ char data[0];
+};
+
struct group_data {
char *name;
struct l_queue *settings;
+ struct embedded_group_data *embedded_data;
};
struct l_settings {
@@ -81,7 +89,11 @@ static void group_destroy(void *data)
struct group_data *group = data;
l_free(group->name);
- l_queue_destroy(group->settings, setting_destroy);
+
+ if (group->settings)
+ l_queue_destroy(group->settings, setting_destroy);
+ else
+ l_free(group->embedded_data);
l_free(group);
}
@@ -222,6 +234,125 @@ static char *escape_value(const char *value)
return ret;
}
+static ssize_t parse_pem(const char *data, size_t len)
+{
+ const char *ptr, *end;
+
+ ptr = data;
+ end = data + len;
+
+ while (ptr && ptr < end) {
+ size_t out_len = 0;
+ const char *pem;
+
+ pem = pem_next(ptr, len, NULL, &out_len);
+ if (!pem)
+ break;
+
+ ptr += out_len;
+ len -= out_len;
+ }
+
+ return ptr - data;
+}
+
+struct group_extension {
+ char *name;
+ ssize_t (*parse)(const char *data, size_t len);
+};
+
+static struct group_extension pem_extension = {
+ .name = "pem",
+ .parse = parse_pem,
+};
+
+struct group_extension *extensions[] = {
+ &pem_extension,
+ NULL
+};
+
+static struct group_extension *find_group_extension(const char *type)
+{
+ unsigned int i;
+
+ for (i = 0; extensions[i]; i++) {
+ if (!strcmp(type, extensions[i]->name))
+ return extensions[i];
+ }
+
+ return NULL;
+}
+
+static ssize_t parse_embedded_group(struct l_settings *setting, const char *data,
+ size_t line_len, size_t len)
+{
+ struct group_data *group;
+ struct group_extension *ext;
+ const char *ptr1, *ptr2;
+ L_AUTO_FREE_VAR(char *, type) = NULL;
+ char *name;
+ ssize_t bytes;
+
+ /* Must be at least [@[email protected]]\n */
+ if (line_len < 7)
+ return -EINVAL;
+
+ /* caller checked data[1] == '@' */
+ ptr1 = data + 1;
+
+ ptr2 = ptr1 + 1;
+
+ while (*ptr2 != '@' && (size_t)(ptr2 - data) < line_len)
+ ptr2++;
+
+ if (*ptr2 != '@')
+ return -EINVAL;
+
+ type = l_strndup(ptr1 + 1, ptr2 - ptr1 - 1);
+
+ ptr1 = ptr2;
+
+ while (*ptr1 != ']' && (size_t)(ptr1 - data) < line_len)
+ ptr1++;
+
+ if (*ptr1 != ']')
+ return -EINVAL;
+
+ if (ptr1[1] != '\n')
+ return -EINVAL;
+
+ if (ptr1 - ptr2 - 1 < 1)
+ return -EINVAL;
+
+ name = l_strndup(ptr2 + 1, ptr1 - ptr2 - 1);
+
+ ext = find_group_extension(type);
+ if (!ext)
+ goto free_name;
+
+ bytes = ext->parse(ptr1 + 2, len - line_len);
+ if (bytes < 0)
+ goto free_name;
+
+ group = l_new(struct group_data, 1);
+
+ group->name = name;
+ group->embedded_data = l_malloc(sizeof(struct embedded_group_data) +
+ bytes + 1);
+ strcpy(group->embedded_data->type, type);
+ group->embedded_data->len = bytes;
+ memcpy(group->embedded_data->data, ptr1 + 2, bytes);
+ group->embedded_data->data[bytes] = '\0';
+
+ l_queue_push_tail(setting->groups, group);
+
+ return bytes;
+
+free_name:
+ l_free(name);
+ return -EINVAL;
+}
+
static bool parse_group(struct l_settings *settings, const char *data,
size_t len, size_t line)
{
@@ -404,7 +535,20 @@ LIB_EXPORT bool l_settings_load_from_data(struct l_settings
*settings,
line_len = eol - data - pos;
- if (data[pos] == '[') {
+ if (line_len > 1 && data[pos] == '[' && data[pos + 1] ==
'@') {
+ ssize_t ret;
+
+ ret = parse_embedded_group(settings, data + pos,
+ line_len, len - pos);
+ if (ret < 0)
+ return false;
+
+ /*
+ * This is the offset for the actual raw data, the
+ * group line will be offset below
+ */
+ pos += ret;
+ } else if (data[pos] == '[') {
r = parse_group(settings, data + pos, line_len, line);
if (r)
has_group = true;
@@ -437,10 +581,18 @@ LIB_EXPORT char *l_settings_to_data(const struct l_settings
*settings,
group_entry = l_queue_get_entries(settings->groups);
while (group_entry) {
struct group_data *group = group_entry->data;
- const struct l_queue_entry *setting_entry =
- l_queue_get_entries(group->settings);
+ const struct l_queue_entry *setting_entry;
+
+ if (group->embedded_data) {
+ l_string_append_printf(buf, "[@%[email protected]%s]\n%s",
+ group->embedded_data->type,
+ group->name,
+ group->embedded_data->data);
+ goto group_done;
+ } else
+ l_string_append_printf(buf, "[%s]\n", group->name);
- l_string_append_printf(buf, "[%s]\n", group->name);
+ setting_entry = l_queue_get_entries(group->settings);
while (setting_entry) {
struct setting_data *setting = setting_entry->data;
@@ -450,6 +602,7 @@ LIB_EXPORT char *l_settings_to_data(const struct l_settings
*settings,
setting_entry = setting_entry->next;
}
+group_done:
if (group_entry->next)
l_string_append_c(buf, '\n');
@@ -552,24 +705,24 @@ static void gather_groups(void *data, void *user_data)
struct group_data *group_data = data;
struct gather_data *gather = user_data;
- gather->v[gather->cur++] = l_strdup(group_data->name);
+ if (!group_data->settings)
+ return;
+
+ gather->v = l_strv_append(gather->v, group_data->name);
}
LIB_EXPORT char **l_settings_get_groups(const struct l_settings *settings)
{
- char **ret;
struct gather_data gather;
if (unlikely(!settings))
return NULL;
- ret = l_new(char *, l_queue_length(settings->groups) + 1);
- gather.v = ret;
- gather.cur = 0;
+ gather.v = l_strv_new();
l_queue_foreach(settings->groups, gather_groups, &gather);
- return ret;
+ return gather.v;
}
LIB_EXPORT bool l_settings_has_group(const struct l_settings *settings,
@@ -1176,3 +1329,59 @@ LIB_EXPORT bool l_settings_remove_key(struct l_settings *settings,
return true;
}
+
+static void gather_embedded_groups(void *data, void *user_data)
+{
+ struct group_data *group_data = data;
+ struct gather_data *gather = user_data;
+
+ if (!group_data->embedded_data)
+ return;
+
+ gather->v = l_strv_append(gather->v, group_data->name);
+}
+
+LIB_EXPORT char **l_settings_get_embedded_groups(struct l_settings *settings)
+{
+ struct gather_data gather;
+
+ if (unlikely(!settings))
+ return NULL;
+
+ gather.v = l_strv_new();
+
+ l_queue_foreach(settings->groups, gather_embedded_groups, &gather);
+
+ return gather.v;
+}
+
+LIB_EXPORT bool l_settings_has_embedded_group(struct l_settings *settings,
+ const char *group)
+{
+ struct group_data *group_data;
+
+ if (unlikely(!settings))
+ return false;
+
+ group_data = l_queue_find(settings->groups, group_match, group);
+
+ return group_data->embedded_data != NULL;
+}
+
+LIB_EXPORT const char *l_settings_get_embedded_value(struct l_settings *settings,
+ const char *group_name,
+ const char **out_type)
+{
+ struct group_data *group;
+
+ if (unlikely(!settings))
+ return false;
+
+ group = l_queue_find(settings->groups, group_match, group_name);
+ if (!group || !group->embedded_data)
+ return NULL;
+
+ *out_type = group->embedded_data->type;
+
+ return group->embedded_data->data;
+}
diff --git a/ell/settings.h b/ell/settings.h
index 0da9f55..e4203af 100644
--- a/ell/settings.h
+++ b/ell/settings.h
@@ -123,6 +123,13 @@ bool l_settings_remove_key(struct l_settings *settings, const char
*group_name,
const char *key);
bool l_settings_remove_group(struct l_settings *settings,
const char *group_name);
+
+char **l_settings_get_embedded_groups(struct l_settings *settings);
+bool l_settings_has_embedded_group(struct l_settings *settings,
+ const char *group);
+const char *l_settings_get_embedded_value(struct l_settings *settings,
+ const char *group_name,
+ const char **out_type);
#ifdef __cplusplus
}
#endif
--
2.17.1
10:17 p.m.
New subject: [PATCH v2 6/6] unit/test-settings: add pem extended type tests
---
unit/settings.test | 28 +++++
unit/test-settings.c | 238 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 264 insertions(+), 2 deletions(-)
diff --git a/unit/settings.test b/unit/settings.test
index 3884f7d..5f2d4f8 100644
--- a/unit/settings.test
+++ b/unit/settings.test
@@ -20,3 +20,31 @@ StringList=Foo,Bar,Baz
StringListEmpty=
StringListOne=FooBarBaz
StringWithSpaces=Bar B Q
+
+[@[email protected]]
+-----BEGIN CERTIFICATE-----
+MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL
+BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y
+Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc
+BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00
+NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg
+RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1
+ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet
+1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0
+v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H
+ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO
+A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq
+wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw
+gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX
+jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz
+BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp
+b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN
+AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG
+SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53
+4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d
+tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS
+SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th
+MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P
+DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK
+-----END CERTIFICATE-----
diff --git a/unit/test-settings.c b/unit/test-settings.c
index 4d4fb68..209216b 100644
--- a/unit/test-settings.c
+++ b/unit/test-settings.c
@@ -30,6 +30,120 @@
#include <ell/ell.h>
+#define TEST_CERTIFICATE \
+ "-----BEGIN CERTIFICATE-----\n" \
+ "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n" \
+ "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n" \
+ "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n" \
+ "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n" \
+ "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n" \
+ "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n" \
+ "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n" \
+ "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n" \
+ "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n" \
+ "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n" \
+ "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n" \
+ "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n" \
+ "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n" \
+ "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n" \
+ "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n" \
+ "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n" \
+ "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n" \
+ "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n" \
+ "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n" \
+ "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n" \
+ "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n" \
+ "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n" \
+ "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n" \
+ "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n" \
+ "-----END CERTIFICATE-----\n"
+
+#define TEST_CERT_LIST \
+ "-----BEGIN CERTIFICATE-----\n" \
+ "MIIEXDCCA0SgAwIBAgIJALjNE85c9plgMA0GCSqGSIb3DQEBCwUAMHgxNTAzBgNV\n" \
+ "BAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRpb25z\n" \
+ "MR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcNAQkB\n" \
+ "Fg9jYUBtYWlsLmV4YW1wbGUwHhcNMTkwOTE2MTcxMzAzWhcNNDcwMjAxMTcxMzAz\n" \
+ "WjB4MTUwMwYDVQQKDCxJbnRlcm5hdGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3Jn\n" \
+ "YW5pemF0aW9uczEfMB0GA1UEAwwWQ2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwG\n" \
+ "CSqGSIb3DQEJARYPY2FAbWFpbC5leGFtcGxlMIIBIjANBgkqhkiG9w0BAQEFAAOC\n" \
+ "AQ8AMIIBCgKCAQEA7Lft5O6BtUUokuueQ7mBQVzRzPeH0Nl3NjgGnfBYcz7O2Jca\n" \
+ "rFSBPsV76reUG4QFQudsdwyaLOpniFFSFaI3GRXMxjwZJJjLqvT0aebTiLUSKseA\n" \
+ "QkP/NSITmIljs2yclnPJGIApLuFvykPagx+yc9ckbziEz1PvKB/ukbiU/zt6QCru\n" \
+ "BbyCQ1kWBuyrS3RC0/UgmrSbL7YkkmuD2B1vyZLIoPsJijXs2GJQY3a+zpLemTth\n" \
+ "i/Vw4AURJS1gfEUDNzf9Y9+o7vWJfzk+g7xm1XpMTsNTd7q6UwHOi1xdiKCEPT+q\n" \
+ "c3LXi7qgWqSXeD+F513PM3JMJ3Wk1H8K4VwJwQIDAQABo4HoMIHlMAwGA1UdEwQF\n" \
+ "MAMBAf8wHQYDVR0OBBYEFMuhnjqw8YGMg0cyYlQppMncWis/MIG1BgNVHSMEga0w\n" \
+ "gaqAFJ75Zb78cte1aqkdBX4EuDcM140noXykejB4MTUwMwYDVQQKDCxJbnRlcm5h\n" \
+ "dGlvbmFsIFVuaW9uIG9mIEV4YW1wbGUgT3JnYW5pemF0aW9uczEfMB0GA1UEAwwW\n" \
+ "Q2VydGlmaWNhdGUgaXNzdWVyIGd1eTEeMBwGCSqGSIb3DQEJARYPY2FAbWFpbC5l\n" \
+ "eGFtcGxlghQog5dBcTIdmw4XD/6KEME0ZNCdZTANBgkqhkiG9w0BAQsFAAOCAQEA\n" \
+ "PjX5n/fgkskZmh9aRhX8r9985JtxMdgogJP4uwRbfuQPzAqYyu9QlAOcRl6tNGN7\n" \
+ "mztB5RfJ9HDyjS9iGXsvKXS8wT5ELbuATev+C1Ppxakd3gvJMN4ZqYn32JqRYigN\n" \
+ "L2V2jo9RzVUuFa3YP6sw0KfZAfHsfUmQCxAm8HAfQg98aYyIXu/OzeVUsAuhfqWN\n" \
+ "qvWcOLjTQTn6t10OHHdIYw59EpIEOPD3Opq7pLgIm+EV3eVMWthSLYbEhIavh8Pc\n" \
+ "xN9lqCg887kTawbXbXd49Z8jYZxjxQl7IoonvIyrPhhabKjKCpE2bRFzzpia0PkC\n" \
+ "fRgh+KB2tqIeAoekDllmbA==\n" \
+ "-----END CERTIFICATE-----\n" \
+ "-----BEGIN CERTIFICATE-----\n" \
+ "MIIEajCCA1KgAwIBAgIUKIOXQXEyHZsOFw/+ihDBNGTQnWUwDQYJKoZIhvcNAQEL\n" \
+ "BQAweDE1MDMGA1UECgwsSW50ZXJuYXRpb25hbCBVbmlvbiBvZiBFeGFtcGxlIE9y\n" \
+ "Z2FuaXphdGlvbnMxHzAdBgNVBAMMFkNlcnRpZmljYXRlIGlzc3VlciBndXkxHjAc\n" \
+ "BgkqhkiG9w0BCQEWD2NhQG1haWwuZXhhbXBsZTAeFw0xOTA5MTYxNzEyNThaFw00\n" \
+ "NzAyMDExNzEyNThaMHgxNTAzBgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2Yg\n" \
+ "RXhhbXBsZSBPcmdhbml6YXRpb25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1\n" \
+ "ZXIgZ3V5MR4wHAYJKoZIhvcNAQkBFg9jYUBtYWlsLmV4YW1wbGUwggEiMA0GCSqG\n" \
+ "SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjovj3aq26sAQ0k5vD/BVp40p0lhz1+Wet\n" \
+ "1EcdQa1arVIca9nhfvoHfJAmK+zzqQLbvI0/e2if4X6OKf41g7w7VaYS9qv5jZZ0\n" \
+ "v/7aL6PUa2F7C9HG/vuIII/dRvP2uQ43PLxeTeZyj7bBUB9xCFCpzB+7AZuUuH0H\n" \
+ "ABaC9CAGZWImBY5NUXST7E/BsvqU80KJglDovcabthvwoekji9DC/wwISLE1e9cO\n" \
+ "A9IB0Co0mA1ME6wzrawmuTzxUw9BsmEhbKhFGBRwIrrq0r4GvDmeMFiZjXv+I0vq\n" \
+ "wSCyRtgoeBmyemqIEgiN4Z23V7ps3dbYF/tw96Zj7rd5gtjY9VSdAgMBAAGjgesw\n" \
+ "gegwDwYDVR0TBAgwBgEB/wIBADAdBgNVHQ4EFgQUnvllvvxy17VqqR0FfgS4NwzX\n" \
+ "jScwgbUGA1UdIwSBrTCBqoAUnvllvvxy17VqqR0FfgS4NwzXjSehfKR6MHgxNTAz\n" \
+ "BgNVBAoMLEludGVybmF0aW9uYWwgVW5pb24gb2YgRXhhbXBsZSBPcmdhbml6YXRp\n" \
+ "b25zMR8wHQYDVQQDDBZDZXJ0aWZpY2F0ZSBpc3N1ZXIgZ3V5MR4wHAYJKoZIhvcN\n" \
+ "AQkBFg9jYUBtYWlsLmV4YW1wbGWCFCiDl0FxMh2bDhcP/ooQwTRk0J1lMA0GCSqG\n" \
+ "SIb3DQEBCwUAA4IBAQBROAyWfQyKXQ007U6ctgihHbg/lsfEEfeNPG+QRVt8/e53\n" \
+ "4fH6scuY9bW7CZQSdiBo178ITHrIOo2CuFMa0ysnW3V1M9/s0dUYjBHYdpTEEQ+d\n" \
+ "tgm1uRLiTsYeBtueRItEmZU6JjgmvAH8i1UqI0e5iYlfnovPmftpqIwRH7k7A9kS\n" \
+ "SehC9QkkrnIttDEoeYTGhLOJu1Fx2cwAodce6VNgz/k1zIXY5Tprg440zrCwc+th\n" \
+ "MpX48F31ggg8Wd5N6Xg1nricGwL8K90ts6xvwF1WwKsg6BeYdyC0eYBqQ41MA/7P\n" \
+ "DK3OGM6cC5tbQGWaIT0Q407GJBGpaijDicA2YqlK\n" \
+ "-----END CERTIFICATE-----\n"
+
+#define TEST_PRIV_KEY \
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n" \
+ "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\n" \
+ "-----END ENCRYPTED PRIVATE KEY-----\n"
+
static const char *data1 = "[Foobar]\n#Comment\n#Comment2\nKey=Value\n"
"IntegerA=2147483647\nIntegerB=-2147483648\n"
"IntegerC=4294967295\nIntegerD=9223372036854775807\n"
@@ -45,7 +159,9 @@ static const char *data1 =
"[Foobar]\n#Comment\n#Comment2\nKey=Value\n"
"StringList=Foo,Bar,Baz\n"
"StringListEmpty=\n"
"StringListOne=FooBarBaz\n"
- "StringWithSpaces=Bar B Q\n";
+ "StringWithSpaces=Bar B Q\n\n"
+ "[@[email protected]]\n"
+ TEST_CERTIFICATE;
static const char *data2 = "[Group1]\nKey=Value\n"
"IntegerA=2147483647\nIntegerB=-2147483648\n"
@@ -60,7 +176,11 @@ static const char *data2 = "[Group1]\nKey=Value\n"
"StringList=Foo,Bar,Baz\n"
"StringListEmpty=\n"
"StringListOne=FooBarBaz\n\n"
- "[Group2]\nKey=Value\n";
+ "[Group2]\nKey=Value\n\n"
+ "[@[email protected]]\n"
+ "-----BEGIN CERTIFICATE-----\n"
+ "MIIEajCCA1KgAwIBAgoZIhvcNAQEL\n"
+ "-----END CERTIFICATE-----\n";
static void settings_debug(const char *str, void *userdata)
{
@@ -141,6 +261,14 @@ static void test_settings(struct l_settings *settings)
strv = l_settings_get_groups(settings);
assert(strv);
assert(!strcmp(strv[0], "Foobar"));
+ assert(!l_settings_has_embedded_group(settings, strv[0]));
+ assert(!strv[1]);
+ l_strfreev(strv);
+
+ strv = l_settings_get_embedded_groups(settings);
+ assert(strv);
+ assert(!strcmp(strv[0], "certificate"));
+ assert(l_settings_has_embedded_group(settings, "certificate"));
assert(!strv[1]);
l_strfreev(strv);
@@ -160,6 +288,109 @@ static void test_settings(struct l_settings *settings)
assert(!l_settings_has_group(settings, "Foobar"));
}
+static void test_valid_extended_group(const void *test_data)
+{
+ const char *raw_data =
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]_cert]\n"
+ TEST_CERTIFICATE
+ "[next_group]\n"
+ "another_key=another_value\n"
+ "[@[email protected]_certs]\n"
+ TEST_CERT_LIST
+ "\n"
+ "[group_after_list]\n"
+ "key=value\n\n\n\n"
+ "[@[email protected]_key]\n"
+ TEST_PRIV_KEY
+ "\n\n\n\n";
+ struct l_settings *settings = l_settings_new();
+ const char *certificate = TEST_CERTIFICATE;
+ const char *two_certs = TEST_CERT_LIST;
+ const char *priv_key = TEST_PRIV_KEY;
+ const char *test_cert;
+ const char *out_type;
+
+ assert(l_settings_load_from_data(settings, raw_data, strlen(raw_data)));
+
+ assert(l_settings_has_group(settings, "normal"));
+ assert(l_settings_has_group(settings, "next_group"));
+ assert(!l_settings_get_value(settings, "single_cert", "value"));
+
+ assert(l_settings_has_group(settings, "single_cert"));
+ assert(l_settings_has_embedded_group(settings, "single_cert"));
+ test_cert = l_settings_get_embedded_value(settings, "single_cert",
&out_type);
+ assert(!strcmp(test_cert, certificate));
+
+ assert(l_settings_has_group(settings, "two_certs"));
+ assert(l_settings_has_embedded_group(settings, "two_certs"));
+ test_cert = l_settings_get_embedded_value(settings, "two_certs",
&out_type);
+ assert(!strcmp(test_cert, two_certs));
+
+ assert(l_settings_has_group(settings, "priv_key"));
+ assert(l_settings_has_embedded_group(settings, "priv_key"));
+ test_cert = l_settings_get_embedded_value(settings, "priv_key",
&out_type);
+ assert(!strcmp(test_cert, priv_key));
+
+ l_settings_free(settings);
+}
+
+static void test_invalid_extended_group(const void *test_data)
+{
+ int i = 0;
+ const char *invalid_data[] = {
+ /* Unterminated PEM */
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]_pem]\n"
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+ "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhki",
+ /* Invalid ext type */
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]]\n"
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+ "-----END ENCRYPTED PRIVATE KEY-----\n",
+ /* Valid ext type, invalid name */
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]]\n"
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+ "-----END ENCRYPTED PRIVATE KEY-----\n",
+ /* Invalid ext type */
+ "[normal]\n"
+ "key=value\n"
+ "[@@some_name]\n"
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+ "-----END ENCRYPTED PRIVATE KEY-----\n",
+ /* second PEM invalid */
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]_pems]\n"
+ "-----BEGIN ENCRYPTED PRIVATE KEY-----\n"
+ "MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhki\n"
+ "-----END ENCRYPTED PRIVATE KEY-----\n"
+ "-----BEGIN \n",
+ /* end boundary only */
+ "[normal]\n"
+ "key=value\n"
+ "[@[email protected]_pems]\n"
+ "-----END ENCRYPTED PRIVATE KEY-----\n",
+ NULL
+ };
+
+ struct l_settings *settings = l_settings_new();
+
+ while (invalid_data[i]) {
+ assert(!l_settings_load_from_data(settings, invalid_data[i],
+ strlen(invalid_data[i])));
+ i++;
+ }
+
+ l_settings_free(settings);
+}
+
static void test_load_from_data(const void *test_data)
{
struct l_settings *settings;
@@ -319,6 +550,9 @@ int main(int argc, char *argv[])
l_test_add("Export to Data 1", test_to_data, data2);
l_test_add("Invalid Data 1", test_invalid_data, no_group_data);
l_test_add("Invalid Data 2", test_invalid_data, key_before_group_data);
+ l_test_add("Test valid ext group", test_valid_extended_group, NULL);
+ l_test_add("Test invalid ext group", test_invalid_extended_group, NULL);
+
return l_test_run();
}
--
2.17.1
1053
days inactive
1053
days old
5 comments
1 participants
participants (1)
-
James Prestwood