projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-usb
[platform/kernel/u-boot.git]
/
include
/
hash.h
diff --git
a/include/hash.h
b/include/hash.h
index
c0a7ebc
..
4f9a8cf
100644
(file)
--- a/
include/hash.h
+++ b/
include/hash.h
@@
-17,11
+17,6
@@
enum {
HASH_FLAG_ENV = 1 << 1, /* Allow env vars */
};
HASH_FLAG_ENV = 1 << 1, /* Allow env vars */
};
-#ifndef USE_HOSTCC
-#if defined(CONFIG_SHA1SUM_VERIFY) || defined(CONFIG_CRC32_VERIFY)
-#define CONFIG_HASH_VERIFY
-#endif
-
struct hash_algo {
const char *name; /* Name of algorithm */
int digest_size; /* Length of digest */
struct hash_algo {
const char *name; /* Name of algorithm */
int digest_size; /* Length of digest */
@@
-77,6
+72,7
@@
struct hash_algo {
int size);
};
int size);
};
+#ifndef USE_HOSTCC
/**
* hash_command: Process a hash command for a particular algorithm
*
/**
* hash_command: Process a hash command for a particular algorithm
*
@@
-114,6
+110,8
@@
int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag,
int hash_block(const char *algo_name, const void *data, unsigned int len,
uint8_t *output, int *output_size);
int hash_block(const char *algo_name, const void *data, unsigned int len,
uint8_t *output, int *output_size);
+#endif /* !USE_HOSTCC */
+
/**
* hash_lookup_algo() - Look up the hash_algo struct for an algorithm
*
/**
* hash_lookup_algo() - Look up the hash_algo struct for an algorithm
*
@@
-142,18
+140,17
@@
int hash_progressive_lookup_algo(const char *algo_name,
struct hash_algo **algop);
/**
struct hash_algo **algop);
/**
- * hash_
show() - Print out a hash algorithm and value
+ * hash_
parse_string() - Parse hash string into a binary array
*
*
- * You will get a message like this (without a newline at the end):
+ * The function parses a hash string into a binary array that
+ * can for example easily be used to compare to hash values.
*
*
- * "sha1 for 9eb3337c ... 9eb3338f ==> 7942ef1df479fd3130f716eb9613d107dab7e257"
+ * @algo_name: Hash algorithm to look up
+ * @str: Hash string to get parsed
+ * @result: Binary array of the parsed hash string
*
*
- * @algo: Algorithm used for hash
- * @addr: Address of data that was hashed
- * @len: Length of data that was hashed
- * @output: Hash value to display
+ * @return 0 if ok, -EPROTONOSUPPORT for an unknown algorithm.
*/
*/
-void hash_show(struct hash_algo *algo, ulong addr, ulong len,
- uint8_t *output);
-#endif /* !USE_HOSTCC */
+int hash_parse_string(const char *algo_name, const char *str, uint8_t *result);
+
#endif
#endif