Commit fccfa124e6 for strongswan.org

commit fccfa124e658cce6dd77c037e7ee85c497bda1ec
Author: Andreas Steffen <andreas.steffen@strongswan.org>
Date:   Sat Dec 21 12:09:46 2024 +0100

    scripts: Added nist_acvp script

diff --git a/scripts/.gitignore b/scripts/.gitignore
index 976beb5cc3..2311aa5266 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -18,3 +18,4 @@ tls_test
 timeattack
 os_info
 nist_kem_kat
+nist_acvp
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0548f661ea..76f5bc943b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -7,7 +7,8 @@ AM_CPPFLAGS = \

 noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql oid2der \
 	thread_analysis dh_speed pubkey_speed crypt_burn hash_burn fetch \
-	dnssec malloc_speed aes-test settings-test timeattack nist_kem_kat
+	dnssec malloc_speed aes-test settings-test timeattack nist_kem_kat \
+	nist_acvp

 if USE_TLS
   noinst_PROGRAMS += tls_test
@@ -32,6 +33,7 @@ fetch_SOURCES = fetch.c
 dnssec_SOURCES = dnssec.c
 timeattack_SOURCES = timeattack.c
 nist_kem_kat_SOURCES = nist_kem_kat.c
+nist_acvp_SOURCES = nist_acvp.c

 id2sql_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 key2keyid_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
@@ -48,6 +50,7 @@ aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
 timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB)
 nist_kem_kat_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+nist_acvp_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la

 if USE_IMCV
   AM_CPPFLAGS += -I$(top_srcdir)/src/libimcv
diff --git a/scripts/nist_acvp.c b/scripts/nist_acvp.c
new file mode 100644
index 0000000000..2ce7fe5548
--- /dev/null
+++ b/scripts/nist_acvp.c
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2024 Andreas Steffen
+ *
+ * Copyright (C) secunet Security Networks AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program 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 General Public License
+ * for more details.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <errno.h>
+
+#include <library.h>
+
+#define MAX_LINE_LENGTH 90000
+
+static void usage(FILE *out, char *name)
+{
+	fprintf(out, "Convert NIST ACVP JSON entries into struct\n");
+	fprintf(out, "%s [OPTIONS]\n\n", name);
+	fprintf(out, "Options:\n");
+	fprintf(out, "  -h, --help          print this help.\n");
+	fprintf(out, "  -i, --in=FILE       input file (default STDIN).\n");
+	fprintf(out, "  -o, --out=FILE      output file (default STDOUT).\n");
+	fprintf(out, "\n");
+}
+
+int main(int argc, char *argv[])
+{
+	FILE *in = stdin;
+	FILE *out = stdout;
+	char *line, *pos, *eol, *param, *value;
+	size_t param_len, value_len;
+	int n = 0;
+
+	library_init(NULL, "nist-acvp");
+	atexit(library_deinit);
+
+	while (true)
+	{
+		struct option long_opts[] = {
+			{"help",	no_argument,		NULL,	'h' },
+			{"in",		required_argument,	NULL,	'i' },
+			{"out",		required_argument,	NULL,	'o' },
+			{0,0,0,0 },
+		};
+		switch (getopt_long(argc, argv, "h:i:o:", long_opts, NULL))
+		{
+			case EOF:
+				break;
+			case 'h':
+				usage(stdout, argv[0]);
+				return 0;
+			case 'i':
+				in = fopen(optarg, "r");
+				if (!in)
+				{
+					fprintf(stderr, "failed to open '%s': %s\n", optarg,
+							strerror(errno));
+					usage(stderr, argv[0]);
+					return 1;
+				}
+				continue;
+			case 'o':
+				out = fopen(optarg, "w");
+				if (!out)
+				{
+					fprintf(stderr, "failed to open '%s': %s\n", optarg,
+							strerror(errno));
+					usage(stderr, argv[0]);
+					return 1;
+				}
+				continue;
+			default:
+				usage(stderr, argv[0]);
+				return 1;
+		}
+		break;
+	}
+
+	line = malloc(MAX_LINE_LENGTH);
+	while (fgets(line, MAX_LINE_LENGTH, in))
+	{
+		pos = strchr(line, ':');
+		if (!pos)
+		{
+			continue;
+		}
+		value = pos + 1;
+
+		/* determine end of line */
+		eol = strchr(value, '\n');
+		if (!eol)
+		{
+			fprintf(stderr, "eol not found\n");
+			break;
+		}
+		value_len = eol - value;
+
+		while (value_len && *value == ' ')
+		{
+			value++;
+			value_len--;
+		}
+
+		/* remove optional comma trailing the value */
+		if (value_len && value[value_len-1] == ',')
+		{
+			value_len--;
+		}
+
+		if (value_len < 2 || *value != '"' || value[value_len-1] != '"')
+		{
+			fprintf(stderr, "no double quotes around value found\n");
+			break;
+		}
+		value++;
+		value_len -= 2;
+
+		param = line;
+		param_len = pos - line;
+
+		/* remove preceding whitespace from param */
+		while (param_len && *param == ' ')
+		{
+			param++;
+			param_len--;
+		}
+
+		/* remove double quotes from param */
+		if (param_len < 2 || *param != '"' || param[param_len - 1] != '"')
+		{
+			fprintf(stderr, "no double quotes around parameter found\n");
+			break;
+		}
+		param++;
+		param_len -= 2;
+		param[param_len] = '\0';
+
+		fprintf(out, "%s:\n", param);
+		fprintf(out, "\t  chunk_from_chars(");
+
+		n = 0;
+		while (value_len > 1)
+		{
+			if (n > 0)
+			{
+				fprintf(out, ",");
+				if (n % 80 == 0)
+				{
+					fprintf(out, " /* %4d */", n);
+				}
+			}
+			if (n % 16 == 0)
+			{
+				fprintf(out, "\n\t\t");
+			}
+			fprintf(out, "0x%c%c", tolower(value[0]), tolower(value[1]));
+			value += 2;
+			value_len -= 2;
+			n++;
+		}
+		fprintf(out, "),/* %4d */\n", n);
+	}
+	free(line);
+	if (in != stdin)
+	{
+		fclose(in);
+	}
+	if (out != stdout)
+	{
+		fclose(out);
+	}
+	return 0;
+}