From d2a58f3aadf33e11bcbc4743cac65d4464447db8 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Sat, 29 Oct 2011 17:01:47 +0000 Subject: sbtools: move sb file production to its own file with a clean api, factor key reading even more git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30851 a1c6a512-1295-4272-9138-f99709370657 --- utils/sbtools/misc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'utils/sbtools/misc.h') diff --git a/utils/sbtools/misc.h b/utils/sbtools/misc.h index 545285eafc..cc0a3fb5ea 100644 --- a/utils/sbtools/misc.h +++ b/utils/sbtools/misc.h @@ -30,19 +30,22 @@ #define bug(...) do { fprintf(stderr,"["__FILE__":"STR(__LINE__)"]ERROR: "__VA_ARGS__); exit(1); } while(0) #define bugp(a) do { perror("ERROR: "a); exit(1); } while(0) +#define ROUND_UP(val, round) ((((val) + (round) - 1) / (round)) * (round)) + extern bool g_debug; typedef struct crypto_key_t *key_array_t; int g_nr_keys; key_array_t g_key_array; -char *s_getenv(const char *name); +void *augment_array(void *arr, size_t elem_sz, size_t cnt, void *aug, size_t aug_cnt); void generate_random_data(void *buf, size_t sz); void *xmalloc(size_t s); int convxdigit(char digit, byte *val); void print_hex(byte *data, int len, bool newline); void add_keys(key_array_t ka, int kac); -key_array_t read_keys(const char *key_file, int *num_keys); +bool parse_key(char **str, struct crypto_key_t *key); +void add_keys_from_file(const char *key_file); void print_key(struct crypto_key_t *key, bool newline); #endif /* __MISC_H__ */ -- cgit v1.2.3