diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2011-10-29 17:01:47 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2011-10-29 17:01:47 +0000 |
commit | d2a58f3aadf33e11bcbc4743cac65d4464447db8 (patch) | |
tree | c800fee3b6598b86aa3ff3aaf971d4ad5d6e9d06 /utils/sbtools/misc.h | |
parent | 93c6c79e8d2ee39056afe7f8145b051d4a0e8d38 (diff) | |
download | rockbox-d2a58f3aadf33e11bcbc4743cac65d4464447db8.tar.gz rockbox-d2a58f3aadf33e11bcbc4743cac65d4464447db8.zip |
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
Diffstat (limited to 'utils/sbtools/misc.h')
-rw-r--r-- | utils/sbtools/misc.h | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ | |||
30 | #define bug(...) do { fprintf(stderr,"["__FILE__":"STR(__LINE__)"]ERROR: "__VA_ARGS__); exit(1); } while(0) | 30 | #define bug(...) do { fprintf(stderr,"["__FILE__":"STR(__LINE__)"]ERROR: "__VA_ARGS__); exit(1); } while(0) |
31 | #define bugp(a) do { perror("ERROR: "a); exit(1); } while(0) | 31 | #define bugp(a) do { perror("ERROR: "a); exit(1); } while(0) |
32 | 32 | ||
33 | #define ROUND_UP(val, round) ((((val) + (round) - 1) / (round)) * (round)) | ||
34 | |||
33 | extern bool g_debug; | 35 | extern bool g_debug; |
34 | 36 | ||
35 | typedef struct crypto_key_t *key_array_t; | 37 | typedef struct crypto_key_t *key_array_t; |
36 | int g_nr_keys; | 38 | int g_nr_keys; |
37 | key_array_t g_key_array; | 39 | key_array_t g_key_array; |
38 | 40 | ||
39 | char *s_getenv(const char *name); | 41 | void *augment_array(void *arr, size_t elem_sz, size_t cnt, void *aug, size_t aug_cnt); |
40 | void generate_random_data(void *buf, size_t sz); | 42 | void generate_random_data(void *buf, size_t sz); |
41 | void *xmalloc(size_t s); | 43 | void *xmalloc(size_t s); |
42 | int convxdigit(char digit, byte *val); | 44 | int convxdigit(char digit, byte *val); |
43 | void print_hex(byte *data, int len, bool newline); | 45 | void print_hex(byte *data, int len, bool newline); |
44 | void add_keys(key_array_t ka, int kac); | 46 | void add_keys(key_array_t ka, int kac); |
45 | key_array_t read_keys(const char *key_file, int *num_keys); | 47 | bool parse_key(char **str, struct crypto_key_t *key); |
48 | void add_keys_from_file(const char *key_file); | ||
46 | void print_key(struct crypto_key_t *key, bool newline); | 49 | void print_key(struct crypto_key_t *key, bool newline); |
47 | 50 | ||
48 | #endif /* __MISC_H__ */ | 51 | #endif /* __MISC_H__ */ |