diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/gpio.h | 17 | ||||
| -rw-r--r-- | include/command.h | 8 | ||||
| -rw-r--r-- | include/config_cmd_all.h | 4 | ||||
| -rw-r--r-- | include/configs/smdk5250.h | 7 | ||||
| -rw-r--r-- | include/edid.h | 275 | ||||
| -rw-r--r-- | include/hash.h | 69 | ||||
| -rw-r--r-- | include/linux/string.h | 7 | ||||
| -rw-r--r-- | include/sha1.h | 26 | ||||
| -rw-r--r-- | include/sha256.h | 8 | 
9 files changed, 384 insertions, 37 deletions
| diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 23c964940..bfedbe445 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -42,10 +42,11 @@   */  /** - * Request ownership of a GPIO. + * Request a gpio. This should be called before any of the other functions + * are used on this gpio.   * - * @param gpio	GPIO number - * @param label	Name given to the GPIO + * @param gp	GPIO number + * @param label	User label for this GPIO   * @return 0 if ok, -1 on error   */  int gpio_request(unsigned gpio, const char *label); @@ -93,14 +94,4 @@ int gpio_get_value(unsigned gpio);   * @return 0 if ok, -1 on error   */  int gpio_set_value(unsigned gpio, int value); - -/** - * Request a gpio. This should be called before any of the other functions - * are used on this gpio. - * - * @param gp	GPIO number - * @param label	User label for this GPIO - * @return 0 if ok, -1 on error - */ -int gpio_request(unsigned gpio, const char *label);  #endif	/* _ASM_GENERIC_GPIO_H_ */ diff --git a/include/command.h b/include/command.h index 10bc2606c..476e7cffc 100644 --- a/include/command.h +++ b/include/command.h @@ -89,10 +89,10 @@ extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *   */  #if defined(CONFIG_CMD_MEMORY)		\ -    || defined(CONFIG_CMD_I2C)		\ -    || defined(CONFIG_CMD_ITEST)	\ -    || defined(CONFIG_CMD_PCI)		\ -    || defined(CONFIG_CMD_PORTIO) +	|| defined(CONFIG_CMD_I2C)	\ +	|| defined(CONFIG_CMD_ITEST)	\ +	|| defined(CONFIG_CMD_PCI)	\ +	|| defined(CONFIG_CMD_PORTIO)  #define CMD_DATA_SIZE  extern int cmd_get_data_size(char* arg, int default_size);  #endif diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index f434cd089..e82f6421c 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -40,12 +40,15 @@  #define CONFIG_CMD_FDOS		/* Floppy DOS support		*/  #define CONFIG_CMD_FLASH	/* flinfo, erase, protect	*/  #define CONFIG_CMD_FPGA		/* FPGA configuration Support	*/ +#define CONFIG_CMD_GETTIME	/* Get time since boot         */ +#define CONFIG_CMD_HASH		/* calculate hash / digest	*/  #define CONFIG_CMD_HWFLOW	/* RTS/CTS hw flow control	*/  #define CONFIG_CMD_I2C		/* I2C serial bus support	*/  #define CONFIG_CMD_IDE		/* IDE harddisk support		*/  #define CONFIG_CMD_IMI		/* iminfo			*/  #define CONFIG_CMD_IMLS		/* List all found images	*/  #define CONFIG_CMD_IMMAP	/* IMMR dump support		*/ +#define CONFIG_CMD_IO		/* Access to X86 IO space	*/  #define CONFIG_CMD_IRQ		/* irqinfo			*/  #define CONFIG_CMD_ITEST	/* Integer (and string) test	*/  #define CONFIG_CMD_JFFS2	/* JFFS2 Support		*/ @@ -70,6 +73,7 @@  #define CONFIG_CMD_REGINFO	/* Register dump		*/  #define CONFIG_CMD_REISER	/* Reiserfs support		*/  #define CONFIG_CMD_RARP		/* rarpboot support		*/ +#define CONFIG_CMD_READ		/* Read data from partition	*/  #define CONFIG_CMD_RUN		/* run command in env variable	*/  #define CONFIG_CMD_SAVEENV	/* saveenv			*/  #define CONFIG_CMD_SAVES	/* save S record dump		*/ diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index c0f86228b..39a347af8 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -203,6 +203,7 @@  #define CONFIG_I2C_MULTI_BUS  #define CONFIG_MAX_I2C_NUM	8  #define CONFIG_SYS_I2C_SLAVE    0x0 +#define CONFIG_I2C_EDID  /* Ethernet Controllor Driver */  #ifdef CONFIG_CMD_NET @@ -215,4 +216,10 @@  /* Enable devicetree support */  #define CONFIG_OF_LIBFDT +/* SHA hashing */ +#define CONFIG_CMD_HASH +#define CONFIG_HASH_VERIFY +#define CONFIG_SHA1 +#define CONFIG_SHA256 +  #endif	/* __CONFIG_H */ diff --git a/include/edid.h b/include/edid.h new file mode 100644 index 000000000..4788de939 --- /dev/null +++ b/include/edid.h @@ -0,0 +1,275 @@ +/* + * Copyright (c) 2012 The Chromium OS Authors. + * + * (C) Copyright 2010 + * Petr Stetiar <ynezz@true.cz> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * Contains stolen code from ddcprobe project which is: + * Copyright (C) Nalin Dahyabhai <bigfun@pobox.com> + * + */ + +#ifndef __EDID_H_ +#define __EDID_H_ + +#include <linux/types.h> + +#define GET_BIT(_x, _pos) \ +	(((_x) >> (_pos)) & 1) +#define GET_BITS(_x, _pos_msb, _pos_lsb) \ +	(((_x) >> (_pos_lsb)) & ((1 << ((_pos_msb) - (_pos_lsb) + 1)) - 1)) + +/* Aspect ratios used in EDID info. */ +enum edid_aspect { +	ASPECT_625 = 0, +	ASPECT_75, +	ASPECT_8, +	ASPECT_5625, +}; + +/* Detailed timing information used in EDID v1.x */ +struct edid_detailed_timing { +	unsigned char pixel_clock[2]; +#define EDID_DETAILED_TIMING_PIXEL_CLOCK(_x) \ +	(((((uint32_t)(_x).pixel_clock[1]) << 8) + \ +	 (_x).pixel_clock[0]) * 10000) +	unsigned char horizontal_active; +	unsigned char horizontal_blanking; +	unsigned char horizontal_active_blanking_hi; +#define EDID_DETAILED_TIMING_HORIZONTAL_ACTIVE(_x) \ +	((GET_BITS((_x).horizontal_active_blanking_hi, 7, 4) << 8) + \ +	 (_x).horizontal_active) +#define EDID_DETAILED_TIMING_HORIZONTAL_BLANKING(_x) \ +	((GET_BITS((_x).horizontal_active_blanking_hi, 3, 0) << 8) + \ +	 (_x).horizontal_blanking) +	unsigned char vertical_active; +	unsigned char vertical_blanking; +	unsigned char vertical_active_blanking_hi; +#define EDID_DETAILED_TIMING_VERTICAL_ACTIVE(_x) \ +	((GET_BITS((_x).vertical_active_blanking_hi, 7, 4) << 8) + \ +	 (_x).vertical_active) +#define EDID_DETAILED_TIMING_VERTICAL_BLANKING(_x) \ +	((GET_BITS((_x).vertical_active_blanking_hi, 3, 0) << 8) + \ +	 (_x).vertical_blanking) +	unsigned char hsync_offset; +	unsigned char hsync_pulse_width; +	unsigned char sync_offset_pulse_width; +	unsigned char hsync_vsync_offset_pulse_width_hi; +#define EDID_DETAILED_TIMING_HSYNC_OFFSET(_x) \ +	((GET_BITS((_x).hsync_vsync_offset_pulse_width_hi, 7, 6) << 8) + \ +	 (_x).hsync_offset) +#define EDID_DETAILED_TIMING_HSYNC_PULSE_WIDTH(_x) \ +	((GET_BITS((_x).hsync_vsync_offset_pulse_width_hi, 5, 4) << 8) + \ +	 (_x).hsync_pulse_width) +#define EDID_DETAILED_TIMING_VSYNC_OFFSET(_x) \ +	((GET_BITS((_x).hsync_vsync_offset_pulse_width_hi, 3, 2) << 4) + \ +	 GET_BITS((_x).vsync_offset_pulse_width, 7, 4)) +#define EDID_DETAILED_TIMING_VSYNC_PULSE_WIDTH(_x) \ +	((GET_BITS((_x).hsync_vsync_offset_pulse_width_hi, 1, 0) << 4) + \ +	 GET_BITS((_x).vsync_offset_pulse_width, 3, 0)) +	unsigned char himage_size; +	unsigned char vimage_size; +	unsigned char himage_vimage_size_hi; +#define EDID_DETAILED_TIMING_HIMAGE_SIZE(_x) \ +	((GET_BITS((_x).himage_vimage_size_hi, 7, 4) << 8) + (_x).himage_size) +#define EDID_DETAILED_TIMING_VIMAGE_SIZE(_x) \ +	((GET_BITS((_x).himage_vimage_size_hi, 3, 0) << 8) + (_x).vimage_size) +	unsigned char hborder; +	unsigned char vborder; +	unsigned char flags; +#define EDID_DETAILED_TIMING_FLAG_INTERLACED(_x) \ +	GET_BIT((_x).flags, 7) +#define EDID_DETAILED_TIMING_FLAG_STEREO(_x) \ +	GET_BITS((_x).flags, 6, 5) +#define EDID_DETAILED_TIMING_FLAG_DIGITAL_COMPOSITE(_x) \ +	GET_BITS((_x).flags, 4, 3) +#define EDID_DETAILED_TIMING_FLAG_POLARITY(_x) \ +	GET_BITS((_x).flags, 2, 1) +#define EDID_DETAILED_TIMING_FLAG_INTERLEAVED(_x) \ +	GET_BIT((_x).flags, 0) +} __attribute__ ((__packed__)); + +enum edid_monitor_descriptor_types { +	EDID_MONITOR_DESCRIPTOR_SERIAL = 0xff, +	EDID_MONITOR_DESCRIPTOR_ASCII = 0xfe, +	EDID_MONITOR_DESCRIPTOR_RANGE = 0xfd, +	EDID_MONITOR_DESCRIPTOR_NAME = 0xfc, +}; + +struct edid_monitor_descriptor { +	uint16_t zero_flag_1; +	unsigned char zero_flag_2; +	unsigned char type; +	unsigned char zero_flag_3; +	union { +		char string[13]; +		struct { +			unsigned char vertical_min; +			unsigned char vertical_max; +			unsigned char horizontal_min; +			unsigned char horizontal_max; +			unsigned char pixel_clock_max; +			unsigned char gtf_data[8]; +		} range_data; +	} data; +} __attribute__ ((__packed__)); + +struct edid1_info { +	unsigned char header[8]; +	unsigned char manufacturer_name[2]; +#define EDID1_INFO_MANUFACTURER_NAME_ZERO(_x) \ +	GET_BIT(((_x).manufacturer_name[0]), 7) +#define EDID1_INFO_MANUFACTURER_NAME_CHAR1(_x) \ +	GET_BITS(((_x).manufacturer_name[0]), 6, 2) +#define EDID1_INFO_MANUFACTURER_NAME_CHAR2(_x) \ +	((GET_BITS(((_x).manufacturer_name[0]), 1, 0) << 3) + \ +	 GET_BITS(((_x).manufacturer_name[1]), 7, 5)) +#define EDID1_INFO_MANUFACTURER_NAME_CHAR3(_x) \ +	GET_BITS(((_x).manufacturer_name[1]), 4, 0) +	unsigned char product_code[2]; +#define EDID1_INFO_PRODUCT_CODE(_x) \ +	(((uint16_t)(_x).product_code[1] << 8) + (_x).product_code[0]) +	unsigned char serial_number[4]; +#define EDID1_INFO_SERIAL_NUMBER(_x) \ +	(((uint32_t)(_x).serial_number[3] << 24) + \ +	 ((_x).serial_number[2] << 16) + ((_x).serial_number[1] << 8) + \ +	 (_x).serial_number[0]) +	unsigned char week; +	unsigned char year; +	unsigned char version; +	unsigned char revision; +	unsigned char video_input_definition; +#define EDID1_INFO_VIDEO_INPUT_DIGITAL(_x) \ +	GET_BIT(((_x).video_input_definition), 7) +#define EDID1_INFO_VIDEO_INPUT_VOLTAGE_LEVEL(_x) \ +	GET_BITS(((_x).video_input_definition), 6, 5) +#define EDID1_INFO_VIDEO_INPUT_BLANK_TO_BLACK(_x) \ +	GET_BIT(((_x).video_input_definition), 4) +#define EDID1_INFO_VIDEO_INPUT_SEPARATE_SYNC(_x) \ +	GET_BIT(((_x).video_input_definition), 3) +#define EDID1_INFO_VIDEO_INPUT_COMPOSITE_SYNC(_x) \ +	GET_BIT(((_x).video_input_definition), 2) +#define EDID1_INFO_VIDEO_INPUT_SYNC_ON_GREEN(_x) \ +	GET_BIT(((_x).video_input_definition), 1) +#define EDID1_INFO_VIDEO_INPUT_SERRATION_V(_x) \ +	GET_BIT(((_x).video_input_definition), 0) +	unsigned char max_size_horizontal; +	unsigned char max_size_vertical; +	unsigned char gamma; +	unsigned char feature_support; +#define EDID1_INFO_FEATURE_STANDBY(_x) \ +	GET_BIT(((_x).feature_support), 7) +#define EDID1_INFO_FEATURE_SUSPEND(_x) \ +	GET_BIT(((_x).feature_support), 6) +#define EDID1_INFO_FEATURE_ACTIVE_OFF(_x) \ +	GET_BIT(((_x).feature_support), 5) +#define EDID1_INFO_FEATURE_DISPLAY_TYPE(_x) \ +	GET_BITS(((_x).feature_support), 4, 3) +#define EDID1_INFO_FEATURE_RGB(_x) \ +	GET_BIT(((_x).feature_support), 2) +#define EDID1_INFO_FEATURE_PREFERRED_TIMING_MODE(_x) \ +	GET_BIT(((_x).feature_support), 1) +#define EDID1_INFO_FEATURE_DEFAULT_GTF_SUPPORT(_x) \ +	GET_BIT(((_x).feature_support), 0) +	unsigned char color_characteristics[10]; +	unsigned char established_timings[3]; +#define EDID1_INFO_ESTABLISHED_TIMING_720X400_70(_x) \ +	GET_BIT(((_x).established_timings[0]), 7) +#define EDID1_INFO_ESTABLISHED_TIMING_720X400_88(_x) \ +	GET_BIT(((_x).established_timings[0]), 6) +#define EDID1_INFO_ESTABLISHED_TIMING_640X480_60(_x) \ +	GET_BIT(((_x).established_timings[0]), 5) +#define EDID1_INFO_ESTABLISHED_TIMING_640X480_67(_x) \ +	GET_BIT(((_x).established_timings[0]), 4) +#define EDID1_INFO_ESTABLISHED_TIMING_640X480_72(_x) \ +	GET_BIT(((_x).established_timings[0]), 3) +#define EDID1_INFO_ESTABLISHED_TIMING_640X480_75(_x) \ +	GET_BIT(((_x).established_timings[0]), 2) +#define EDID1_INFO_ESTABLISHED_TIMING_800X600_56(_x) \ +	GET_BIT(((_x).established_timings[0]), 1) +#define EDID1_INFO_ESTABLISHED_TIMING_800X600_60(_x) \ +	GET_BIT(((_x).established_timings[0]), 0) +#define EDID1_INFO_ESTABLISHED_TIMING_800X600_72(_x) \ +	GET_BIT(((_x).established_timings[1]), 7) +#define EDID1_INFO_ESTABLISHED_TIMING_800X600_75(_x) \ +	GET_BIT(((_x).established_timings[1]), 6) +#define EDID1_INFO_ESTABLISHED_TIMING_832X624_75(_x) \ +	GET_BIT(((_x).established_timings[1]), 5) +#define EDID1_INFO_ESTABLISHED_TIMING_1024X768_87I(_x) \ +	GET_BIT(((_x).established_timings[1]), 4) +#define EDID1_INFO_ESTABLISHED_TIMING_1024X768_60(_x) \ +	GET_BIT(((_x).established_timings[1]), 3) +#define EDID1_INFO_ESTABLISHED_TIMING_1024X768_70(_x) \ +	GET_BIT(((_x).established_timings[1]), 2) +#define EDID1_INFO_ESTABLISHED_TIMING_1024X768_75(_x) \ +	GET_BIT(((_x).established_timings[1]), 1) +#define EDID1_INFO_ESTABLISHED_TIMING_1280X1024_75(_x) \ +	GET_BIT(((_x).established_timings[1]), 0) +#define EDID1_INFO_ESTABLISHED_TIMING_1152X870_75(_x) \ +	GET_BIT(((_x).established_timings[2]), 7) +	struct { +		unsigned char xresolution; +		unsigned char aspect_vfreq; +	} __attribute__((__packed__)) standard_timings[8]; +#define EDID1_INFO_STANDARD_TIMING_XRESOLUTION(_x, _i) \ +	(((_x).standard_timings[_i]).xresolution) +#define EDID1_INFO_STANDARD_TIMING_ASPECT(_x, _i) \ +	GET_BITS(((_x).standard_timings[_i].aspect_vfreq), 7, 6) +#define EDID1_INFO_STANDARD_TIMING_VFREQ(_x, _i) \ +	GET_BITS(((_x).standard_timings[_i].aspect_vfreq), 5, 0) +	union { +		unsigned char timing[72]; +		struct edid_monitor_descriptor descriptor[4]; +	} monitor_details; +	unsigned char extension_flag; +	unsigned char checksum; +} __attribute__ ((__packed__)); + +/** + * Print the EDID info. + * + * @param edid_info	The EDID info to be printed + */ +void edid_print_info(struct edid1_info *edid_info); + +/** + * Check the EDID info. + * + * @param info  The EDID info to be checked + * @return 0 on valid, or -1 on invalid + */ +int edid_check_info(struct edid1_info *info); + +/** + * Get the horizontal and vertical rate ranges of the monitor. + * + * @param edid	The EDID info + * @param hmin	Returns the minimum horizontal rate + * @param hmax	Returns the maxium horizontal rate + * @param vmin	Returns the minimum vertical rate + * @param vmax	Returns the maxium vertical rate + * @return 0 on success, or -1 on error + */ +int edid_get_ranges(struct edid1_info *edid, unsigned int *hmin, +		    unsigned int *hmax, unsigned int *vmin, +		    unsigned int *vmax); + +#endif /* __EDID_H_ */ diff --git a/include/hash.h b/include/hash.h new file mode 100644 index 000000000..34ba558bd --- /dev/null +++ b/include/hash.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2012 The Chromium OS Authors. + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _HASH_H +#define _HASH_H + +#ifdef CONFIG_SHA1SUM_VERIFY +#define CONFIG_HASH_VERIFY +#endif + +struct hash_algo { +	const char *name;			/* Name of algorithm */ +	int digest_size;			/* Length of digest */ +	/** +	 * hash_func_ws: Generic hashing function +	 * +	 * This is the generic prototype for a hashing function. We only +	 * have the watchdog version at present. +	 * +	 * @input:	Input buffer +	 * @ilen:	Input buffer length +	 * @output:	Checksum result (length depends on algorithm) +	 * @chunk_sz:	Trigger watchdog after processing this many bytes +	 */ +	void (*hash_func_ws)(const unsigned char *input, unsigned int ilen, +		unsigned char *output, unsigned int chunk_sz); +	int chunk_size;				/* Watchdog chunk size */ +}; + +/* + * Maximum digest size for all algorithms we support. Having this value + * avoids a malloc() or C99 local declaration in common/cmd_hash.c. + */ +#define HASH_MAX_DIGEST_SIZE	32 + +/** + * hash_command: Process a hash command for a particular algorithm + * + * This common function is used to implement specific hash commands. + * + * @algo_name:		Hash algorithm being used + * @verify:		Non-zero to enable verify mode + * @cmdtp:		Pointer to command table entry + * @flag:		Some flags normally 0 (see CMD_FLAG_.. above) + * @argc:		Number of arguments (arg 0 must be the command text) + * @argv:		Arguments + */ +int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, +		 int argc, char * const argv[]); + +#endif diff --git a/include/linux/string.h b/include/linux/string.h index 9a8cbc24c..de833554a 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -38,8 +38,11 @@ extern int strcmp(const char *,const char *);  #ifndef __HAVE_ARCH_STRNCMP  extern int strncmp(const char *,const char *,__kernel_size_t);  #endif -#if 0 /* not used - was: #ifndef __HAVE_ARCH_STRNICMP */ -extern int strnicmp(const char *, const char *, __kernel_size_t); +#ifndef __HAVE_ARCH_STRCASECMP +int strcasecmp(const char *s1, const char *s2); +#endif +#ifndef __HAVE_ARCH_STRNCASECMP +extern int strncasecmp(const char *s1, const char *s2, __kernel_size_t len);  #endif  #ifndef __HAVE_ARCH_STRCHR  extern char * strchr(const char *,int); diff --git a/include/sha1.h b/include/sha1.h index 734d1fb15..da09dab97 100644 --- a/include/sha1.h +++ b/include/sha1.h @@ -59,7 +59,8 @@ void sha1_starts( sha1_context *ctx );   * \param input    buffer holding the  data   * \param ilen	   length of the input data   */ -void sha1_update( sha1_context *ctx, unsigned char *input, int ilen ); +void sha1_update(sha1_context *ctx, const unsigned char *input, +		 unsigned int ilen);  /**   * \brief	   SHA-1 final digest @@ -76,8 +77,8 @@ void sha1_finish( sha1_context *ctx, unsigned char output[20] );   * \param ilen	   length of the input data   * \param output   SHA-1 checksum result   */ -void sha1_csum( unsigned char *input, int ilen, -		unsigned char output[20] ); +void sha1_csum(const unsigned char *input, unsigned int ilen, +		unsigned char *output);  /**   * \brief	   Output = SHA-1( input buffer ), with watchdog triggering @@ -87,17 +88,8 @@ void sha1_csum( unsigned char *input, int ilen,   * \param output   SHA-1 checksum result   * \param chunk_sz watchdog triggering period (in bytes of input processed)   */ -void sha1_csum_wd (unsigned char *input, int ilen, -		unsigned char output[20], unsigned int chunk_sz); - -/** - * \brief	   Output = SHA-1( file contents ) - * - * \param path	   input file name - * \param output   SHA-1 checksum result - * \return	   0 if successful, or 1 if fopen failed - */ -int sha1_file( char *path, unsigned char output[20] ); +void sha1_csum_wd(const unsigned char *input, unsigned int ilen, +		unsigned char *output, unsigned int chunk_sz);  /**   * \brief	   Output = HMAC-SHA-1( input buffer, hmac key ) @@ -108,9 +100,9 @@ int sha1_file( char *path, unsigned char output[20] );   * \param ilen	   length of the input data   * \param output   HMAC-SHA-1 result   */ -void sha1_hmac( unsigned char *key, int keylen, -		unsigned char *input, int ilen, -		unsigned char output[20] ); +void sha1_hmac(const unsigned char *key, int keylen, +		const unsigned char *input, unsigned int ilen, +		unsigned char *output);  /**   * \brief	   Checkup routine diff --git a/include/sha256.h b/include/sha256.h index e38ea898c..beadab35f 100644 --- a/include/sha256.h +++ b/include/sha256.h @@ -3,6 +3,9 @@  #define SHA256_SUM_LEN	32 +/* Reset watchdog each time we process this many bytes */ +#define CHUNKSZ_SHA256	(64 * 1024) +  typedef struct {  	uint32_t total[2];  	uint32_t state[8]; @@ -10,7 +13,10 @@ typedef struct {  } sha256_context;  void sha256_starts(sha256_context * ctx); -void sha256_update(sha256_context * ctx, uint8_t * input, uint32_t length); +void sha256_update(sha256_context *ctx, const uint8_t *input, uint32_t length);  void sha256_finish(sha256_context * ctx, uint8_t digest[SHA256_SUM_LEN]); +void sha256_csum_wd(const unsigned char *input, unsigned int ilen, +		unsigned char *output, unsigned int chunk_sz); +  #endif /* _SHA256_H */ |