Merge pull request #56 from gilles-peskine-arm/psa_constant_names-status_is_signed
psa_constant_names: status is signed
diff --git a/programs/psa/psa_constant_names.c b/programs/psa/psa_constant_names.c
index cc98a95..5514100 100644
--- a/programs/psa/psa_constant_names.c
+++ b/programs/psa/psa_constant_names.c
@@ -1,3 +1,5 @@
+#include <errno.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -151,56 +153,24 @@
typedef enum {
TYPE_STATUS,
- TYPE_ALGORITHM,
- TYPE_ECC_CURVE,
- TYPE_KEY_TYPE,
- TYPE_KEY_USAGE,
-} value_type;
+} signed_value_type;
-int main(int argc, char *argv[])
+int process_signed(signed_value_type type, long min, long max, char **argp)
{
- value_type type;
- unsigned long max;
- int i;
-
- if (argc <= 1 ||
- !strcmp(argv[1], "help") ||
- !strcmp(argv[1], "--help"))
- {
- usage(argv[0]);
- return EXIT_FAILURE;
- }
-
- if (!strcmp(argv[1], "error") || !strcmp(argv[1], "status")) {
- type = TYPE_STATUS;
- max = 0x7fffffff; /* hard-coded because psa_status_t is signed */
- } else if (!strcmp(argv[1], "alg") || !strcmp(argv[1], "algorithm")) {
- type = TYPE_ALGORITHM;
- max = (psa_algorithm_t)( -1 );
- } else if (!strcmp(argv[1], "curve") || !strcmp(argv[1], "ecc_curve")) {
- type = TYPE_ECC_CURVE;
- max = (psa_ecc_curve_t)( -1 );
- } else if (!strcmp(argv[1], "type") || !strcmp(argv[1], "key_type")) {
- type = TYPE_KEY_TYPE;
- max = (psa_key_type_t)( -1 );
- } else if (!strcmp(argv[1], "usage") || !strcmp(argv[1], "key_usage")) {
- type = TYPE_KEY_USAGE;
- max = (psa_key_usage_t)( -1 );
- } else {
- printf("Unknown type: %s\n", argv[1]);
- return EXIT_FAILURE;
- }
-
- for (i = 2; i < argc; i++) {
+ for (; *argp != NULL; argp++) {
char buffer[200];
char *end;
- unsigned long value = strtoul(argv[i], &end, 0);
+ long value = strtol(*argp, &end, 0);
if (*end) {
- printf("Non-numeric value: %s\n", argv[i]);
+ printf("Non-numeric value: %s\n", *argp);
return EXIT_FAILURE;
}
- if (value > max) {
- printf("Value out of range: %s\n", argv[i]);
+ if (value < min || (errno == ERANGE && value < 0)) {
+ printf("Value too small: %s\n", *argp);
+ return EXIT_FAILURE;
+ }
+ if (value > max || (errno == ERANGE && value > 0)) {
+ printf("Value too large: %s\n", *argp);
return EXIT_FAILURE;
}
@@ -209,6 +179,36 @@
psa_snprint_status(buffer, sizeof(buffer),
(psa_status_t) value);
break;
+ }
+ puts(buffer);
+ }
+
+ return EXIT_SUCCESS;
+}
+
+typedef enum {
+ TYPE_ALGORITHM,
+ TYPE_ECC_CURVE,
+ TYPE_KEY_TYPE,
+ TYPE_KEY_USAGE,
+} unsigned_value_type;
+
+int process_unsigned(unsigned_value_type type, unsigned long max, char **argp)
+{
+ for (; *argp != NULL; argp++) {
+ char buffer[200];
+ char *end;
+ unsigned long value = strtoul(*argp, &end, 0);
+ if (*end) {
+ printf("Non-numeric value: %s\n", *argp);
+ return EXIT_FAILURE;
+ }
+ if (value > max || errno == ERANGE) {
+ printf("Value out of range: %s\n", *argp);
+ return EXIT_FAILURE;
+ }
+
+ switch (type) {
case TYPE_ALGORITHM:
psa_snprint_algorithm(buffer, sizeof(buffer),
(psa_algorithm_t) value);
@@ -231,3 +231,36 @@
return EXIT_SUCCESS;
}
+
+int main(int argc, char *argv[])
+{
+ if (argc <= 1 ||
+ !strcmp(argv[1], "help") ||
+ !strcmp(argv[1], "--help"))
+ {
+ usage(argv[0]);
+ return EXIT_FAILURE;
+ }
+
+ if (!strcmp(argv[1], "error") || !strcmp(argv[1], "status")) {
+ /* There's no way to obtain the actual range of a signed type,
+ * so hard-code it here: psa_status_t is int32_t. */
+ return process_signed(TYPE_STATUS, INT32_MIN, INT32_MAX,
+ argv + 2);
+ } else if (!strcmp(argv[1], "alg") || !strcmp(argv[1], "algorithm")) {
+ return process_unsigned(TYPE_ALGORITHM, (psa_algorithm_t) (-1),
+ argv + 2);
+ } else if (!strcmp(argv[1], "curve") || !strcmp(argv[1], "ecc_curve")) {
+ return process_unsigned(TYPE_ECC_CURVE, (psa_ecc_curve_t) (-1),
+ argv + 2);
+ } else if (!strcmp(argv[1], "type") || !strcmp(argv[1], "key_type")) {
+ return process_unsigned(TYPE_KEY_TYPE, (psa_key_type_t) (-1),
+ argv + 2);
+ } else if (!strcmp(argv[1], "usage") || !strcmp(argv[1], "key_usage")) {
+ return process_unsigned(TYPE_KEY_USAGE, (psa_key_usage_t) (-1),
+ argv + 2);
+ } else {
+ printf("Unknown type: %s\n", argv[1]);
+ return EXIT_FAILURE;
+ }
+}
diff --git a/tests/scripts/test_psa_constant_names.py b/tests/scripts/test_psa_constant_names.py
index 000dedc..d22652e 100755
--- a/tests/scripts/test_psa_constant_names.py
+++ b/tests/scripts/test_psa_constant_names.py
@@ -211,6 +211,12 @@
def run_c(options, type, names):
'''Generate and run a program to print out numerical values for names.'''
+ if type == 'status':
+ cast_to = 'long'
+ printf_format = '%ld'
+ else:
+ cast_to = 'unsigned long'
+ printf_format = '0x%08lx'
c_name = None
exe_name = None
try:
@@ -230,7 +236,8 @@
{
''')
for name in names:
- c_file.write(' printf("0x%08x\\n", {});\n'.format(name))
+ c_file.write(' printf("{}\\n", ({}) {});\n'
+ .format(printf_format, cast_to, name))
c_file.write(''' return 0;
}
''')