yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

psa_constant_names: new function append_integer

Browse source 
Factor repeated code into a new function append_integer.
This commit is contained in:
Gilles Peskine 2018-08-20 15:06:39 +02:00
parent 70f46e17e8
commit 0deaf3d8d7
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
programs/psa/psa_constant_names.c
View file

@ -21,6 +21,16 @@ static void append(char **buffer, size_t buffer_size,
} }
} }
static void append_integer(char **buffer, size_t buffer_size,
size_t *required_size,
const char *format /*printf format for value*/,
unsigned long value)
{
size_t n = snprintf(*buffer, buffer_size - *required_size, format, value);
if (n < buffer_size - *required_size) *buffer += n;
*required_size += n;
}
/* The code of these function is automatically generated and included below. */ /* The code of these function is automatically generated and included below. */
static const char *psa_ecc_curve_name(psa_ecc_curve_t curve); static const char *psa_ecc_curve_name(psa_ecc_curve_t curve);
static const char *psa_hash_algorithm_name(psa_algorithm_t hash_alg); static const char *psa_hash_algorithm_name(psa_algorithm_t hash_alg);
@ -37,10 +47,8 @@ static void append_with_curve(char **buffer, size_t buffer_size,
append(buffer, buffer_size, required_size, append(buffer, buffer_size, required_size,
curve_name, strlen(curve_name)); curve_name, strlen(curve_name));
} else { } else {
size_t n = snprintf(*buffer, buffer_size - *required_size, append_integer(buffer, buffer_size, required_size,
"0x%04x", (unsigned) curve); "0x%04x", curve);
if (n < buffer_size - *required_size) *buffer += n;
*required_size += n;
} }
append(buffer, buffer_size, required_size, ")", 1); append(buffer, buffer_size, required_size, ")", 1);
} }
@ -57,10 +65,8 @@ static void append_with_hash(char **buffer, size_t buffer_size,
append(buffer, buffer_size, required_size, append(buffer, buffer_size, required_size,
hash_name, strlen(hash_name)); hash_name, strlen(hash_name));
} else { } else {
size_t n = snprintf(*buffer, buffer_size - *required_size, append_integer(buffer, buffer_size, required_size,
"0x%08lx", (unsigned long) hash_alg); "0x%08lx", hash_alg);
if (n < buffer_size - *required_size) *buffer += n;
*required_size += n;
} }
append(buffer, buffer_size, required_size, ")", 1); append(buffer, buffer_size, required_size, ")", 1);
} }

8
scripts/generate_psa_constants.py
View file

@ -55,8 +55,8 @@ static int psa_snprint_algorithm(char *buffer, size_t buffer_size,
%(algorithm_cases)s %(algorithm_cases)s
default: default:
%(algorithm_code)s{ %(algorithm_code)s{
return snprintf(buffer, buffer_size, append_integer(&buffer, buffer_size, &required_size,
"0x%%08lx", (unsigned long) alg); "0x%%08lx", (unsigned long) alg);
} }
break; break;
} }
@ -82,8 +82,8 @@ static int psa_snprint_key_usage(char *buffer, size_t buffer_size,
if (required_size != 0) { if (required_size != 0) {
append(&buffer, buffer_size, &required_size, " | ", 3); append(&buffer, buffer_size, &required_size, " | ", 3);
} }
required_size += snprintf(buffer, buffer_size - required_size, append_integer(&buffer, buffer_size, &required_size,
"0x%%08x", usage); "0x%%08lx", (unsigned long) usage);
} else { } else {
buffer[0] = 0; buffer[0] = 0;
} }