Meco Man 4 سال پیش
والد
کامیت
b6f9cbe4b4
12فایلهای تغییر یافته به همراه1651 افزوده شده و 1651 حذف شده
  1. 64 64
      include/tiny_aes.h
  2. 37 37
      include/tiny_base64.h
  3. 70 70
      include/tiny_md5.h
  4. 74 74
      include/tiny_sha1.h
  5. 79 79
      include/tiny_sha2.h
  6. 1 1
      samples/aes_sample.c
  7. 1 1
      samples/md5_sample.c
  8. 412 412
      src/tiny_aes.c
  9. 144 144
      src/tiny_base64.c
  10. 230 230
      src/tiny_md5.c
  11. 257 257
      src/tiny_sha1.c
  12. 282 282
      src/tiny_sha2.c

+ 64 - 64
include/tiny_aes.h

@@ -2,7 +2,7 @@
  * \file aes.h
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -44,80 +44,80 @@
  * \brief          AES context structure
  */
 typedef struct {
-	int nr;			/*!<  number of rounds  */
-	unsigned long *rk;	/*!<  AES round keys    */
-	unsigned long buf[68];	/*!<  unaligned data    */
+    int nr;         /*!<  number of rounds  */
+    unsigned long *rk;  /*!<  AES round keys    */
+    unsigned long buf[68];  /*!<  unaligned data    */
 } tiny_aes_context;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	/**
-	 * \brief          AES key schedule (encryption)
-	 *
-	 * \param ctx      AES context to be initialized
-	 * \param key      encryption key
-	 * \param keysize  must be 128, 192 or 256
-	 */
-	void tiny_aes_setkey_enc(tiny_aes_context * ctx, unsigned char *key, int keysize);
+    /**
+     * \brief          AES key schedule (encryption)
+     *
+     * \param ctx      AES context to be initialized
+     * \param key      encryption key
+     * \param keysize  must be 128, 192 or 256
+     */
+    void tiny_aes_setkey_enc(tiny_aes_context * ctx, unsigned char *key, int keysize);
 
-	/**
-	 * \brief          AES key schedule (decryption)
-	 *
-	 * \param ctx      AES context to be initialized
-	 * \param key      decryption key
-	 * \param keysize  must be 128, 192 or 256
-	 */
-	void tiny_aes_setkey_dec(tiny_aes_context * ctx, unsigned char *key, int keysize);
+    /**
+     * \brief          AES key schedule (decryption)
+     *
+     * \param ctx      AES context to be initialized
+     * \param key      decryption key
+     * \param keysize  must be 128, 192 or 256
+     */
+    void tiny_aes_setkey_dec(tiny_aes_context * ctx, unsigned char *key, int keysize);
 
-	/**
-	 * \brief          AES-ECB block encryption/decryption
-	 *
-	 * \param ctx      AES context
-	 * \param mode     AES_ENCRYPT or AES_DECRYPT
-	 * \param input    16-byte input block
-	 * \param output   16-byte output block
-	 */
-	void tiny_aes_crypt_ecb(tiny_aes_context * ctx,
-			   int mode,
-			   unsigned char input[16], unsigned char output[16]);
+    /**
+     * \brief          AES-ECB block encryption/decryption
+     *
+     * \param ctx      AES context
+     * \param mode     AES_ENCRYPT or AES_DECRYPT
+     * \param input    16-byte input block
+     * \param output   16-byte output block
+     */
+    void tiny_aes_crypt_ecb(tiny_aes_context * ctx,
+               int mode,
+               unsigned char input[16], unsigned char output[16]);
 
-	/**
-	 * \brief          AES-CBC buffer encryption/decryption
-	 *
-	 * \param ctx      AES context
-	 * \param mode     AES_ENCRYPT or AES_DECRYPT
-	 * \param length   length of the input data
-	 * \param iv       initialization vector (updated after use)
-	 * \param input    buffer holding the input data
-	 * \param output   buffer holding the output data
-	 */
-	void tiny_aes_crypt_cbc(tiny_aes_context * ctx,
-			   int mode,
-			   int length,
-			   unsigned char iv[16],
-			   unsigned char *input, unsigned char *output);
+    /**
+     * \brief          AES-CBC buffer encryption/decryption
+     *
+     * \param ctx      AES context
+     * \param mode     AES_ENCRYPT or AES_DECRYPT
+     * \param length   length of the input data
+     * \param iv       initialization vector (updated after use)
+     * \param input    buffer holding the input data
+     * \param output   buffer holding the output data
+     */
+    void tiny_aes_crypt_cbc(tiny_aes_context * ctx,
+               int mode,
+               int length,
+               unsigned char iv[16],
+               unsigned char *input, unsigned char *output);
 
-	/**
-	 * \brief          AES-CFB128 buffer encryption/decryption
-	 *
-	 * \param ctx      AES context
-	 * \param mode     AES_ENCRYPT or AES_DECRYPT
-	 * \param length   length of the input data
-	 * \param iv_off   offset in IV (updated after use)
-	 * \param iv       initialization vector (updated after use)
-	 * \param input    buffer holding the input data
-	 * \param output   buffer holding the output data
-	 */
-	void tiny_aes_crypt_cfb128(tiny_aes_context * ctx,
-			      int mode,
-			      int length,
-			      int *iv_off,
-			      unsigned char iv[16],
-			      unsigned char *input, unsigned char *output);
+    /**
+     * \brief          AES-CFB128 buffer encryption/decryption
+     *
+     * \param ctx      AES context
+     * \param mode     AES_ENCRYPT or AES_DECRYPT
+     * \param length   length of the input data
+     * \param iv_off   offset in IV (updated after use)
+     * \param iv       initialization vector (updated after use)
+     * \param input    buffer holding the input data
+     * \param output   buffer holding the output data
+     */
+    void tiny_aes_crypt_cfb128(tiny_aes_context * ctx,
+                  int mode,
+                  int length,
+                  int *iv_off,
+                  unsigned char iv[16],
+                  unsigned char *input, unsigned char *output);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* aes.h */
+#endif              /* aes.h */

+ 37 - 37
include/tiny_base64.h

@@ -2,7 +2,7 @@
  * \file base64.h
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -44,44 +44,44 @@
 extern "C" {
 #endif
 
-	/**
-	 * \brief          Encode a buffer into base64 format
-	 *
-	 * \param dst      destination buffer
-	 * \param dlen     size of the buffer
-	 * \param src      source buffer
-	 * \param slen     amount of data to be encoded
-	 *
-	 * \return         0 if successful, or TROPICSSL_ERR_BASE64_BUFFER_TOO_SMALL.
-	 *                 *dlen is always updated to reflect the amount
-	 *                 of data that has (or would have) been written.
-	 *
-	 * \note           Call this function with *dlen = 0 to obtain the
-	 *                 required buffer size in *dlen
-	 */
-	int tiny_base64_encode(unsigned char *dst, int *dlen,
-			  unsigned char *src, int slen);
+    /**
+     * \brief          Encode a buffer into base64 format
+     *
+     * \param dst      destination buffer
+     * \param dlen     size of the buffer
+     * \param src      source buffer
+     * \param slen     amount of data to be encoded
+     *
+     * \return         0 if successful, or TROPICSSL_ERR_BASE64_BUFFER_TOO_SMALL.
+     *                 *dlen is always updated to reflect the amount
+     *                 of data that has (or would have) been written.
+     *
+     * \note           Call this function with *dlen = 0 to obtain the
+     *                 required buffer size in *dlen
+     */
+    int tiny_base64_encode(unsigned char *dst, int *dlen,
+              unsigned char *src, int slen);
 
-	/**
-	 * \brief          Decode a base64-formatted buffer
-	 *
-	 * \param dst      destination buffer
-	 * \param dlen     size of the buffer
-	 * \param src      source buffer
-	 * \param slen     amount of data to be decoded
-	 *
-	 * \return         0 if successful, TROPICSSL_ERR_BASE64_BUFFER_TOO_SMALL, or
-	 *                 TROPICSSL_ERR_BASE64_INVALID_DATA if the input data is not
-	 *                 correct. *dlen is always updated to reflect the amount
-	 *                 of data that has (or would have) been written.
-	 *
-	 * \note           Call this function with *dlen = 0 to obtain the
-	 *                 required buffer size in *dlen
-	 */
-	int tiny_base64_decode(unsigned char *dst, int *dlen,
-			  unsigned char *src, int slen);
+    /**
+     * \brief          Decode a base64-formatted buffer
+     *
+     * \param dst      destination buffer
+     * \param dlen     size of the buffer
+     * \param src      source buffer
+     * \param slen     amount of data to be decoded
+     *
+     * \return         0 if successful, TROPICSSL_ERR_BASE64_BUFFER_TOO_SMALL, or
+     *                 TROPICSSL_ERR_BASE64_INVALID_DATA if the input data is not
+     *                 correct. *dlen is always updated to reflect the amount
+     *                 of data that has (or would have) been written.
+     *
+     * \note           Call this function with *dlen = 0 to obtain the
+     *                 required buffer size in *dlen
+     */
+    int tiny_base64_decode(unsigned char *dst, int *dlen,
+              unsigned char *src, int slen);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* base64.h */
+#endif              /* base64.h */

+ 70 - 70
include/tiny_md5.h

@@ -2,7 +2,7 @@
  * \file md5.h
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -41,90 +41,90 @@
  * \brief          MD5 context structure
  */
 typedef struct {
-	unsigned long total[2];	/*!< number of bytes processed  */
-	unsigned long state[4];	/*!< intermediate digest state  */
-	unsigned char buffer[64];	/*!< data block being processed */
+    unsigned long total[2]; /*!< number of bytes processed  */
+    unsigned long state[4]; /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
 
-	unsigned char ipad[64];	/*!< HMAC: inner padding        */
-	unsigned char opad[64];	/*!< HMAC: outer padding        */
+    unsigned char ipad[64]; /*!< HMAC: inner padding        */
+    unsigned char opad[64]; /*!< HMAC: outer padding        */
 } tiny_md5_context;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	/**
-	 * \brief          MD5 context setup
-	 *
-	 * \param ctx      context to be initialized
-	 */
-	void tiny_md5_starts(tiny_md5_context * ctx);
+    /**
+     * \brief          MD5 context setup
+     *
+     * \param ctx      context to be initialized
+     */
+    void tiny_md5_starts(tiny_md5_context * ctx);
 
-	/**
-	 * \brief          MD5 process buffer
-	 *
-	 * \param ctx      MD5 context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_md5_update(tiny_md5_context * ctx, unsigned char *input, int ilen);
+    /**
+     * \brief          MD5 process buffer
+     *
+     * \param ctx      MD5 context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_md5_update(tiny_md5_context * ctx, unsigned char *input, int ilen);
 
-	/**
-	 * \brief          MD5 final digest
-	 *
-	 * \param ctx      MD5 context
-	 * \param output   MD5 checksum result
-	 */
-	void tiny_md5_finish(tiny_md5_context * ctx, unsigned char output[16]);
+    /**
+     * \brief          MD5 final digest
+     *
+     * \param ctx      MD5 context
+     * \param output   MD5 checksum result
+     */
+    void tiny_md5_finish(tiny_md5_context * ctx, unsigned char output[16]);
 
-	/**
-	 * \brief          Output = MD5( input buffer )
-	 *
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   MD5 checksum result
-	 */
-	void tiny_md5(unsigned char *input, int ilen, unsigned char output[16]);
+    /**
+     * \brief          Output = MD5( input buffer )
+     *
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   MD5 checksum result
+     */
+    void tiny_md5(unsigned char *input, int ilen, unsigned char output[16]);
 
-	/**
-	 * \brief          MD5 HMAC context setup
-	 *
-	 * \param ctx      HMAC context to be initialized
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 */
-	void tiny_md5_hmac_starts(tiny_md5_context * ctx, unsigned char *key, int keylen);
+    /**
+     * \brief          MD5 HMAC context setup
+     *
+     * \param ctx      HMAC context to be initialized
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     */
+    void tiny_md5_hmac_starts(tiny_md5_context * ctx, unsigned char *key, int keylen);
 
-	/**
-	 * \brief          MD5 HMAC process buffer
-	 *
-	 * \param ctx      HMAC context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_md5_hmac_update(tiny_md5_context * ctx, unsigned char *input, int ilen);
+    /**
+     * \brief          MD5 HMAC process buffer
+     *
+     * \param ctx      HMAC context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_md5_hmac_update(tiny_md5_context * ctx, unsigned char *input, int ilen);
 
-	/**
-	 * \brief          MD5 HMAC final digest
-	 *
-	 * \param ctx      HMAC context
-	 * \param output   MD5 HMAC checksum result
-	 */
-	void tiny_md5_hmac_finish(tiny_md5_context * ctx, unsigned char output[16]);
+    /**
+     * \brief          MD5 HMAC final digest
+     *
+     * \param ctx      HMAC context
+     * \param output   MD5 HMAC checksum result
+     */
+    void tiny_md5_hmac_finish(tiny_md5_context * ctx, unsigned char output[16]);
 
-	/**
-	 * \brief          Output = HMAC-MD5( hmac key, input buffer )
-	 *
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   HMAC-MD5 result
-	 */
-	void tiny_md5_hmac(unsigned char *key, int keylen,
-		      unsigned char *input, int ilen, unsigned char output[16]);
+    /**
+     * \brief          Output = HMAC-MD5( hmac key, input buffer )
+     *
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   HMAC-MD5 result
+     */
+    void tiny_md5_hmac(unsigned char *key, int keylen,
+              unsigned char *input, int ilen, unsigned char output[16]);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* md5.h */
+#endif              /* md5.h */

+ 74 - 74
include/tiny_sha1.h

@@ -1,8 +1,8 @@
 /**
  * \file sha1.h
- * 
+ *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -41,93 +41,93 @@
  * \brief          SHA-1 context structure
  */
 typedef struct {
-	unsigned long total[2];	/*!< number of bytes processed  */
-	unsigned long state[5];	/*!< intermediate digest state  */
-	unsigned char buffer[64];	/*!< data block being processed */
+    unsigned long total[2]; /*!< number of bytes processed  */
+    unsigned long state[5]; /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
 
-	unsigned char ipad[64];	/*!< HMAC: inner padding        */
-	unsigned char opad[64];	/*!< HMAC: outer padding        */
+    unsigned char ipad[64]; /*!< HMAC: inner padding        */
+    unsigned char opad[64]; /*!< HMAC: outer padding        */
 } tiny_sha1_context;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	/**
-	 * \brief          SHA-1 context setup
-	 *
-	 * \param ctx      context to be initialized
-	 */
-	void tiny_sha1_starts(tiny_sha1_context * ctx);
+    /**
+     * \brief          SHA-1 context setup
+     *
+     * \param ctx      context to be initialized
+     */
+    void tiny_sha1_starts(tiny_sha1_context * ctx);
 
-	/**
-	 * \brief          SHA-1 process buffer
-	 *
-	 * \param ctx      SHA-1 context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_sha1_update(tiny_sha1_context * ctx, unsigned char *input, int ilen);
+    /**
+     * \brief          SHA-1 process buffer
+     *
+     * \param ctx      SHA-1 context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_sha1_update(tiny_sha1_context * ctx, unsigned char *input, int ilen);
 
-	/**
-	 * \brief          SHA-1 final digest
-	 *
-	 * \param ctx      SHA-1 context
-	 * \param output   SHA-1 checksum result
-	 */
-	void tiny_sha1_finish(tiny_sha1_context * ctx, unsigned char output[20]);
+    /**
+     * \brief          SHA-1 final digest
+     *
+     * \param ctx      SHA-1 context
+     * \param output   SHA-1 checksum result
+     */
+    void tiny_sha1_finish(tiny_sha1_context * ctx, unsigned char output[20]);
 
-	/**
-	 * \brief          Output = SHA-1( input buffer )
-	 *
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   SHA-1 checksum result
-	 */
-	void tiny_sha1(unsigned char *input, int ilen, unsigned char output[20]);
+    /**
+     * \brief          Output = SHA-1( input buffer )
+     *
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   SHA-1 checksum result
+     */
+    void tiny_sha1(unsigned char *input, int ilen, unsigned char output[20]);
 
-	/**
-	 * \brief          SHA-1 HMAC context setup
-	 *
-	 * \param ctx      HMAC context to be initialized
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 */
-	void tiny_sha1_hmac_starts(tiny_sha1_context * ctx, unsigned char *key,
-			      int keylen);
+    /**
+     * \brief          SHA-1 HMAC context setup
+     *
+     * \param ctx      HMAC context to be initialized
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     */
+    void tiny_sha1_hmac_starts(tiny_sha1_context * ctx, unsigned char *key,
+                  int keylen);
 
-	/**
-	 * \brief          SHA-1 HMAC process buffer
-	 *
-	 * \param ctx      HMAC context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_sha1_hmac_update(tiny_sha1_context * ctx, unsigned char *input,
-			      int ilen);
+    /**
+     * \brief          SHA-1 HMAC process buffer
+     *
+     * \param ctx      HMAC context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_sha1_hmac_update(tiny_sha1_context * ctx, unsigned char *input,
+                  int ilen);
 
-	/**
-	 * \brief          SHA-1 HMAC final digest
-	 *
-	 * \param ctx      HMAC context
-	 * \param output   SHA-1 HMAC checksum result
-	 */
-	void tiny_sha1_hmac_finish(tiny_sha1_context * ctx, unsigned char output[20]);
+    /**
+     * \brief          SHA-1 HMAC final digest
+     *
+     * \param ctx      HMAC context
+     * \param output   SHA-1 HMAC checksum result
+     */
+    void tiny_sha1_hmac_finish(tiny_sha1_context * ctx, unsigned char output[20]);
 
-	/**
-	 * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
-	 *
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   HMAC-SHA-1 result
-	 */
-	void tiny_sha1_hmac(unsigned char *key, int keylen,
-		       unsigned char *input, int ilen,
-		       unsigned char output[20]);
+    /**
+     * \brief          Output = HMAC-SHA-1( hmac key, input buffer )
+     *
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   HMAC-SHA-1 result
+     */
+    void tiny_sha1_hmac(unsigned char *key, int keylen,
+               unsigned char *input, int ilen,
+               unsigned char output[20]);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* sha1.h */
+#endif              /* sha1.h */

+ 79 - 79
include/tiny_sha2.h

@@ -2,7 +2,7 @@
  * \file sha2.h
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -41,99 +41,99 @@
  * \brief          SHA-256 context structure
  */
 typedef struct {
-	unsigned long total[2];	/*!< number of bytes processed  */
-	unsigned long state[8];	/*!< intermediate digest state  */
-	unsigned char buffer[64];	/*!< data block being processed */
+    unsigned long total[2]; /*!< number of bytes processed  */
+    unsigned long state[8]; /*!< intermediate digest state  */
+    unsigned char buffer[64];   /*!< data block being processed */
 
-	unsigned char ipad[64];	/*!< HMAC: inner padding        */
-	unsigned char opad[64];	/*!< HMAC: outer padding        */
-	int is224;		/*!< 0 => SHA-256, else SHA-224 */
+    unsigned char ipad[64]; /*!< HMAC: inner padding        */
+    unsigned char opad[64]; /*!< HMAC: outer padding        */
+    int is224;      /*!< 0 => SHA-256, else SHA-224 */
 } tiny_sha2_context;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	/**
-	 * \brief          SHA-256 context setup
-	 *
-	 * \param ctx      context to be initialized
-	 * \param is224    0 = use SHA256, 1 = use SHA224
-	 */
-	void tiny_sha2_starts(tiny_sha2_context * ctx, int is224);
+    /**
+     * \brief          SHA-256 context setup
+     *
+     * \param ctx      context to be initialized
+     * \param is224    0 = use SHA256, 1 = use SHA224
+     */
+    void tiny_sha2_starts(tiny_sha2_context * ctx, int is224);
 
-	/**
-	 * \brief          SHA-256 process buffer
-	 *
-	 * \param ctx      SHA-256 context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_sha2_update(tiny_sha2_context * ctx, unsigned char *input, int ilen);
+    /**
+     * \brief          SHA-256 process buffer
+     *
+     * \param ctx      SHA-256 context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_sha2_update(tiny_sha2_context * ctx, unsigned char *input, int ilen);
 
-	/**
-	 * \brief          SHA-256 final digest
-	 *
-	 * \param ctx      SHA-256 context
-	 * \param output   SHA-224/256 checksum result
-	 */
-	void tiny_sha2_finish(tiny_sha2_context * ctx, unsigned char output[32]);
+    /**
+     * \brief          SHA-256 final digest
+     *
+     * \param ctx      SHA-256 context
+     * \param output   SHA-224/256 checksum result
+     */
+    void tiny_sha2_finish(tiny_sha2_context * ctx, unsigned char output[32]);
 
-	/**
-	 * \brief          Output = SHA-256( input buffer )
-	 *
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   SHA-224/256 checksum result
-	 * \param is224    0 = use SHA256, 1 = use SHA224
-	 */
-	void tiny_sha2(unsigned char *input, int ilen,
-		  unsigned char output[32], int is224);
+    /**
+     * \brief          Output = SHA-256( input buffer )
+     *
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   SHA-224/256 checksum result
+     * \param is224    0 = use SHA256, 1 = use SHA224
+     */
+    void tiny_sha2(unsigned char *input, int ilen,
+          unsigned char output[32], int is224);
 
-	/**
-	 * \brief          SHA-256 HMAC context setup
-	 *
-	 * \param ctx      HMAC context to be initialized
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 * \param is224    0 = use SHA256, 1 = use SHA224
-	 */
-	void tiny_sha2_hmac_starts(tiny_sha2_context * ctx, unsigned char *key,
-			      int keylen, int is224);
+    /**
+     * \brief          SHA-256 HMAC context setup
+     *
+     * \param ctx      HMAC context to be initialized
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     * \param is224    0 = use SHA256, 1 = use SHA224
+     */
+    void tiny_sha2_hmac_starts(tiny_sha2_context * ctx, unsigned char *key,
+                  int keylen, int is224);
 
-	/**
-	 * \brief          SHA-256 HMAC process buffer
-	 *
-	 * \param ctx      HMAC context
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 */
-	void tiny_sha2_hmac_update(tiny_sha2_context * ctx, unsigned char *input,
-			      int ilen);
+    /**
+     * \brief          SHA-256 HMAC process buffer
+     *
+     * \param ctx      HMAC context
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     */
+    void tiny_sha2_hmac_update(tiny_sha2_context * ctx, unsigned char *input,
+                  int ilen);
 
-	/**
-	 * \brief          SHA-256 HMAC final digest
-	 *
-	 * \param ctx      HMAC context
-	 * \param output   SHA-224/256 HMAC checksum result
-	 */
-	void tiny_sha2_hmac_finish(tiny_sha2_context * ctx, unsigned char output[32]);
+    /**
+     * \brief          SHA-256 HMAC final digest
+     *
+     * \param ctx      HMAC context
+     * \param output   SHA-224/256 HMAC checksum result
+     */
+    void tiny_sha2_hmac_finish(tiny_sha2_context * ctx, unsigned char output[32]);
 
-	/**
-	 * \brief          Output = HMAC-SHA-256( hmac key, input buffer )
-	 *
-	 * \param key      HMAC secret key
-	 * \param keylen   length of the HMAC key
-	 * \param input    buffer holding the  data
-	 * \param ilen     length of the input data
-	 * \param output   HMAC-SHA-224/256 result
-	 * \param is224    0 = use SHA256, 1 = use SHA224
-	 */
-	void tiny_sha2_hmac(unsigned char *key, int keylen,
-		       unsigned char *input, int ilen,
-		       unsigned char output[32], int is224);
+    /**
+     * \brief          Output = HMAC-SHA-256( hmac key, input buffer )
+     *
+     * \param key      HMAC secret key
+     * \param keylen   length of the HMAC key
+     * \param input    buffer holding the  data
+     * \param ilen     length of the input data
+     * \param output   HMAC-SHA-224/256 result
+     * \param is224    0 = use SHA256, 1 = use SHA224
+     */
+    void tiny_sha2_hmac(unsigned char *key, int keylen,
+               unsigned char *input, int ilen,
+               unsigned char output[32], int is224);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* sha2.h */
+#endif              /* sha2.h */

+ 1 - 1
samples/aes_sample.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *

+ 1 - 1
samples/md5_sample.c

@@ -77,4 +77,4 @@ fail:
 }
 #ifdef FINSH_USING_MSH
 MSH_CMD_EXPORT_ALIAS(test_tiny_md5, tiny_md5_sample, type tiny_md5_sample cmd to run);
-#endif /* FINSH_USING_MSH */
+#endif /* FINSH_USING_MSH */

+ 412 - 412
src/tiny_aes.c

@@ -2,7 +2,7 @@
  *  FIPS-197 compliant AES implementation
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
+ *
  *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
  *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
@@ -76,38 +76,38 @@
  * Forward S-box
  */
 static const unsigned char FSb[256] = {
-	0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
-	0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-	0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
-	0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-	0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
-	0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-	0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
-	0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-	0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
-	0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-	0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
-	0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-	0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
-	0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-	0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
-	0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-	0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
-	0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-	0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
-	0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-	0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
-	0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-	0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
-	0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-	0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
-	0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-	0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
-	0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-	0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
-	0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-	0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
-	0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
+    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
+    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
+    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
+    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
+    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
+    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
+    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
+    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
+    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
+    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
+    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
+    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
+    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
+    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
+    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
+    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
 };
 
 /*
@@ -206,38 +206,38 @@ static const unsigned long FT3[256] = { FT };
  * Reverse S-box
  */
 static const unsigned char RSb[256] = {
-	0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
-	0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-	0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
-	0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-	0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
-	0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-	0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
-	0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-	0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
-	0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-	0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
-	0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-	0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
-	0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-	0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
-	0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-	0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
-	0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-	0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
-	0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-	0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
-	0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-	0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
-	0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-	0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
-	0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-	0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
-	0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-	0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
-	0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-	0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
-	0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
+    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
+    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
+    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
+    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
+    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
+    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
+    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
+    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
+    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
+    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
+    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
+    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
+    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
+    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
+    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
+    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
 };
 
 /*
@@ -336,9 +336,9 @@ static const unsigned long RT3[256] = { RT };
  * Round constants
  */
 static const unsigned long RCON[10] = {
-	0x00000001, 0x00000002, 0x00000004, 0x00000008,
-	0x00000010, 0x00000020, 0x00000040, 0x00000080,
-	0x0000001B, 0x00000036
+    0x00000001, 0x00000002, 0x00000004, 0x00000008,
+    0x00000010, 0x00000020, 0x00000040, 0x00000080,
+    0x0000001B, 0x00000036
 };
 
 #else
@@ -377,77 +377,77 @@ static int aes_init_done = 0;
 
 static void aes_gen_tables(void)
 {
-	int i, x, y, z;
-	int pow[256];
-	int log[256];
-
-	/*
-	 * compute pow and log tables over GF(2^8)
-	 */
-	for (i = 0, x = 1; i < 256; i++) {
-		pow[i] = x;
-		log[x] = i;
-		x = (x ^ XTIME(x)) & 0xFF;
-	}
-
-	/*
-	 * calculate the round constants
-	 */
-	for (i = 0, x = 1; i < 10; i++) {
-		RCON[i] = (unsigned long)x;
-		x = XTIME(x) & 0xFF;
-	}
-
-	/*
-	 * generate the forward and reverse S-boxes
-	 */
-	FSb[0x00] = 0x63;
-	RSb[0x63] = 0x00;
-
-	for (i = 1; i < 256; i++) {
-		x = pow[255 - log[i]];
-
-		y = x;
-		y = ((y << 1) | (y >> 7)) & 0xFF;
-		x ^= y;
-		y = ((y << 1) | (y >> 7)) & 0xFF;
-		x ^= y;
-		y = ((y << 1) | (y >> 7)) & 0xFF;
-		x ^= y;
-		y = ((y << 1) | (y >> 7)) & 0xFF;
-		x ^= y ^ 0x63;
-
-		FSb[i] = (unsigned char)x;
-		RSb[x] = (unsigned char)i;
-	}
-
-	/*
-	 * generate the forward and reverse tables
-	 */
-	for (i = 0; i < 256; i++) {
-		x = FSb[i];
-		y = XTIME(x) & 0xFF;
-		z = (y ^ x) & 0xFF;
-
-		FT0[i] = ((unsigned long)y) ^
-		    ((unsigned long)x << 8) ^
-		    ((unsigned long)x << 16) ^ ((unsigned long)z << 24);
-
-		FT1[i] = ROTL8(FT0[i]);
-		FT2[i] = ROTL8(FT1[i]);
-		FT3[i] = ROTL8(FT2[i]);
-
-		x = RSb[i];
-
-		RT0[i] = ((unsigned long)MUL(0x0E, x)) ^
-		    ((unsigned long)MUL(0x09, x) << 8) ^
-		    ((unsigned long)MUL(0x0D, x) << 16) ^
-		    ((unsigned long)MUL(0x0B, x) << 24);
-
-		RT1[i] = ROTL8(RT0[i]);
-		RT2[i] = ROTL8(RT1[i]);
-		RT3[i] = ROTL8(RT2[i]);
-	}
+    int i, x, y, z;
+    int pow[256];
+    int log[256];
+
+    /*
+     * compute pow and log tables over GF(2^8)
+     */
+    for (i = 0, x = 1; i < 256; i++) {
+        pow[i] = x;
+        log[x] = i;
+        x = (x ^ XTIME(x)) & 0xFF;
+    }
+
+    /*
+     * calculate the round constants
+     */
+    for (i = 0, x = 1; i < 10; i++) {
+        RCON[i] = (unsigned long)x;
+        x = XTIME(x) & 0xFF;
+    }
+
+    /*
+     * generate the forward and reverse S-boxes
+     */
+    FSb[0x00] = 0x63;
+    RSb[0x63] = 0x00;
+
+    for (i = 1; i < 256; i++) {
+        x = pow[255 - log[i]];
+
+        y = x;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y;
+        y = ((y << 1) | (y >> 7)) & 0xFF;
+        x ^= y ^ 0x63;
+
+        FSb[i] = (unsigned char)x;
+        RSb[x] = (unsigned char)i;
+    }
+
+    /*
+     * generate the forward and reverse tables
+     */
+    for (i = 0; i < 256; i++) {
+        x = FSb[i];
+        y = XTIME(x) & 0xFF;
+        z = (y ^ x) & 0xFF;
+
+        FT0[i] = ((unsigned long)y) ^
+            ((unsigned long)x << 8) ^
+            ((unsigned long)x << 16) ^ ((unsigned long)z << 24);
+
+        FT1[i] = ROTL8(FT0[i]);
+        FT2[i] = ROTL8(FT1[i]);
+        FT3[i] = ROTL8(FT2[i]);
+
+        x = RSb[i];
+
+        RT0[i] = ((unsigned long)MUL(0x0E, x)) ^
+            ((unsigned long)MUL(0x09, x) << 8) ^
+            ((unsigned long)MUL(0x0D, x) << 16) ^
+            ((unsigned long)MUL(0x0B, x) << 24);
+
+        RT1[i] = ROTL8(RT0[i]);
+        RT2[i] = ROTL8(RT1[i]);
+        RT3[i] = ROTL8(RT2[i]);
+    }
 }
 
 #endif
@@ -457,98 +457,98 @@ static void aes_gen_tables(void)
  */
 void tiny_aes_setkey_enc(tiny_aes_context * ctx, unsigned char *key, int keysize)
 {
-	int i;
-	unsigned long *RK;
+    int i;
+    unsigned long *RK;
 
 #if !defined(TINY_CRYPT_AES_ROM_TABLES)
-	if (aes_init_done == 0) {
-		aes_gen_tables();
-		aes_init_done = 1;
-	}
+    if (aes_init_done == 0) {
+        aes_gen_tables();
+        aes_init_done = 1;
+    }
 #endif
 
-	switch (keysize) {
-	case 128:
-		ctx->nr = 10;
-		break;
-	case 192:
-		ctx->nr = 12;
-		break;
-	case 256:
-		ctx->nr = 14;
-		break;
-	default:
-		return;
-	}
-
-	ctx->rk = RK = ctx->buf;
-
-	for (i = 0; i < (keysize >> 5); i++) {
-		GET_ULONG_LE(RK[i], key, i << 2);
-	}
-
-	switch (ctx->nr) {
-	case 10:
-
-		for (i = 0; i < 10; i++, RK += 4) {
-			RK[4] = RK[0] ^ RCON[i] ^
-			    ((unsigned long)FSb[(RK[3] >> 8) & 0xFF]) ^
-			    ((unsigned long)FSb[(RK[3] >> 16) & 0xFF] << 8) ^
-			    ((unsigned long)FSb[(RK[3] >> 24) & 0xFF] << 16) ^
-			    ((unsigned long)FSb[(RK[3]) & 0xFF] << 24);
-
-			RK[5] = RK[1] ^ RK[4];
-			RK[6] = RK[2] ^ RK[5];
-			RK[7] = RK[3] ^ RK[6];
-		}
-		break;
-
-	case 12:
-
-		for (i = 0; i < 8; i++, RK += 6) {
-			RK[6] = RK[0] ^ RCON[i] ^
-			    ((unsigned long)FSb[(RK[5] >> 8) & 0xFF]) ^
-			    ((unsigned long)FSb[(RK[5] >> 16) & 0xFF] << 8) ^
-			    ((unsigned long)FSb[(RK[5] >> 24) & 0xFF] << 16) ^
-			    ((unsigned long)FSb[(RK[5]) & 0xFF] << 24);
-
-			RK[7] = RK[1] ^ RK[6];
-			RK[8] = RK[2] ^ RK[7];
-			RK[9] = RK[3] ^ RK[8];
-			RK[10] = RK[4] ^ RK[9];
-			RK[11] = RK[5] ^ RK[10];
-		}
-		break;
-
-	case 14:
-
-		for (i = 0; i < 7; i++, RK += 8) {
-			RK[8] = RK[0] ^ RCON[i] ^
-			    ((unsigned long)FSb[(RK[7] >> 8) & 0xFF]) ^
-			    ((unsigned long)FSb[(RK[7] >> 16) & 0xFF] << 8) ^
-			    ((unsigned long)FSb[(RK[7] >> 24) & 0xFF] << 16) ^
-			    ((unsigned long)FSb[(RK[7]) & 0xFF] << 24);
-
-			RK[9] = RK[1] ^ RK[8];
-			RK[10] = RK[2] ^ RK[9];
-			RK[11] = RK[3] ^ RK[10];
-
-			RK[12] = RK[4] ^
-			    ((unsigned long)FSb[(RK[11]) & 0xFF]) ^
-			    ((unsigned long)FSb[(RK[11] >> 8) & 0xFF] << 8) ^
-			    ((unsigned long)FSb[(RK[11] >> 16) & 0xFF] << 16) ^
-			    ((unsigned long)FSb[(RK[11] >> 24) & 0xFF] << 24);
-
-			RK[13] = RK[5] ^ RK[12];
-			RK[14] = RK[6] ^ RK[13];
-			RK[15] = RK[7] ^ RK[14];
-		}
-		break;
-
-	default:
-
-		break;
-	}
+    switch (keysize) {
+    case 128:
+        ctx->nr = 10;
+        break;
+    case 192:
+        ctx->nr = 12;
+        break;
+    case 256:
+        ctx->nr = 14;
+        break;
+    default:
+        return;
+    }
+
+    ctx->rk = RK = ctx->buf;
+
+    for (i = 0; i < (keysize >> 5); i++) {
+        GET_ULONG_LE(RK[i], key, i << 2);
+    }
+
+    switch (ctx->nr) {
+    case 10:
+
+        for (i = 0; i < 10; i++, RK += 4) {
+            RK[4] = RK[0] ^ RCON[i] ^
+                ((unsigned long)FSb[(RK[3] >> 8) & 0xFF]) ^
+                ((unsigned long)FSb[(RK[3] >> 16) & 0xFF] << 8) ^
+                ((unsigned long)FSb[(RK[3] >> 24) & 0xFF] << 16) ^
+                ((unsigned long)FSb[(RK[3]) & 0xFF] << 24);
+
+            RK[5] = RK[1] ^ RK[4];
+            RK[6] = RK[2] ^ RK[5];
+            RK[7] = RK[3] ^ RK[6];
+        }
+        break;
+
+    case 12:
+
+        for (i = 0; i < 8; i++, RK += 6) {
+            RK[6] = RK[0] ^ RCON[i] ^
+                ((unsigned long)FSb[(RK[5] >> 8) & 0xFF]) ^
+                ((unsigned long)FSb[(RK[5] >> 16) & 0xFF] << 8) ^
+                ((unsigned long)FSb[(RK[5] >> 24) & 0xFF] << 16) ^
+                ((unsigned long)FSb[(RK[5]) & 0xFF] << 24);
+
+            RK[7] = RK[1] ^ RK[6];
+            RK[8] = RK[2] ^ RK[7];
+            RK[9] = RK[3] ^ RK[8];
+            RK[10] = RK[4] ^ RK[9];
+            RK[11] = RK[5] ^ RK[10];
+        }
+        break;
+
+    case 14:
+
+        for (i = 0; i < 7; i++, RK += 8) {
+            RK[8] = RK[0] ^ RCON[i] ^
+                ((unsigned long)FSb[(RK[7] >> 8) & 0xFF]) ^
+                ((unsigned long)FSb[(RK[7] >> 16) & 0xFF] << 8) ^
+                ((unsigned long)FSb[(RK[7] >> 24) & 0xFF] << 16) ^
+                ((unsigned long)FSb[(RK[7]) & 0xFF] << 24);
+
+            RK[9] = RK[1] ^ RK[8];
+            RK[10] = RK[2] ^ RK[9];
+            RK[11] = RK[3] ^ RK[10];
+
+            RK[12] = RK[4] ^
+                ((unsigned long)FSb[(RK[11]) & 0xFF]) ^
+                ((unsigned long)FSb[(RK[11] >> 8) & 0xFF] << 8) ^
+                ((unsigned long)FSb[(RK[11] >> 16) & 0xFF] << 16) ^
+                ((unsigned long)FSb[(RK[11] >> 24) & 0xFF] << 24);
+
+            RK[13] = RK[5] ^ RK[12];
+            RK[14] = RK[6] ^ RK[13];
+            RK[15] = RK[7] ^ RK[14];
+        }
+        break;
+
+    default:
+
+        break;
+    }
 }
 
 /*
@@ -556,50 +556,50 @@ void tiny_aes_setkey_enc(tiny_aes_context * ctx, unsigned char *key, int keysize
  */
 void tiny_aes_setkey_dec(tiny_aes_context * ctx, unsigned char *key, int keysize)
 {
-	int i, j;
-	tiny_aes_context cty;
-	unsigned long *RK;
-	unsigned long *SK;
-
-	switch (keysize) {
-	case 128:
-		ctx->nr = 10;
-		break;
-	case 192:
-		ctx->nr = 12;
-		break;
-	case 256:
-		ctx->nr = 14;
-		break;
-	default:
-		return;
-	}
-
-	ctx->rk = RK = ctx->buf;
-
-	tiny_aes_setkey_enc(&cty, key, keysize);
-	SK = cty.rk + cty.nr * 4;
-
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-
-	for (i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8) {
-		for (j = 0; j < 4; j++, SK++) {
-			*RK++ = RT0[FSb[(*SK) & 0xFF]] ^
-			    RT1[FSb[(*SK >> 8) & 0xFF]] ^
-			    RT2[FSb[(*SK >> 16) & 0xFF]] ^
-			    RT3[FSb[(*SK >> 24) & 0xFF]];
-		}
-	}
-
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-	*RK++ = *SK++;
-
-	memset(&cty, 0, sizeof(tiny_aes_context));
+    int i, j;
+    tiny_aes_context cty;
+    unsigned long *RK;
+    unsigned long *SK;
+
+    switch (keysize) {
+    case 128:
+        ctx->nr = 10;
+        break;
+    case 192:
+        ctx->nr = 12;
+        break;
+    case 256:
+        ctx->nr = 14;
+        break;
+    default:
+        return;
+    }
+
+    ctx->rk = RK = ctx->buf;
+
+    tiny_aes_setkey_enc(&cty, key, keysize);
+    SK = cty.rk + cty.nr * 4;
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    for (i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8) {
+        for (j = 0; j < 4; j++, SK++) {
+            *RK++ = RT0[FSb[(*SK) & 0xFF]] ^
+                RT1[FSb[(*SK >> 8) & 0xFF]] ^
+                RT2[FSb[(*SK >> 16) & 0xFF]] ^
+                RT3[FSb[(*SK >> 24) & 0xFF]];
+        }
+    }
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    memset(&cty, 0, sizeof(tiny_aes_context));
 }
 
 #define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
@@ -652,168 +652,168 @@ void tiny_aes_setkey_dec(tiny_aes_context * ctx, unsigned char *key, int keysize
  * AES-ECB block encryption/decryption
  */
 void tiny_aes_crypt_ecb(tiny_aes_context * ctx,
-		   int mode, unsigned char input[16], unsigned char output[16])
+           int mode, unsigned char input[16], unsigned char output[16])
 {
-	int i;
-	unsigned long *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
-
-	RK = ctx->rk;
-
-	GET_ULONG_LE(X0, input, 0);
-	X0 ^= *RK++;
-	GET_ULONG_LE(X1, input, 4);
-	X1 ^= *RK++;
-	GET_ULONG_LE(X2, input, 8);
-	X2 ^= *RK++;
-	GET_ULONG_LE(X3, input, 12);
-	X3 ^= *RK++;
-
-	if (mode == AES_DECRYPT) {
-		for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
-			AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
-			AES_RROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
-		}
-
-		AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
-
-		X0 = *RK++ ^
-		    ((unsigned long)RSb[(Y0) & 0xFF]) ^
-		    ((unsigned long)RSb[(Y3 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)RSb[(Y2 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)RSb[(Y1 >> 24) & 0xFF] << 24);
-
-		X1 = *RK++ ^
-		    ((unsigned long)RSb[(Y1) & 0xFF]) ^
-		    ((unsigned long)RSb[(Y0 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)RSb[(Y3 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)RSb[(Y2 >> 24) & 0xFF] << 24);
-
-		X2 = *RK++ ^
-		    ((unsigned long)RSb[(Y2) & 0xFF]) ^
-		    ((unsigned long)RSb[(Y1 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)RSb[(Y0 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)RSb[(Y3 >> 24) & 0xFF] << 24);
-
-		X3 = *RK++ ^
-		    ((unsigned long)RSb[(Y3) & 0xFF]) ^
-		    ((unsigned long)RSb[(Y2 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)RSb[(Y1 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)RSb[(Y0 >> 24) & 0xFF] << 24);
-	} else {		/* AES_ENCRYPT */
-		for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
-			AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
-			AES_FROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
-		}
-
-		AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
-
-		X0 = *RK++ ^
-		    ((unsigned long)FSb[(Y0) & 0xFF]) ^
-		    ((unsigned long)FSb[(Y1 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)FSb[(Y2 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)FSb[(Y3 >> 24) & 0xFF] << 24);
-
-		X1 = *RK++ ^
-		    ((unsigned long)FSb[(Y1) & 0xFF]) ^
-		    ((unsigned long)FSb[(Y2 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)FSb[(Y3 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)FSb[(Y0 >> 24) & 0xFF] << 24);
-
-		X2 = *RK++ ^
-		    ((unsigned long)FSb[(Y2) & 0xFF]) ^
-		    ((unsigned long)FSb[(Y3 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)FSb[(Y0 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)FSb[(Y1 >> 24) & 0xFF] << 24);
-
-		X3 = *RK++ ^
-		    ((unsigned long)FSb[(Y3) & 0xFF]) ^
-		    ((unsigned long)FSb[(Y0 >> 8) & 0xFF] << 8) ^
-		    ((unsigned long)FSb[(Y1 >> 16) & 0xFF] << 16) ^
-		    ((unsigned long)FSb[(Y2 >> 24) & 0xFF] << 24);
-	}
-
-	PUT_ULONG_LE(X0, output, 0);
-	PUT_ULONG_LE(X1, output, 4);
-	PUT_ULONG_LE(X2, output, 8);
-	PUT_ULONG_LE(X3, output, 12);
+    int i;
+    unsigned long *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
+
+    RK = ctx->rk;
+
+    GET_ULONG_LE(X0, input, 0);
+    X0 ^= *RK++;
+    GET_ULONG_LE(X1, input, 4);
+    X1 ^= *RK++;
+    GET_ULONG_LE(X2, input, 8);
+    X2 ^= *RK++;
+    GET_ULONG_LE(X3, input, 12);
+    X3 ^= *RK++;
+
+    if (mode == AES_DECRYPT) {
+        for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
+            AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+            AES_RROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
+        }
+
+        AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+
+        X0 = *RK++ ^
+            ((unsigned long)RSb[(Y0) & 0xFF]) ^
+            ((unsigned long)RSb[(Y3 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)RSb[(Y2 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)RSb[(Y1 >> 24) & 0xFF] << 24);
+
+        X1 = *RK++ ^
+            ((unsigned long)RSb[(Y1) & 0xFF]) ^
+            ((unsigned long)RSb[(Y0 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)RSb[(Y3 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)RSb[(Y2 >> 24) & 0xFF] << 24);
+
+        X2 = *RK++ ^
+            ((unsigned long)RSb[(Y2) & 0xFF]) ^
+            ((unsigned long)RSb[(Y1 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)RSb[(Y0 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)RSb[(Y3 >> 24) & 0xFF] << 24);
+
+        X3 = *RK++ ^
+            ((unsigned long)RSb[(Y3) & 0xFF]) ^
+            ((unsigned long)RSb[(Y2 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)RSb[(Y1 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)RSb[(Y0 >> 24) & 0xFF] << 24);
+    } else {        /* AES_ENCRYPT */
+        for (i = (ctx->nr >> 1) - 1; i > 0; i--) {
+            AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+            AES_FROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3);
+        }
+
+        AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3);
+
+        X0 = *RK++ ^
+            ((unsigned long)FSb[(Y0) & 0xFF]) ^
+            ((unsigned long)FSb[(Y1 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)FSb[(Y2 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)FSb[(Y3 >> 24) & 0xFF] << 24);
+
+        X1 = *RK++ ^
+            ((unsigned long)FSb[(Y1) & 0xFF]) ^
+            ((unsigned long)FSb[(Y2 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)FSb[(Y3 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)FSb[(Y0 >> 24) & 0xFF] << 24);
+
+        X2 = *RK++ ^
+            ((unsigned long)FSb[(Y2) & 0xFF]) ^
+            ((unsigned long)FSb[(Y3 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)FSb[(Y0 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)FSb[(Y1 >> 24) & 0xFF] << 24);
+
+        X3 = *RK++ ^
+            ((unsigned long)FSb[(Y3) & 0xFF]) ^
+            ((unsigned long)FSb[(Y0 >> 8) & 0xFF] << 8) ^
+            ((unsigned long)FSb[(Y1 >> 16) & 0xFF] << 16) ^
+            ((unsigned long)FSb[(Y2 >> 24) & 0xFF] << 24);
+    }
+
+    PUT_ULONG_LE(X0, output, 0);
+    PUT_ULONG_LE(X1, output, 4);
+    PUT_ULONG_LE(X2, output, 8);
+    PUT_ULONG_LE(X3, output, 12);
 }
 
 /*
  * AES-CBC buffer encryption/decryption
  */
 void tiny_aes_crypt_cbc(tiny_aes_context * ctx,
-		   int mode,
-		   int length,
-		   unsigned char iv[16],
-		   unsigned char *input, unsigned char *output)
+           int mode,
+           int length,
+           unsigned char iv[16],
+           unsigned char *input, unsigned char *output)
 {
-	int i;
-	unsigned char temp[16];
-
-	if (mode == AES_DECRYPT) {
-		while (length > 0) {
-			memcpy(temp, input, 16);
-			tiny_aes_crypt_ecb(ctx, mode, input, output);
-
-			for (i = 0; i < 16; i++)
-				output[i] = (unsigned char)(output[i] ^ iv[i]);
-
-			memcpy(iv, temp, 16);
-
-			input += 16;
-			output += 16;
-			length -= 16;
-		}
-	} else {
-		while (length > 0) {
-			for (i = 0; i < 16; i++)
-				output[i] = (unsigned char)(input[i] ^ iv[i]);
-
-			tiny_aes_crypt_ecb(ctx, mode, output, output);
-			memcpy(iv, output, 16);
-
-			input += 16;
-			output += 16;
-			length -= 16;
-		}
-	}
+    int i;
+    unsigned char temp[16];
+
+    if (mode == AES_DECRYPT) {
+        while (length > 0) {
+            memcpy(temp, input, 16);
+            tiny_aes_crypt_ecb(ctx, mode, input, output);
+
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(output[i] ^ iv[i]);
+
+            memcpy(iv, temp, 16);
+
+            input += 16;
+            output += 16;
+            length -= 16;
+        }
+    } else {
+        while (length > 0) {
+            for (i = 0; i < 16; i++)
+                output[i] = (unsigned char)(input[i] ^ iv[i]);
+
+            tiny_aes_crypt_ecb(ctx, mode, output, output);
+            memcpy(iv, output, 16);
+
+            input += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
 }
 
 /*
  * AES-CFB128 buffer encryption/decryption
  */
 void tiny_aes_crypt_cfb128(tiny_aes_context * ctx,
-		      int mode,
-		      int length,
-		      int *iv_off,
-		      unsigned char iv[16],
-		      unsigned char *input, unsigned char *output)
+              int mode,
+              int length,
+              int *iv_off,
+              unsigned char iv[16],
+              unsigned char *input, unsigned char *output)
 {
-	int c, n = *iv_off;
+    int c, n = *iv_off;
 
-	if (mode == AES_DECRYPT) {
-		while (length--) {
-			if (n == 0)
-				tiny_aes_crypt_ecb(ctx, AES_ENCRYPT, iv, iv);
+    if (mode == AES_DECRYPT) {
+        while (length--) {
+            if (n == 0)
+                tiny_aes_crypt_ecb(ctx, AES_ENCRYPT, iv, iv);
 
-			c = *input++;
-			*output++ = (unsigned char)(c ^ iv[n]);
-			iv[n] = (unsigned char)c;
+            c = *input++;
+            *output++ = (unsigned char)(c ^ iv[n]);
+            iv[n] = (unsigned char)c;
 
-			n = (n + 1) & 0x0F;
-		}
-	} else {
-		while (length--) {
-			if (n == 0)
-				tiny_aes_crypt_ecb(ctx, AES_ENCRYPT, iv, iv);
+            n = (n + 1) & 0x0F;
+        }
+    } else {
+        while (length--) {
+            if (n == 0)
+                tiny_aes_crypt_ecb(ctx, AES_ENCRYPT, iv, iv);
 
-			iv[n] = *output++ = (unsigned char)(iv[n] ^ *input++);
+            iv[n] = *output++ = (unsigned char)(iv[n] ^ *input++);
 
-			n = (n + 1) & 0x0F;
-		}
-	}
+            n = (n + 1) & 0x0F;
+        }
+    }
 
-	*iv_off = n;
+    *iv_off = n;
 }
 
 #endif

+ 144 - 144
src/tiny_base64.c

@@ -1,38 +1,38 @@
 /*
- *	RFC 1521 base64 encoding/decoding
+ *  RFC 1521 base64 encoding/decoding
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
- *	Based on XySSL: Copyright (C) 2006-2008	 Christophe Devine
  *
- *	Copyright (C) 2009	Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *	All rights reserved.
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
- *	Redistribution and use in source and binary forms, with or without
- *	modification, are permitted provided that the following conditions
- *	are met:
+ *  All rights reserved.
  *
- *	  * Redistributions of source code must retain the above copyright
- *		notice, this list of conditions and the following disclaimer.
- *	  * Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in the
- *		documentation and/or other materials provided with the distribution.
- *	  * Neither the names of PolarSSL or XySSL nor the names of its contributors
- *		may be used to endorse or promote products derived from this software
- *		without specific prior written permission.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
  *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "tinycrypt_config.h"
@@ -42,29 +42,29 @@
 #include "tinycrypt.h"
 
 static const unsigned char base64_enc_map[64] = {
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-	'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-	'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-	'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-	'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
-	'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', '+', '/'
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+    'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+    'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+    'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+    '8', '9', '+', '/'
 };
 
 static const unsigned char base64_dec_map[128] = {
-	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-	127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
-	127, 127, 127, 62, 127, 127, 127, 63, 52, 53,
-	54, 55, 56, 57, 58, 59, 60, 61, 127, 127,
-	127, 64, 127, 127, 127, 0, 1, 2, 3, 4,
-	5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-	15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
-	25, 127, 127, 127, 127, 127, 127, 26, 27, 28,
-	29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
-	39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-	49, 50, 51, 127, 127, 127, 127, 127
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+    127, 127, 127, 62, 127, 127, 127, 63, 52, 53,
+    54, 55, 56, 57, 58, 59, 60, 61, 127, 127,
+    127, 64, 127, 127, 127, 0, 1, 2, 3, 4,
+    5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+    25, 127, 127, 127, 127, 127, 127, 26, 27, 28,
+    29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+    39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+    49, 50, 51, 127, 127, 127, 127, 127
 };
 
 /*
@@ -72,63 +72,63 @@ static const unsigned char base64_dec_map[128] = {
  */
 int tiny_base64_encode(unsigned char *dst, int *dlen, unsigned char *src, int slen)
 {
-	int i, n;
-	int C1, C2, C3;
-	unsigned char *p;
-
-	if (slen == 0)
-		return (0);
-
-	n = (slen << 3) / 6;
-
-	switch ((slen << 3) - (n * 6)) {
-	case 2:
-		n += 3;
-		break;
-	case 4:
-		n += 2;
-		break;
-	default:
-		break;
-	}
-
-	if (*dlen < n + 1) {
-		*dlen = n + 1;
-		return (ERR_BASE64_BUFFER_TOO_SMALL);
-	}
-
-	n = (slen / 3) * 3;
-
-	for (i = 0, p = dst; i < n; i += 3) {
-		C1 = *src++;
-		C2 = *src++;
-		C3 = *src++;
-
-		*p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-		*p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
-		*p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
-		*p++ = base64_enc_map[C3 & 0x3F];
-	}
-
-	if (i < slen) {
-		C1 = *src++;
-		C2 = ((i + 1) < slen) ? *src++ : 0;
-
-		*p++ = base64_enc_map[(C1 >> 2) & 0x3F];
-		*p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
-
-		if ((i + 1) < slen)
-			*p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
-		else
-			*p++ = '=';
-
-		*p++ = '=';
-	}
-
-	*dlen = p - dst;
-	*p = 0;
-
-	return (0);
+    int i, n;
+    int C1, C2, C3;
+    unsigned char *p;
+
+    if (slen == 0)
+        return (0);
+
+    n = (slen << 3) / 6;
+
+    switch ((slen << 3) - (n * 6)) {
+    case 2:
+        n += 3;
+        break;
+    case 4:
+        n += 2;
+        break;
+    default:
+        break;
+    }
+
+    if (*dlen < n + 1) {
+        *dlen = n + 1;
+        return (ERR_BASE64_BUFFER_TOO_SMALL);
+    }
+
+    n = (slen / 3) * 3;
+
+    for (i = 0, p = dst; i < n; i += 3) {
+        C1 = *src++;
+        C2 = *src++;
+        C3 = *src++;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+        *p++ = base64_enc_map[(((C2 & 15) << 2) + (C3 >> 6)) & 0x3F];
+        *p++ = base64_enc_map[C3 & 0x3F];
+    }
+
+    if (i < slen) {
+        C1 = *src++;
+        C2 = ((i + 1) < slen) ? *src++ : 0;
+
+        *p++ = base64_enc_map[(C1 >> 2) & 0x3F];
+        *p++ = base64_enc_map[(((C1 & 3) << 4) + (C2 >> 4)) & 0x3F];
+
+        if ((i + 1) < slen)
+            *p++ = base64_enc_map[((C2 & 15) << 2) & 0x3F];
+        else
+            *p++ = '=';
+
+        *p++ = '=';
+    }
+
+    *dlen = p - dst;
+    *p = 0;
+
+    return (0);
 }
 
 /*
@@ -136,60 +136,60 @@ int tiny_base64_encode(unsigned char *dst, int *dlen, unsigned char *src, int sl
  */
 int tiny_base64_decode(unsigned char *dst, int *dlen, unsigned char *src, int slen)
 {
-	int i, j, n;
-	unsigned long x;
-	unsigned char *p;
+    int i, j, n;
+    unsigned long x;
+    unsigned char *p;
 
-	for (i = j = n = 0; i < slen; i++) {
-		if ((slen - i) >= 2 && src[i] == '\r' && src[i + 1] == '\n')
-			continue;
+    for (i = j = n = 0; i < slen; i++) {
+        if ((slen - i) >= 2 && src[i] == '\r' && src[i + 1] == '\n')
+            continue;
 
-		if (src[i] == '\n')
-			continue;
+        if (src[i] == '\n')
+            continue;
 
-		if (src[i] == '=' && ++j > 2)
-			return (ERR_BASE64_INVALID_CHARACTER);
+        if (src[i] == '=' && ++j > 2)
+            return (ERR_BASE64_INVALID_CHARACTER);
 
-		if (src[i] > 127 || base64_dec_map[src[i]] == 127)
-			return (ERR_BASE64_INVALID_CHARACTER);
+        if (src[i] > 127 || base64_dec_map[src[i]] == 127)
+            return (ERR_BASE64_INVALID_CHARACTER);
 
-		if (base64_dec_map[src[i]] < 64 && j != 0)
-			return (ERR_BASE64_INVALID_CHARACTER);
+        if (base64_dec_map[src[i]] < 64 && j != 0)
+            return (ERR_BASE64_INVALID_CHARACTER);
 
-		n++;
-	}
+        n++;
+    }
 
-	if (n == 0)
-		return (0);
+    if (n == 0)
+        return (0);
 
-	n = ((n * 6) + 7) >> 3;
+    n = ((n * 6) + 7) >> 3;
 
-	if (*dlen < n) {
-		*dlen = n;
-		return (ERR_BASE64_BUFFER_TOO_SMALL);
-	}
+    if (*dlen < n) {
+        *dlen = n;
+        return (ERR_BASE64_BUFFER_TOO_SMALL);
+    }
 
-	for (j = 3, n = x = 0, p = dst; i > 0; i--, src++) {
-		if (*src == '\r' || *src == '\n')
-			continue;
+    for (j = 3, n = x = 0, p = dst; i > 0; i--, src++) {
+        if (*src == '\r' || *src == '\n')
+            continue;
 
-		j -= (base64_dec_map[*src] == 64);
-		x = (x << 6) | (base64_dec_map[*src] & 0x3F);
+        j -= (base64_dec_map[*src] == 64);
+        x = (x << 6) | (base64_dec_map[*src] & 0x3F);
 
-		if (++n == 4) {
-			n = 0;
-			if (j > 0)
-				*p++ = (unsigned char)(x >> 16);
-			if (j > 1)
-				*p++ = (unsigned char)(x >> 8);
-			if (j > 2)
-				*p++ = (unsigned char)(x);
-		}
-	}
+        if (++n == 4) {
+            n = 0;
+            if (j > 0)
+                *p++ = (unsigned char)(x >> 16);
+            if (j > 1)
+                *p++ = (unsigned char)(x >> 8);
+            if (j > 2)
+                *p++ = (unsigned char)(x);
+        }
+    }
 
-	*dlen = p - dst;
+    *dlen = p - dst;
 
-	return (0);
+    return (0);
 }
 
 #endif

+ 230 - 230
src/tiny_md5.c

@@ -1,43 +1,43 @@
 /*
- *	RFC 1321 compliant MD5 implementation
+ *  RFC 1321 compliant MD5 implementation
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
- *	Based on XySSL: Copyright (C) 2006-2008	 Christophe Devine
  *
- *	Copyright (C) 2009	Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *	All rights reserved.
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
- *	Redistribution and use in source and binary forms, with or without
- *	modification, are permitted provided that the following conditions
- *	are met:
+ *  All rights reserved.
  *
- *	  * Redistributions of source code must retain the above copyright
- *		notice, this list of conditions and the following disclaimer.
- *	  * Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in the
- *		documentation and/or other materials provided with the distribution.
- *	  * Neither the names of PolarSSL or XySSL nor the names of its contributors
- *		may be used to endorse or promote products derived from this software
- *		without specific prior written permission.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
  *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- *	The MD5 algorithm was designed by Ron Rivest in 1991.
+ *  The MD5 algorithm was designed by Ron Rivest in 1991.
  *
- *	http://www.ietf.org/rfc/rfc1321.txt
+ *  http://www.ietf.org/rfc/rfc1321.txt
  */
 
 #include "tinycrypt_config.h"
@@ -53,23 +53,23 @@
  * 32-bit integer manipulation macros (little endian)
  */
 #ifndef GET_ULONG_LE
-#define GET_ULONG_LE(n,b,i)								\
-	{													\
-		(n) = ( (unsigned long) (b)[(i)	   ]	   )	\
-			| ( (unsigned long) (b)[(i) + 1] <<	 8 )	\
-			| ( (unsigned long) (b)[(i) + 2] << 16 )	\
-			| ( (unsigned long) (b)[(i) + 3] << 24 );	\
-	}
+#define GET_ULONG_LE(n,b,i)                             \
+    {                                                   \
+        (n) = ( (unsigned long) (b)[(i)    ]       )    \
+            | ( (unsigned long) (b)[(i) + 1] <<  8 )    \
+            | ( (unsigned long) (b)[(i) + 2] << 16 )    \
+            | ( (unsigned long) (b)[(i) + 3] << 24 );   \
+    }
 #endif
 
 #ifndef PUT_ULONG_LE
-#define PUT_ULONG_LE(n,b,i)								\
-	{													\
-		(b)[(i)	   ] = (unsigned char) ( (n)	   );	\
-		(b)[(i) + 1] = (unsigned char) ( (n) >>	 8 );	\
-		(b)[(i) + 2] = (unsigned char) ( (n) >> 16 );	\
-		(b)[(i) + 3] = (unsigned char) ( (n) >> 24 );	\
-	}
+#define PUT_ULONG_LE(n,b,i)                             \
+    {                                                   \
+        (b)[(i)    ] = (unsigned char) ( (n)       );   \
+        (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );   \
+        (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );   \
+        (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );   \
+    }
 #endif
 
 /*
@@ -77,136 +77,136 @@
  */
 void tiny_md5_starts(tiny_md5_context * ctx)
 {
-	ctx->total[0] = 0;
-	ctx->total[1] = 0;
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
 
-	ctx->state[0] = 0x67452301;
-	ctx->state[1] = 0xEFCDAB89;
-	ctx->state[2] = 0x98BADCFE;
-	ctx->state[3] = 0x10325476;
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
 }
 
 static void md5_process(tiny_md5_context * ctx, unsigned char data[64])
 {
-	unsigned long X[16], A, B, C, D;
-
-	GET_ULONG_LE(X[0], data, 0);
-	GET_ULONG_LE(X[1], data, 4);
-	GET_ULONG_LE(X[2], data, 8);
-	GET_ULONG_LE(X[3], data, 12);
-	GET_ULONG_LE(X[4], data, 16);
-	GET_ULONG_LE(X[5], data, 20);
-	GET_ULONG_LE(X[6], data, 24);
-	GET_ULONG_LE(X[7], data, 28);
-	GET_ULONG_LE(X[8], data, 32);
-	GET_ULONG_LE(X[9], data, 36);
-	GET_ULONG_LE(X[10], data, 40);
-	GET_ULONG_LE(X[11], data, 44);
-	GET_ULONG_LE(X[12], data, 48);
-	GET_ULONG_LE(X[13], data, 52);
-	GET_ULONG_LE(X[14], data, 56);
-	GET_ULONG_LE(X[15], data, 60);
+    unsigned long X[16], A, B, C, D;
+
+    GET_ULONG_LE(X[0], data, 0);
+    GET_ULONG_LE(X[1], data, 4);
+    GET_ULONG_LE(X[2], data, 8);
+    GET_ULONG_LE(X[3], data, 12);
+    GET_ULONG_LE(X[4], data, 16);
+    GET_ULONG_LE(X[5], data, 20);
+    GET_ULONG_LE(X[6], data, 24);
+    GET_ULONG_LE(X[7], data, 28);
+    GET_ULONG_LE(X[8], data, 32);
+    GET_ULONG_LE(X[9], data, 36);
+    GET_ULONG_LE(X[10], data, 40);
+    GET_ULONG_LE(X[11], data, 44);
+    GET_ULONG_LE(X[12], data, 48);
+    GET_ULONG_LE(X[13], data, 52);
+    GET_ULONG_LE(X[14], data, 56);
+    GET_ULONG_LE(X[15], data, 60);
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
-#define P(a,b,c,d,k,s,t)							\
-	{												\
-		a += F(b,c,d) + X[k] + t; a = S(a,s) + b;	\
-	}
+#define P(a,b,c,d,k,s,t)                            \
+    {                                               \
+        a += F(b,c,d) + X[k] + t; a = S(a,s) + b;   \
+    }
 
-	A = ctx->state[0];
-	B = ctx->state[1];
-	C = ctx->state[2];
-	D = ctx->state[3];
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
 
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 
-	P(A, B, C, D, 0, 7, 0xD76AA478);
-	P(D, A, B, C, 1, 12, 0xE8C7B756);
-	P(C, D, A, B, 2, 17, 0x242070DB);
-	P(B, C, D, A, 3, 22, 0xC1BDCEEE);
-	P(A, B, C, D, 4, 7, 0xF57C0FAF);
-	P(D, A, B, C, 5, 12, 0x4787C62A);
-	P(C, D, A, B, 6, 17, 0xA8304613);
-	P(B, C, D, A, 7, 22, 0xFD469501);
-	P(A, B, C, D, 8, 7, 0x698098D8);
-	P(D, A, B, C, 9, 12, 0x8B44F7AF);
-	P(C, D, A, B, 10, 17, 0xFFFF5BB1);
-	P(B, C, D, A, 11, 22, 0x895CD7BE);
-	P(A, B, C, D, 12, 7, 0x6B901122);
-	P(D, A, B, C, 13, 12, 0xFD987193);
-	P(C, D, A, B, 14, 17, 0xA679438E);
-	P(B, C, D, A, 15, 22, 0x49B40821);
+    P(A, B, C, D, 0, 7, 0xD76AA478);
+    P(D, A, B, C, 1, 12, 0xE8C7B756);
+    P(C, D, A, B, 2, 17, 0x242070DB);
+    P(B, C, D, A, 3, 22, 0xC1BDCEEE);
+    P(A, B, C, D, 4, 7, 0xF57C0FAF);
+    P(D, A, B, C, 5, 12, 0x4787C62A);
+    P(C, D, A, B, 6, 17, 0xA8304613);
+    P(B, C, D, A, 7, 22, 0xFD469501);
+    P(A, B, C, D, 8, 7, 0x698098D8);
+    P(D, A, B, C, 9, 12, 0x8B44F7AF);
+    P(C, D, A, B, 10, 17, 0xFFFF5BB1);
+    P(B, C, D, A, 11, 22, 0x895CD7BE);
+    P(A, B, C, D, 12, 7, 0x6B901122);
+    P(D, A, B, C, 13, 12, 0xFD987193);
+    P(C, D, A, B, 14, 17, 0xA679438E);
+    P(B, C, D, A, 15, 22, 0x49B40821);
 
 #undef F
 
 #define F(x,y,z) (y ^ (z & (x ^ y)))
 
-	P(A, B, C, D, 1, 5, 0xF61E2562);
-	P(D, A, B, C, 6, 9, 0xC040B340);
-	P(C, D, A, B, 11, 14, 0x265E5A51);
-	P(B, C, D, A, 0, 20, 0xE9B6C7AA);
-	P(A, B, C, D, 5, 5, 0xD62F105D);
-	P(D, A, B, C, 10, 9, 0x02441453);
-	P(C, D, A, B, 15, 14, 0xD8A1E681);
-	P(B, C, D, A, 4, 20, 0xE7D3FBC8);
-	P(A, B, C, D, 9, 5, 0x21E1CDE6);
-	P(D, A, B, C, 14, 9, 0xC33707D6);
-	P(C, D, A, B, 3, 14, 0xF4D50D87);
-	P(B, C, D, A, 8, 20, 0x455A14ED);
-	P(A, B, C, D, 13, 5, 0xA9E3E905);
-	P(D, A, B, C, 2, 9, 0xFCEFA3F8);
-	P(C, D, A, B, 7, 14, 0x676F02D9);
-	P(B, C, D, A, 12, 20, 0x8D2A4C8A);
+    P(A, B, C, D, 1, 5, 0xF61E2562);
+    P(D, A, B, C, 6, 9, 0xC040B340);
+    P(C, D, A, B, 11, 14, 0x265E5A51);
+    P(B, C, D, A, 0, 20, 0xE9B6C7AA);
+    P(A, B, C, D, 5, 5, 0xD62F105D);
+    P(D, A, B, C, 10, 9, 0x02441453);
+    P(C, D, A, B, 15, 14, 0xD8A1E681);
+    P(B, C, D, A, 4, 20, 0xE7D3FBC8);
+    P(A, B, C, D, 9, 5, 0x21E1CDE6);
+    P(D, A, B, C, 14, 9, 0xC33707D6);
+    P(C, D, A, B, 3, 14, 0xF4D50D87);
+    P(B, C, D, A, 8, 20, 0x455A14ED);
+    P(A, B, C, D, 13, 5, 0xA9E3E905);
+    P(D, A, B, C, 2, 9, 0xFCEFA3F8);
+    P(C, D, A, B, 7, 14, 0x676F02D9);
+    P(B, C, D, A, 12, 20, 0x8D2A4C8A);
 
 #undef F
 
 #define F(x,y,z) (x ^ y ^ z)
 
-	P(A, B, C, D, 5, 4, 0xFFFA3942);
-	P(D, A, B, C, 8, 11, 0x8771F681);
-	P(C, D, A, B, 11, 16, 0x6D9D6122);
-	P(B, C, D, A, 14, 23, 0xFDE5380C);
-	P(A, B, C, D, 1, 4, 0xA4BEEA44);
-	P(D, A, B, C, 4, 11, 0x4BDECFA9);
-	P(C, D, A, B, 7, 16, 0xF6BB4B60);
-	P(B, C, D, A, 10, 23, 0xBEBFBC70);
-	P(A, B, C, D, 13, 4, 0x289B7EC6);
-	P(D, A, B, C, 0, 11, 0xEAA127FA);
-	P(C, D, A, B, 3, 16, 0xD4EF3085);
-	P(B, C, D, A, 6, 23, 0x04881D05);
-	P(A, B, C, D, 9, 4, 0xD9D4D039);
-	P(D, A, B, C, 12, 11, 0xE6DB99E5);
-	P(C, D, A, B, 15, 16, 0x1FA27CF8);
-	P(B, C, D, A, 2, 23, 0xC4AC5665);
+    P(A, B, C, D, 5, 4, 0xFFFA3942);
+    P(D, A, B, C, 8, 11, 0x8771F681);
+    P(C, D, A, B, 11, 16, 0x6D9D6122);
+    P(B, C, D, A, 14, 23, 0xFDE5380C);
+    P(A, B, C, D, 1, 4, 0xA4BEEA44);
+    P(D, A, B, C, 4, 11, 0x4BDECFA9);
+    P(C, D, A, B, 7, 16, 0xF6BB4B60);
+    P(B, C, D, A, 10, 23, 0xBEBFBC70);
+    P(A, B, C, D, 13, 4, 0x289B7EC6);
+    P(D, A, B, C, 0, 11, 0xEAA127FA);
+    P(C, D, A, B, 3, 16, 0xD4EF3085);
+    P(B, C, D, A, 6, 23, 0x04881D05);
+    P(A, B, C, D, 9, 4, 0xD9D4D039);
+    P(D, A, B, C, 12, 11, 0xE6DB99E5);
+    P(C, D, A, B, 15, 16, 0x1FA27CF8);
+    P(B, C, D, A, 2, 23, 0xC4AC5665);
 
 #undef F
 
 #define F(x,y,z) (y ^ (x | ~z))
 
-	P(A, B, C, D, 0, 6, 0xF4292244);
-	P(D, A, B, C, 7, 10, 0x432AFF97);
-	P(C, D, A, B, 14, 15, 0xAB9423A7);
-	P(B, C, D, A, 5, 21, 0xFC93A039);
-	P(A, B, C, D, 12, 6, 0x655B59C3);
-	P(D, A, B, C, 3, 10, 0x8F0CCC92);
-	P(C, D, A, B, 10, 15, 0xFFEFF47D);
-	P(B, C, D, A, 1, 21, 0x85845DD1);
-	P(A, B, C, D, 8, 6, 0x6FA87E4F);
-	P(D, A, B, C, 15, 10, 0xFE2CE6E0);
-	P(C, D, A, B, 6, 15, 0xA3014314);
-	P(B, C, D, A, 13, 21, 0x4E0811A1);
-	P(A, B, C, D, 4, 6, 0xF7537E82);
-	P(D, A, B, C, 11, 10, 0xBD3AF235);
-	P(C, D, A, B, 2, 15, 0x2AD7D2BB);
-	P(B, C, D, A, 9, 21, 0xEB86D391);
+    P(A, B, C, D, 0, 6, 0xF4292244);
+    P(D, A, B, C, 7, 10, 0x432AFF97);
+    P(C, D, A, B, 14, 15, 0xAB9423A7);
+    P(B, C, D, A, 5, 21, 0xFC93A039);
+    P(A, B, C, D, 12, 6, 0x655B59C3);
+    P(D, A, B, C, 3, 10, 0x8F0CCC92);
+    P(C, D, A, B, 10, 15, 0xFFEFF47D);
+    P(B, C, D, A, 1, 21, 0x85845DD1);
+    P(A, B, C, D, 8, 6, 0x6FA87E4F);
+    P(D, A, B, C, 15, 10, 0xFE2CE6E0);
+    P(C, D, A, B, 6, 15, 0xA3014314);
+    P(B, C, D, A, 13, 21, 0x4E0811A1);
+    P(A, B, C, D, 4, 6, 0xF7537E82);
+    P(D, A, B, C, 11, 10, 0xBD3AF235);
+    P(C, D, A, B, 2, 15, 0x2AD7D2BB);
+    P(B, C, D, A, 9, 21, 0xEB86D391);
 
 #undef F
 
-	ctx->state[0] += A;
-	ctx->state[1] += B;
-	ctx->state[2] += C;
-	ctx->state[3] += D;
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
 }
 
 /*
@@ -214,45 +214,45 @@ static void md5_process(tiny_md5_context * ctx, unsigned char data[64])
  */
 void tiny_md5_update(tiny_md5_context * ctx, unsigned char *input, int ilen)
 {
-	int fill;
-	unsigned long left;
-
-	if (ilen <= 0)
-		return;
-
-	left = ctx->total[0] & 0x3F;
-	fill = 64 - left;
-
-	ctx->total[0] += ilen;
-	ctx->total[0] &= 0xFFFFFFFF;
-
-	if (ctx->total[0] < (unsigned long)ilen)
-		ctx->total[1]++;
-
-	if (left && ilen >= fill) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, fill);
-		md5_process(ctx, ctx->buffer);
-		input += fill;
-		ilen -= fill;
-		left = 0;
-	}
-
-	while (ilen >= 64) {
-		md5_process(ctx, input);
-		input += 64;
-		ilen -= 64;
-	}
-
-	if (ilen > 0) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
-	}
+    int fill;
+    unsigned long left;
+
+    if (ilen <= 0)
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if (ctx->total[0] < (unsigned long)ilen)
+        ctx->total[1]++;
+
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, fill);
+        md5_process(ctx, ctx->buffer);
+        input += fill;
+        ilen -= fill;
+        left = 0;
+    }
+
+    while (ilen >= 64) {
+        md5_process(ctx, input);
+        input += 64;
+        ilen -= 64;
+    }
+
+    if (ilen > 0) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
+    }
 }
 
 static const unsigned char md5_padding[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 /*
@@ -260,27 +260,27 @@ static const unsigned char md5_padding[64] = {
  */
 void tiny_md5_finish(tiny_md5_context * ctx, unsigned char output[16])
 {
-	unsigned long last, padn;
-	unsigned long high, low;
-	unsigned char msglen[8];
+    unsigned long last, padn;
+    unsigned long high, low;
+    unsigned char msglen[8];
 
-	high = (ctx->total[0] >> 29)
-	    | (ctx->total[1] << 3);
-	low = (ctx->total[0] << 3);
+    high = (ctx->total[0] >> 29)
+        | (ctx->total[1] << 3);
+    low = (ctx->total[0] << 3);
 
-	PUT_ULONG_LE(low, msglen, 0);
-	PUT_ULONG_LE(high, msglen, 4);
+    PUT_ULONG_LE(low, msglen, 0);
+    PUT_ULONG_LE(high, msglen, 4);
 
-	last = ctx->total[0] & 0x3F;
-	padn = (last < 56) ? (56 - last) : (120 - last);
+    last = ctx->total[0] & 0x3F;
+    padn = (last < 56) ? (56 - last) : (120 - last);
 
-	tiny_md5_update(ctx, (unsigned char *)md5_padding, padn);
-	tiny_md5_update(ctx, msglen, 8);
+    tiny_md5_update(ctx, (unsigned char *)md5_padding, padn);
+    tiny_md5_update(ctx, msglen, 8);
 
-	PUT_ULONG_LE(ctx->state[0], output, 0);
-	PUT_ULONG_LE(ctx->state[1], output, 4);
-	PUT_ULONG_LE(ctx->state[2], output, 8);
-	PUT_ULONG_LE(ctx->state[3], output, 12);
+    PUT_ULONG_LE(ctx->state[0], output, 0);
+    PUT_ULONG_LE(ctx->state[1], output, 4);
+    PUT_ULONG_LE(ctx->state[2], output, 8);
+    PUT_ULONG_LE(ctx->state[3], output, 12);
 }
 
 /*
@@ -288,13 +288,13 @@ void tiny_md5_finish(tiny_md5_context * ctx, unsigned char output[16])
  */
 void tiny_md5(unsigned char *input, int ilen, unsigned char output[16])
 {
-	tiny_md5_context ctx;
+    tiny_md5_context ctx;
 
-	tiny_md5_starts(&ctx);
-	tiny_md5_update(&ctx, input, ilen);
-	tiny_md5_finish(&ctx, output);
+    tiny_md5_starts(&ctx);
+    tiny_md5_update(&ctx, input, ilen);
+    tiny_md5_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_md5_context));
+    memset(&ctx, 0, sizeof(tiny_md5_context));
 }
 
 /*
@@ -302,27 +302,27 @@ void tiny_md5(unsigned char *input, int ilen, unsigned char output[16])
  */
 void tiny_md5_hmac_starts(tiny_md5_context * ctx, unsigned char *key, int keylen)
 {
-	int i;
-	unsigned char sum[16];
+    int i;
+    unsigned char sum[16];
 
-	if (keylen > 64) {
-		tiny_md5(key, keylen, sum);
-		keylen = 16;
-		key = sum;
-	}
+    if (keylen > 64) {
+        tiny_md5(key, keylen, sum);
+        keylen = 16;
+        key = sum;
+    }
 
-	memset(ctx->ipad, 0x36, 64);
-	memset(ctx->opad, 0x5C, 64);
+    memset(ctx->ipad, 0x36, 64);
+    memset(ctx->opad, 0x5C, 64);
 
-	for (i = 0; i < keylen; i++) {
-		ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
-		ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
-	}
+    for (i = 0; i < keylen; i++) {
+        ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
+        ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
+    }
 
-	tiny_md5_starts(ctx);
-	tiny_md5_update(ctx, ctx->ipad, 64);
+    tiny_md5_starts(ctx);
+    tiny_md5_update(ctx, ctx->ipad, 64);
 
-	memset(sum, 0, sizeof(sum));
+    memset(sum, 0, sizeof(sum));
 }
 
 /*
@@ -330,7 +330,7 @@ void tiny_md5_hmac_starts(tiny_md5_context * ctx, unsigned char *key, int keylen
  */
 void tiny_md5_hmac_update(tiny_md5_context * ctx, unsigned char *input, int ilen)
 {
-	tiny_md5_update(ctx, input, ilen);
+    tiny_md5_update(ctx, input, ilen);
 }
 
 /*
@@ -338,30 +338,30 @@ void tiny_md5_hmac_update(tiny_md5_context * ctx, unsigned char *input, int ilen
  */
 void tiny_md5_hmac_finish(tiny_md5_context * ctx, unsigned char output[16])
 {
-	unsigned char tmpbuf[16];
+    unsigned char tmpbuf[16];
 
-	tiny_md5_finish(ctx, tmpbuf);
-	tiny_md5_starts(ctx);
-	tiny_md5_update(ctx, ctx->opad, 64);
-	tiny_md5_update(ctx, tmpbuf, 16);
-	tiny_md5_finish(ctx, output);
+    tiny_md5_finish(ctx, tmpbuf);
+    tiny_md5_starts(ctx);
+    tiny_md5_update(ctx, ctx->opad, 64);
+    tiny_md5_update(ctx, tmpbuf, 16);
+    tiny_md5_finish(ctx, output);
 
-	memset(tmpbuf, 0, sizeof(tmpbuf));
+    memset(tmpbuf, 0, sizeof(tmpbuf));
 }
 
 /*
  * output = HMAC-MD5( hmac key, input buffer )
  */
 void tiny_md5_hmac(unsigned char *key, int keylen, unsigned char *input, int ilen,
-	      unsigned char output[16])
+          unsigned char output[16])
 {
-	tiny_md5_context ctx;
+    tiny_md5_context ctx;
 
-	tiny_md5_hmac_starts(&ctx, key, keylen);
-	tiny_md5_hmac_update(&ctx, input, ilen);
-	tiny_md5_hmac_finish(&ctx, output);
+    tiny_md5_hmac_starts(&ctx, key, keylen);
+    tiny_md5_hmac_update(&ctx, input, ilen);
+    tiny_md5_hmac_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_md5_context));
+    memset(&ctx, 0, sizeof(tiny_md5_context));
 }
 
 #endif

+ 257 - 257
src/tiny_sha1.c

@@ -1,43 +1,43 @@
 /*
- *	FIPS-180-1 compliant SHA-1 implementation
+ *  FIPS-180-1 compliant SHA-1 implementation
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
- *	Based on XySSL: Copyright (C) 2006-2008	 Christophe Devine
  *
- *	Copyright (C) 2009	Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *	All rights reserved.
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
- *	Redistribution and use in source and binary forms, with or without
- *	modification, are permitted provided that the following conditions
- *	are met:
+ *  All rights reserved.
  *
- *	  * Redistributions of source code must retain the above copyright
- *		notice, this list of conditions and the following disclaimer.
- *	  * Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in the
- *		documentation and/or other materials provided with the distribution.
- *	  * Neither the names of PolarSSL or XySSL nor the names of its contributors
- *		may be used to endorse or promote products derived from this software
- *		without specific prior written permission.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
  *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- *	The SHA-1 standard was published by NIST in 1993.
+ *  The SHA-1 standard was published by NIST in 1993.
  *
- *	http://www.itl.nist.gov/fipspubs/fip180-1.htm
+ *  http://www.itl.nist.gov/fipspubs/fip180-1.htm
  */
 
 #include "tinycrypt_config.h"
@@ -53,23 +53,23 @@
  * 32-bit integer manipulation macros (big endian)
  */
 #ifndef GET_ULONG_BE
-#define GET_ULONG_BE(n,b,i)								\
-	{													\
-		(n) = ( (unsigned long) (b)[(i)	   ] << 24 )	\
-			| ( (unsigned long) (b)[(i) + 1] << 16 )	\
-			| ( (unsigned long) (b)[(i) + 2] <<	 8 )	\
-			| ( (unsigned long) (b)[(i) + 3]	   );	\
-	}
+#define GET_ULONG_BE(n,b,i)                             \
+    {                                                   \
+        (n) = ( (unsigned long) (b)[(i)    ] << 24 )    \
+            | ( (unsigned long) (b)[(i) + 1] << 16 )    \
+            | ( (unsigned long) (b)[(i) + 2] <<  8 )    \
+            | ( (unsigned long) (b)[(i) + 3]       );   \
+    }
 #endif
 
 #ifndef PUT_ULONG_BE
-#define PUT_ULONG_BE(n,b,i)								\
-	{													\
-		(b)[(i)	   ] = (unsigned char) ( (n) >> 24 );	\
-		(b)[(i) + 1] = (unsigned char) ( (n) >> 16 );	\
-		(b)[(i) + 2] = (unsigned char) ( (n) >>	 8 );	\
-		(b)[(i) + 3] = (unsigned char) ( (n)	   );	\
-	}
+#define PUT_ULONG_BE(n,b,i)                             \
+    {                                                   \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );   \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );   \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );   \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );   \
+    }
 #endif
 
 /*
@@ -77,80 +77,80 @@
  */
 void tiny_sha1_starts(tiny_sha1_context * ctx)
 {
-	ctx->total[0] = 0;
-	ctx->total[1] = 0;
-
-	ctx->state[0] = 0x67452301;
-	ctx->state[1] = 0xEFCDAB89;
-	ctx->state[2] = 0x98BADCFE;
-	ctx->state[3] = 0x10325476;
-	ctx->state[4] = 0xC3D2E1F0;
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
 }
 
 static void sha1_process(tiny_sha1_context * ctx, unsigned char data[64])
 {
-	unsigned long temp, W[16], A, B, C, D, E;
-
-	GET_ULONG_BE(W[0], data, 0);
-	GET_ULONG_BE(W[1], data, 4);
-	GET_ULONG_BE(W[2], data, 8);
-	GET_ULONG_BE(W[3], data, 12);
-	GET_ULONG_BE(W[4], data, 16);
-	GET_ULONG_BE(W[5], data, 20);
-	GET_ULONG_BE(W[6], data, 24);
-	GET_ULONG_BE(W[7], data, 28);
-	GET_ULONG_BE(W[8], data, 32);
-	GET_ULONG_BE(W[9], data, 36);
-	GET_ULONG_BE(W[10], data, 40);
-	GET_ULONG_BE(W[11], data, 44);
-	GET_ULONG_BE(W[12], data, 48);
-	GET_ULONG_BE(W[13], data, 52);
-	GET_ULONG_BE(W[14], data, 56);
-	GET_ULONG_BE(W[15], data, 60);
+    unsigned long temp, W[16], A, B, C, D, E;
+
+    GET_ULONG_BE(W[0], data, 0);
+    GET_ULONG_BE(W[1], data, 4);
+    GET_ULONG_BE(W[2], data, 8);
+    GET_ULONG_BE(W[3], data, 12);
+    GET_ULONG_BE(W[4], data, 16);
+    GET_ULONG_BE(W[5], data, 20);
+    GET_ULONG_BE(W[6], data, 24);
+    GET_ULONG_BE(W[7], data, 28);
+    GET_ULONG_BE(W[8], data, 32);
+    GET_ULONG_BE(W[9], data, 36);
+    GET_ULONG_BE(W[10], data, 40);
+    GET_ULONG_BE(W[11], data, 44);
+    GET_ULONG_BE(W[12], data, 48);
+    GET_ULONG_BE(W[13], data, 52);
+    GET_ULONG_BE(W[14], data, 56);
+    GET_ULONG_BE(W[15], data, 60);
 
 #define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
 
-#define R(t)											\
-	(													\
-		temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^	\
-		W[(t - 14) & 0x0F] ^ W[ t	   & 0x0F],			\
-		( W[t & 0x0F] = S(temp,1) )						\
-		)
+#define R(t)                                            \
+    (                                                   \
+        temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^ \
+        W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],         \
+        ( W[t & 0x0F] = S(temp,1) )                     \
+        )
 
-#define P(a,b,c,d,e,x)									\
-	{													\
-		e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);	\
-	}
+#define P(a,b,c,d,e,x)                                  \
+    {                                                   \
+        e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);    \
+    }
 
-	A = ctx->state[0];
-	B = ctx->state[1];
-	C = ctx->state[2];
-	D = ctx->state[3];
-	E = ctx->state[4];
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
 
 #define F(x,y,z) (z ^ (x & (y ^ z)))
 #define K 0x5A827999
 
-	P(A, B, C, D, E, W[0]);
-	P(E, A, B, C, D, W[1]);
-	P(D, E, A, B, C, W[2]);
-	P(C, D, E, A, B, W[3]);
-	P(B, C, D, E, A, W[4]);
-	P(A, B, C, D, E, W[5]);
-	P(E, A, B, C, D, W[6]);
-	P(D, E, A, B, C, W[7]);
-	P(C, D, E, A, B, W[8]);
-	P(B, C, D, E, A, W[9]);
-	P(A, B, C, D, E, W[10]);
-	P(E, A, B, C, D, W[11]);
-	P(D, E, A, B, C, W[12]);
-	P(C, D, E, A, B, W[13]);
-	P(B, C, D, E, A, W[14]);
-	P(A, B, C, D, E, W[15]);
-	P(E, A, B, C, D, R(16));
-	P(D, E, A, B, C, R(17));
-	P(C, D, E, A, B, R(18));
-	P(B, C, D, E, A, R(19));
+    P(A, B, C, D, E, W[0]);
+    P(E, A, B, C, D, W[1]);
+    P(D, E, A, B, C, W[2]);
+    P(C, D, E, A, B, W[3]);
+    P(B, C, D, E, A, W[4]);
+    P(A, B, C, D, E, W[5]);
+    P(E, A, B, C, D, W[6]);
+    P(D, E, A, B, C, W[7]);
+    P(C, D, E, A, B, W[8]);
+    P(B, C, D, E, A, W[9]);
+    P(A, B, C, D, E, W[10]);
+    P(E, A, B, C, D, W[11]);
+    P(D, E, A, B, C, W[12]);
+    P(C, D, E, A, B, W[13]);
+    P(B, C, D, E, A, W[14]);
+    P(A, B, C, D, E, W[15]);
+    P(E, A, B, C, D, R(16));
+    P(D, E, A, B, C, R(17));
+    P(C, D, E, A, B, R(18));
+    P(B, C, D, E, A, R(19));
 
 #undef K
 #undef F
@@ -158,26 +158,26 @@ static void sha1_process(tiny_sha1_context * ctx, unsigned char data[64])
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0x6ED9EBA1
 
-	P(A, B, C, D, E, R(20));
-	P(E, A, B, C, D, R(21));
-	P(D, E, A, B, C, R(22));
-	P(C, D, E, A, B, R(23));
-	P(B, C, D, E, A, R(24));
-	P(A, B, C, D, E, R(25));
-	P(E, A, B, C, D, R(26));
-	P(D, E, A, B, C, R(27));
-	P(C, D, E, A, B, R(28));
-	P(B, C, D, E, A, R(29));
-	P(A, B, C, D, E, R(30));
-	P(E, A, B, C, D, R(31));
-	P(D, E, A, B, C, R(32));
-	P(C, D, E, A, B, R(33));
-	P(B, C, D, E, A, R(34));
-	P(A, B, C, D, E, R(35));
-	P(E, A, B, C, D, R(36));
-	P(D, E, A, B, C, R(37));
-	P(C, D, E, A, B, R(38));
-	P(B, C, D, E, A, R(39));
+    P(A, B, C, D, E, R(20));
+    P(E, A, B, C, D, R(21));
+    P(D, E, A, B, C, R(22));
+    P(C, D, E, A, B, R(23));
+    P(B, C, D, E, A, R(24));
+    P(A, B, C, D, E, R(25));
+    P(E, A, B, C, D, R(26));
+    P(D, E, A, B, C, R(27));
+    P(C, D, E, A, B, R(28));
+    P(B, C, D, E, A, R(29));
+    P(A, B, C, D, E, R(30));
+    P(E, A, B, C, D, R(31));
+    P(D, E, A, B, C, R(32));
+    P(C, D, E, A, B, R(33));
+    P(B, C, D, E, A, R(34));
+    P(A, B, C, D, E, R(35));
+    P(E, A, B, C, D, R(36));
+    P(D, E, A, B, C, R(37));
+    P(C, D, E, A, B, R(38));
+    P(B, C, D, E, A, R(39));
 
 #undef K
 #undef F
@@ -185,26 +185,26 @@ static void sha1_process(tiny_sha1_context * ctx, unsigned char data[64])
 #define F(x,y,z) ((x & y) | (z & (x | y)))
 #define K 0x8F1BBCDC
 
-	P(A, B, C, D, E, R(40));
-	P(E, A, B, C, D, R(41));
-	P(D, E, A, B, C, R(42));
-	P(C, D, E, A, B, R(43));
-	P(B, C, D, E, A, R(44));
-	P(A, B, C, D, E, R(45));
-	P(E, A, B, C, D, R(46));
-	P(D, E, A, B, C, R(47));
-	P(C, D, E, A, B, R(48));
-	P(B, C, D, E, A, R(49));
-	P(A, B, C, D, E, R(50));
-	P(E, A, B, C, D, R(51));
-	P(D, E, A, B, C, R(52));
-	P(C, D, E, A, B, R(53));
-	P(B, C, D, E, A, R(54));
-	P(A, B, C, D, E, R(55));
-	P(E, A, B, C, D, R(56));
-	P(D, E, A, B, C, R(57));
-	P(C, D, E, A, B, R(58));
-	P(B, C, D, E, A, R(59));
+    P(A, B, C, D, E, R(40));
+    P(E, A, B, C, D, R(41));
+    P(D, E, A, B, C, R(42));
+    P(C, D, E, A, B, R(43));
+    P(B, C, D, E, A, R(44));
+    P(A, B, C, D, E, R(45));
+    P(E, A, B, C, D, R(46));
+    P(D, E, A, B, C, R(47));
+    P(C, D, E, A, B, R(48));
+    P(B, C, D, E, A, R(49));
+    P(A, B, C, D, E, R(50));
+    P(E, A, B, C, D, R(51));
+    P(D, E, A, B, C, R(52));
+    P(C, D, E, A, B, R(53));
+    P(B, C, D, E, A, R(54));
+    P(A, B, C, D, E, R(55));
+    P(E, A, B, C, D, R(56));
+    P(D, E, A, B, C, R(57));
+    P(C, D, E, A, B, R(58));
+    P(B, C, D, E, A, R(59));
 
 #undef K
 #undef F
@@ -212,35 +212,35 @@ static void sha1_process(tiny_sha1_context * ctx, unsigned char data[64])
 #define F(x,y,z) (x ^ y ^ z)
 #define K 0xCA62C1D6
 
-	P(A, B, C, D, E, R(60));
-	P(E, A, B, C, D, R(61));
-	P(D, E, A, B, C, R(62));
-	P(C, D, E, A, B, R(63));
-	P(B, C, D, E, A, R(64));
-	P(A, B, C, D, E, R(65));
-	P(E, A, B, C, D, R(66));
-	P(D, E, A, B, C, R(67));
-	P(C, D, E, A, B, R(68));
-	P(B, C, D, E, A, R(69));
-	P(A, B, C, D, E, R(70));
-	P(E, A, B, C, D, R(71));
-	P(D, E, A, B, C, R(72));
-	P(C, D, E, A, B, R(73));
-	P(B, C, D, E, A, R(74));
-	P(A, B, C, D, E, R(75));
-	P(E, A, B, C, D, R(76));
-	P(D, E, A, B, C, R(77));
-	P(C, D, E, A, B, R(78));
-	P(B, C, D, E, A, R(79));
+    P(A, B, C, D, E, R(60));
+    P(E, A, B, C, D, R(61));
+    P(D, E, A, B, C, R(62));
+    P(C, D, E, A, B, R(63));
+    P(B, C, D, E, A, R(64));
+    P(A, B, C, D, E, R(65));
+    P(E, A, B, C, D, R(66));
+    P(D, E, A, B, C, R(67));
+    P(C, D, E, A, B, R(68));
+    P(B, C, D, E, A, R(69));
+    P(A, B, C, D, E, R(70));
+    P(E, A, B, C, D, R(71));
+    P(D, E, A, B, C, R(72));
+    P(C, D, E, A, B, R(73));
+    P(B, C, D, E, A, R(74));
+    P(A, B, C, D, E, R(75));
+    P(E, A, B, C, D, R(76));
+    P(D, E, A, B, C, R(77));
+    P(C, D, E, A, B, R(78));
+    P(B, C, D, E, A, R(79));
 
 #undef K
 #undef F
 
-	ctx->state[0] += A;
-	ctx->state[1] += B;
-	ctx->state[2] += C;
-	ctx->state[3] += D;
-	ctx->state[4] += E;
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
 }
 
 /*
@@ -248,45 +248,45 @@ static void sha1_process(tiny_sha1_context * ctx, unsigned char data[64])
  */
 void tiny_sha1_update(tiny_sha1_context * ctx, unsigned char *input, int ilen)
 {
-	int fill;
-	unsigned long left;
-
-	if (ilen <= 0)
-		return;
-
-	left = ctx->total[0] & 0x3F;
-	fill = 64 - left;
-
-	ctx->total[0] += ilen;
-	ctx->total[0] &= 0xFFFFFFFF;
-
-	if (ctx->total[0] < (unsigned long)ilen)
-		ctx->total[1]++;
-
-	if (left && ilen >= fill) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, fill);
-		sha1_process(ctx, ctx->buffer);
-		input += fill;
-		ilen -= fill;
-		left = 0;
-	}
-
-	while (ilen >= 64) {
-		sha1_process(ctx, input);
-		input += 64;
-		ilen -= 64;
-	}
-
-	if (ilen > 0) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
-	}
+    int fill;
+    unsigned long left;
+
+    if (ilen <= 0)
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if (ctx->total[0] < (unsigned long)ilen)
+        ctx->total[1]++;
+
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, fill);
+        sha1_process(ctx, ctx->buffer);
+        input += fill;
+        ilen -= fill;
+        left = 0;
+    }
+
+    while (ilen >= 64) {
+        sha1_process(ctx, input);
+        input += 64;
+        ilen -= 64;
+    }
+
+    if (ilen > 0) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
+    }
 }
 
 static const unsigned char sha1_padding[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 /*
@@ -294,28 +294,28 @@ static const unsigned char sha1_padding[64] = {
  */
 void tiny_sha1_finish(tiny_sha1_context * ctx, unsigned char output[20])
 {
-	unsigned long last, padn;
-	unsigned long high, low;
-	unsigned char msglen[8];
+    unsigned long last, padn;
+    unsigned long high, low;
+    unsigned char msglen[8];
 
-	high = (ctx->total[0] >> 29)
-	    | (ctx->total[1] << 3);
-	low = (ctx->total[0] << 3);
+    high = (ctx->total[0] >> 29)
+        | (ctx->total[1] << 3);
+    low = (ctx->total[0] << 3);
 
-	PUT_ULONG_BE(high, msglen, 0);
-	PUT_ULONG_BE(low, msglen, 4);
+    PUT_ULONG_BE(high, msglen, 0);
+    PUT_ULONG_BE(low, msglen, 4);
 
-	last = ctx->total[0] & 0x3F;
-	padn = (last < 56) ? (56 - last) : (120 - last);
+    last = ctx->total[0] & 0x3F;
+    padn = (last < 56) ? (56 - last) : (120 - last);
 
-	tiny_sha1_update(ctx, (unsigned char *)sha1_padding, padn);
-	tiny_sha1_update(ctx, msglen, 8);
+    tiny_sha1_update(ctx, (unsigned char *)sha1_padding, padn);
+    tiny_sha1_update(ctx, msglen, 8);
 
-	PUT_ULONG_BE(ctx->state[0], output, 0);
-	PUT_ULONG_BE(ctx->state[1], output, 4);
-	PUT_ULONG_BE(ctx->state[2], output, 8);
-	PUT_ULONG_BE(ctx->state[3], output, 12);
-	PUT_ULONG_BE(ctx->state[4], output, 16);
+    PUT_ULONG_BE(ctx->state[0], output, 0);
+    PUT_ULONG_BE(ctx->state[1], output, 4);
+    PUT_ULONG_BE(ctx->state[2], output, 8);
+    PUT_ULONG_BE(ctx->state[3], output, 12);
+    PUT_ULONG_BE(ctx->state[4], output, 16);
 }
 
 /*
@@ -323,13 +323,13 @@ void tiny_sha1_finish(tiny_sha1_context * ctx, unsigned char output[20])
  */
 void tiny_sha1(unsigned char *input, int ilen, unsigned char output[20])
 {
-	tiny_sha1_context ctx;
+    tiny_sha1_context ctx;
 
-	tiny_sha1_starts(&ctx);
-	tiny_sha1_update(&ctx, input, ilen);
-	tiny_sha1_finish(&ctx, output);
+    tiny_sha1_starts(&ctx);
+    tiny_sha1_update(&ctx, input, ilen);
+    tiny_sha1_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_sha1_context));
+    memset(&ctx, 0, sizeof(tiny_sha1_context));
 }
 
 /*
@@ -337,27 +337,27 @@ void tiny_sha1(unsigned char *input, int ilen, unsigned char output[20])
  */
 void tiny_sha1_hmac_starts(tiny_sha1_context * ctx, unsigned char *key, int keylen)
 {
-	int i;
-	unsigned char sum[20];
+    int i;
+    unsigned char sum[20];
 
-	if (keylen > 64) {
-		tiny_sha1(key, keylen, sum);
-		keylen = 20;
-		key = sum;
-	}
+    if (keylen > 64) {
+        tiny_sha1(key, keylen, sum);
+        keylen = 20;
+        key = sum;
+    }
 
-	memset(ctx->ipad, 0x36, 64);
-	memset(ctx->opad, 0x5C, 64);
+    memset(ctx->ipad, 0x36, 64);
+    memset(ctx->opad, 0x5C, 64);
 
-	for (i = 0; i < keylen; i++) {
-		ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
-		ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
-	}
+    for (i = 0; i < keylen; i++) {
+        ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
+        ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
+    }
 
-	tiny_sha1_starts(ctx);
-	tiny_sha1_update(ctx, ctx->ipad, 64);
+    tiny_sha1_starts(ctx);
+    tiny_sha1_update(ctx, ctx->ipad, 64);
 
-	memset(sum, 0, sizeof(sum));
+    memset(sum, 0, sizeof(sum));
 }
 
 /*
@@ -365,7 +365,7 @@ void tiny_sha1_hmac_starts(tiny_sha1_context * ctx, unsigned char *key, int keyl
  */
 void tiny_sha1_hmac_update(tiny_sha1_context * ctx, unsigned char *input, int ilen)
 {
-	tiny_sha1_update(ctx, input, ilen);
+    tiny_sha1_update(ctx, input, ilen);
 }
 
 /*
@@ -373,30 +373,30 @@ void tiny_sha1_hmac_update(tiny_sha1_context * ctx, unsigned char *input, int il
  */
 void tiny_sha1_hmac_finish(tiny_sha1_context * ctx, unsigned char output[20])
 {
-	unsigned char tmpbuf[20];
+    unsigned char tmpbuf[20];
 
-	tiny_sha1_finish(ctx, tmpbuf);
-	tiny_sha1_starts(ctx);
-	tiny_sha1_update(ctx, ctx->opad, 64);
-	tiny_sha1_update(ctx, tmpbuf, 20);
-	tiny_sha1_finish(ctx, output);
+    tiny_sha1_finish(ctx, tmpbuf);
+    tiny_sha1_starts(ctx);
+    tiny_sha1_update(ctx, ctx->opad, 64);
+    tiny_sha1_update(ctx, tmpbuf, 20);
+    tiny_sha1_finish(ctx, output);
 
-	memset(tmpbuf, 0, sizeof(tmpbuf));
+    memset(tmpbuf, 0, sizeof(tmpbuf));
 }
 
 /*
  * output = HMAC-SHA-1( hmac key, input buffer )
  */
 void tiny_sha1_hmac(unsigned char *key, int keylen,
-	       unsigned char *input, int ilen, unsigned char output[20])
+           unsigned char *input, int ilen, unsigned char output[20])
 {
-	tiny_sha1_context ctx;
+    tiny_sha1_context ctx;
 
-	tiny_sha1_hmac_starts(&ctx, key, keylen);
-	tiny_sha1_hmac_update(&ctx, input, ilen);
-	tiny_sha1_hmac_finish(&ctx, output);
+    tiny_sha1_hmac_starts(&ctx, key, keylen);
+    tiny_sha1_hmac_update(&ctx, input, ilen);
+    tiny_sha1_hmac_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_sha1_context));
+    memset(&ctx, 0, sizeof(tiny_sha1_context));
 }
 
 #endif

+ 282 - 282
src/tiny_sha2.c

@@ -1,43 +1,43 @@
 /*
- *	FIPS-180-2 compliant SHA-256 implementation
+ *  FIPS-180-2 compliant SHA-256 implementation
  *
  *  Based on TropicSSL: Copyright (C) 2017 Shanghai Real-Thread Technology Co., Ltd
- * 
- *	Based on XySSL: Copyright (C) 2006-2008	 Christophe Devine
  *
- *	Copyright (C) 2009	Paul Bakker <polarssl_maintainer at polarssl dot org>
+ *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
  *
- *	All rights reserved.
+ *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot org>
  *
- *	Redistribution and use in source and binary forms, with or without
- *	modification, are permitted provided that the following conditions
- *	are met:
+ *  All rights reserved.
  *
- *	  * Redistributions of source code must retain the above copyright
- *		notice, this list of conditions and the following disclaimer.
- *	  * Redistributions in binary form must reproduce the above copyright
- *		notice, this list of conditions and the following disclaimer in the
- *		documentation and/or other materials provided with the distribution.
- *	  * Neither the names of PolarSSL or XySSL nor the names of its contributors
- *		may be used to endorse or promote products derived from this software
- *		without specific prior written permission.
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
  *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- *	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *	OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *	SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- *	TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * Neither the names of PolarSSL or XySSL nor the names of its contributors
+ *      may be used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- *	The SHA-256 Secure Hash Standard was published by NIST in 2002.
+ *  The SHA-256 Secure Hash Standard was published by NIST in 2002.
  *
- *	http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
+ *  http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
  */
 
 #include "tinycrypt_config.h"
@@ -53,23 +53,23 @@
  * 32-bit integer manipulation macros (big endian)
  */
 #ifndef GET_ULONG_BE
-#define GET_ULONG_BE(n,b,i)								\
-	{													\
-		(n) = ( (unsigned long) (b)[(i)	   ] << 24 )	\
-			| ( (unsigned long) (b)[(i) + 1] << 16 )	\
-			| ( (unsigned long) (b)[(i) + 2] <<	 8 )	\
-			| ( (unsigned long) (b)[(i) + 3]	   );	\
-	}
+#define GET_ULONG_BE(n,b,i)                             \
+    {                                                   \
+        (n) = ( (unsigned long) (b)[(i)    ] << 24 )    \
+            | ( (unsigned long) (b)[(i) + 1] << 16 )    \
+            | ( (unsigned long) (b)[(i) + 2] <<  8 )    \
+            | ( (unsigned long) (b)[(i) + 3]       );   \
+    }
 #endif
 
 #ifndef PUT_ULONG_BE
-#define PUT_ULONG_BE(n,b,i)								\
-	{													\
-		(b)[(i)	   ] = (unsigned char) ( (n) >> 24 );	\
-		(b)[(i) + 1] = (unsigned char) ( (n) >> 16 );	\
-		(b)[(i) + 2] = (unsigned char) ( (n) >>	 8 );	\
-		(b)[(i) + 3] = (unsigned char) ( (n)	   );	\
-	}
+#define PUT_ULONG_BE(n,b,i)                             \
+    {                                                   \
+        (b)[(i)    ] = (unsigned char) ( (n) >> 24 );   \
+        (b)[(i) + 1] = (unsigned char) ( (n) >> 16 );   \
+        (b)[(i) + 2] = (unsigned char) ( (n) >>  8 );   \
+        (b)[(i) + 3] = (unsigned char) ( (n)       );   \
+    }
 #endif
 
 /*
@@ -77,57 +77,57 @@
  */
 void tiny_sha2_starts(tiny_sha2_context * ctx, int is224)
 {
-	ctx->total[0] = 0;
-	ctx->total[1] = 0;
-
-	if (is224 == 0) {
-		/* SHA-256 */
-		ctx->state[0] = 0x6A09E667;
-		ctx->state[1] = 0xBB67AE85;
-		ctx->state[2] = 0x3C6EF372;
-		ctx->state[3] = 0xA54FF53A;
-		ctx->state[4] = 0x510E527F;
-		ctx->state[5] = 0x9B05688C;
-		ctx->state[6] = 0x1F83D9AB;
-		ctx->state[7] = 0x5BE0CD19;
-	} else {
-		/* SHA-224 */
-		ctx->state[0] = 0xC1059ED8;
-		ctx->state[1] = 0x367CD507;
-		ctx->state[2] = 0x3070DD17;
-		ctx->state[3] = 0xF70E5939;
-		ctx->state[4] = 0xFFC00B31;
-		ctx->state[5] = 0x68581511;
-		ctx->state[6] = 0x64F98FA7;
-		ctx->state[7] = 0xBEFA4FA4;
-	}
-
-	ctx->is224 = is224;
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+
+    if (is224 == 0) {
+        /* SHA-256 */
+        ctx->state[0] = 0x6A09E667;
+        ctx->state[1] = 0xBB67AE85;
+        ctx->state[2] = 0x3C6EF372;
+        ctx->state[3] = 0xA54FF53A;
+        ctx->state[4] = 0x510E527F;
+        ctx->state[5] = 0x9B05688C;
+        ctx->state[6] = 0x1F83D9AB;
+        ctx->state[7] = 0x5BE0CD19;
+    } else {
+        /* SHA-224 */
+        ctx->state[0] = 0xC1059ED8;
+        ctx->state[1] = 0x367CD507;
+        ctx->state[2] = 0x3070DD17;
+        ctx->state[3] = 0xF70E5939;
+        ctx->state[4] = 0xFFC00B31;
+        ctx->state[5] = 0x68581511;
+        ctx->state[6] = 0x64F98FA7;
+        ctx->state[7] = 0xBEFA4FA4;
+    }
+
+    ctx->is224 = is224;
 }
 
 static void sha2_process(tiny_sha2_context * ctx, unsigned char data[64])
 {
-	unsigned long temp1, temp2, W[64];
-	unsigned long A, B, C, D, E, F, G, H;
-
-	GET_ULONG_BE(W[0], data, 0);
-	GET_ULONG_BE(W[1], data, 4);
-	GET_ULONG_BE(W[2], data, 8);
-	GET_ULONG_BE(W[3], data, 12);
-	GET_ULONG_BE(W[4], data, 16);
-	GET_ULONG_BE(W[5], data, 20);
-	GET_ULONG_BE(W[6], data, 24);
-	GET_ULONG_BE(W[7], data, 28);
-	GET_ULONG_BE(W[8], data, 32);
-	GET_ULONG_BE(W[9], data, 36);
-	GET_ULONG_BE(W[10], data, 40);
-	GET_ULONG_BE(W[11], data, 44);
-	GET_ULONG_BE(W[12], data, 48);
-	GET_ULONG_BE(W[13], data, 52);
-	GET_ULONG_BE(W[14], data, 56);
-	GET_ULONG_BE(W[15], data, 60);
-
-#define	 SHR(x,n) ((x & 0xFFFFFFFF) >> n)
+    unsigned long temp1, temp2, W[64];
+    unsigned long A, B, C, D, E, F, G, H;
+
+    GET_ULONG_BE(W[0], data, 0);
+    GET_ULONG_BE(W[1], data, 4);
+    GET_ULONG_BE(W[2], data, 8);
+    GET_ULONG_BE(W[3], data, 12);
+    GET_ULONG_BE(W[4], data, 16);
+    GET_ULONG_BE(W[5], data, 20);
+    GET_ULONG_BE(W[6], data, 24);
+    GET_ULONG_BE(W[7], data, 28);
+    GET_ULONG_BE(W[8], data, 32);
+    GET_ULONG_BE(W[9], data, 36);
+    GET_ULONG_BE(W[10], data, 40);
+    GET_ULONG_BE(W[11], data, 44);
+    GET_ULONG_BE(W[12], data, 48);
+    GET_ULONG_BE(W[13], data, 52);
+    GET_ULONG_BE(W[14], data, 56);
+    GET_ULONG_BE(W[15], data, 60);
+
+#define  SHR(x,n) ((x & 0xFFFFFFFF) >> n)
 #define ROTR(x,n) (SHR(x,n) | (x << (32 - n)))
 
 #define S0(x) (ROTR(x, 7) ^ ROTR(x,18) ^  SHR(x, 3))
@@ -139,101 +139,101 @@ static void sha2_process(tiny_sha2_context * ctx, unsigned char data[64])
 #define F0(x,y,z) ((x & y) | (z & (x | y)))
 #define F1(x,y,z) (z ^ (x & (y ^ z)))
 
-#define R(t)									\
-	(											\
-		W[t] = S1(W[t -	 2]) + W[t -  7] +		\
-		S0(W[t - 15]) + W[t - 16]				\
-		)
-
-#define P(a,b,c,d,e,f,g,h,x,K)					\
-	{											\
-		temp1 = h + S3(e) + F1(e,f,g) + K + x;	\
-		temp2 = S2(a) + F0(a,b,c);				\
-		d += temp1; h = temp1 + temp2;			\
-	}
-
-	A = ctx->state[0];
-	B = ctx->state[1];
-	C = ctx->state[2];
-	D = ctx->state[3];
-	E = ctx->state[4];
-	F = ctx->state[5];
-	G = ctx->state[6];
-	H = ctx->state[7];
-
-	P(A, B, C, D, E, F, G, H, W[0], 0x428A2F98);
-	P(H, A, B, C, D, E, F, G, W[1], 0x71374491);
-	P(G, H, A, B, C, D, E, F, W[2], 0xB5C0FBCF);
-	P(F, G, H, A, B, C, D, E, W[3], 0xE9B5DBA5);
-	P(E, F, G, H, A, B, C, D, W[4], 0x3956C25B);
-	P(D, E, F, G, H, A, B, C, W[5], 0x59F111F1);
-	P(C, D, E, F, G, H, A, B, W[6], 0x923F82A4);
-	P(B, C, D, E, F, G, H, A, W[7], 0xAB1C5ED5);
-	P(A, B, C, D, E, F, G, H, W[8], 0xD807AA98);
-	P(H, A, B, C, D, E, F, G, W[9], 0x12835B01);
-	P(G, H, A, B, C, D, E, F, W[10], 0x243185BE);
-	P(F, G, H, A, B, C, D, E, W[11], 0x550C7DC3);
-	P(E, F, G, H, A, B, C, D, W[12], 0x72BE5D74);
-	P(D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE);
-	P(C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7);
-	P(B, C, D, E, F, G, H, A, W[15], 0xC19BF174);
-	P(A, B, C, D, E, F, G, H, R(16), 0xE49B69C1);
-	P(H, A, B, C, D, E, F, G, R(17), 0xEFBE4786);
-	P(G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6);
-	P(F, G, H, A, B, C, D, E, R(19), 0x240CA1CC);
-	P(E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F);
-	P(D, E, F, G, H, A, B, C, R(21), 0x4A7484AA);
-	P(C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC);
-	P(B, C, D, E, F, G, H, A, R(23), 0x76F988DA);
-	P(A, B, C, D, E, F, G, H, R(24), 0x983E5152);
-	P(H, A, B, C, D, E, F, G, R(25), 0xA831C66D);
-	P(G, H, A, B, C, D, E, F, R(26), 0xB00327C8);
-	P(F, G, H, A, B, C, D, E, R(27), 0xBF597FC7);
-	P(E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3);
-	P(D, E, F, G, H, A, B, C, R(29), 0xD5A79147);
-	P(C, D, E, F, G, H, A, B, R(30), 0x06CA6351);
-	P(B, C, D, E, F, G, H, A, R(31), 0x14292967);
-	P(A, B, C, D, E, F, G, H, R(32), 0x27B70A85);
-	P(H, A, B, C, D, E, F, G, R(33), 0x2E1B2138);
-	P(G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC);
-	P(F, G, H, A, B, C, D, E, R(35), 0x53380D13);
-	P(E, F, G, H, A, B, C, D, R(36), 0x650A7354);
-	P(D, E, F, G, H, A, B, C, R(37), 0x766A0ABB);
-	P(C, D, E, F, G, H, A, B, R(38), 0x81C2C92E);
-	P(B, C, D, E, F, G, H, A, R(39), 0x92722C85);
-	P(A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1);
-	P(H, A, B, C, D, E, F, G, R(41), 0xA81A664B);
-	P(G, H, A, B, C, D, E, F, R(42), 0xC24B8B70);
-	P(F, G, H, A, B, C, D, E, R(43), 0xC76C51A3);
-	P(E, F, G, H, A, B, C, D, R(44), 0xD192E819);
-	P(D, E, F, G, H, A, B, C, R(45), 0xD6990624);
-	P(C, D, E, F, G, H, A, B, R(46), 0xF40E3585);
-	P(B, C, D, E, F, G, H, A, R(47), 0x106AA070);
-	P(A, B, C, D, E, F, G, H, R(48), 0x19A4C116);
-	P(H, A, B, C, D, E, F, G, R(49), 0x1E376C08);
-	P(G, H, A, B, C, D, E, F, R(50), 0x2748774C);
-	P(F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5);
-	P(E, F, G, H, A, B, C, D, R(52), 0x391C0CB3);
-	P(D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A);
-	P(C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F);
-	P(B, C, D, E, F, G, H, A, R(55), 0x682E6FF3);
-	P(A, B, C, D, E, F, G, H, R(56), 0x748F82EE);
-	P(H, A, B, C, D, E, F, G, R(57), 0x78A5636F);
-	P(G, H, A, B, C, D, E, F, R(58), 0x84C87814);
-	P(F, G, H, A, B, C, D, E, R(59), 0x8CC70208);
-	P(E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA);
-	P(D, E, F, G, H, A, B, C, R(61), 0xA4506CEB);
-	P(C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7);
-	P(B, C, D, E, F, G, H, A, R(63), 0xC67178F2);
-
-	ctx->state[0] += A;
-	ctx->state[1] += B;
-	ctx->state[2] += C;
-	ctx->state[3] += D;
-	ctx->state[4] += E;
-	ctx->state[5] += F;
-	ctx->state[6] += G;
-	ctx->state[7] += H;
+#define R(t)                                    \
+    (                                           \
+        W[t] = S1(W[t -  2]) + W[t -  7] +      \
+        S0(W[t - 15]) + W[t - 16]               \
+        )
+
+#define P(a,b,c,d,e,f,g,h,x,K)                  \
+    {                                           \
+        temp1 = h + S3(e) + F1(e,f,g) + K + x;  \
+        temp2 = S2(a) + F0(a,b,c);              \
+        d += temp1; h = temp1 + temp2;          \
+    }
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+    F = ctx->state[5];
+    G = ctx->state[6];
+    H = ctx->state[7];
+
+    P(A, B, C, D, E, F, G, H, W[0], 0x428A2F98);
+    P(H, A, B, C, D, E, F, G, W[1], 0x71374491);
+    P(G, H, A, B, C, D, E, F, W[2], 0xB5C0FBCF);
+    P(F, G, H, A, B, C, D, E, W[3], 0xE9B5DBA5);
+    P(E, F, G, H, A, B, C, D, W[4], 0x3956C25B);
+    P(D, E, F, G, H, A, B, C, W[5], 0x59F111F1);
+    P(C, D, E, F, G, H, A, B, W[6], 0x923F82A4);
+    P(B, C, D, E, F, G, H, A, W[7], 0xAB1C5ED5);
+    P(A, B, C, D, E, F, G, H, W[8], 0xD807AA98);
+    P(H, A, B, C, D, E, F, G, W[9], 0x12835B01);
+    P(G, H, A, B, C, D, E, F, W[10], 0x243185BE);
+    P(F, G, H, A, B, C, D, E, W[11], 0x550C7DC3);
+    P(E, F, G, H, A, B, C, D, W[12], 0x72BE5D74);
+    P(D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE);
+    P(C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7);
+    P(B, C, D, E, F, G, H, A, W[15], 0xC19BF174);
+    P(A, B, C, D, E, F, G, H, R(16), 0xE49B69C1);
+    P(H, A, B, C, D, E, F, G, R(17), 0xEFBE4786);
+    P(G, H, A, B, C, D, E, F, R(18), 0x0FC19DC6);
+    P(F, G, H, A, B, C, D, E, R(19), 0x240CA1CC);
+    P(E, F, G, H, A, B, C, D, R(20), 0x2DE92C6F);
+    P(D, E, F, G, H, A, B, C, R(21), 0x4A7484AA);
+    P(C, D, E, F, G, H, A, B, R(22), 0x5CB0A9DC);
+    P(B, C, D, E, F, G, H, A, R(23), 0x76F988DA);
+    P(A, B, C, D, E, F, G, H, R(24), 0x983E5152);
+    P(H, A, B, C, D, E, F, G, R(25), 0xA831C66D);
+    P(G, H, A, B, C, D, E, F, R(26), 0xB00327C8);
+    P(F, G, H, A, B, C, D, E, R(27), 0xBF597FC7);
+    P(E, F, G, H, A, B, C, D, R(28), 0xC6E00BF3);
+    P(D, E, F, G, H, A, B, C, R(29), 0xD5A79147);
+    P(C, D, E, F, G, H, A, B, R(30), 0x06CA6351);
+    P(B, C, D, E, F, G, H, A, R(31), 0x14292967);
+    P(A, B, C, D, E, F, G, H, R(32), 0x27B70A85);
+    P(H, A, B, C, D, E, F, G, R(33), 0x2E1B2138);
+    P(G, H, A, B, C, D, E, F, R(34), 0x4D2C6DFC);
+    P(F, G, H, A, B, C, D, E, R(35), 0x53380D13);
+    P(E, F, G, H, A, B, C, D, R(36), 0x650A7354);
+    P(D, E, F, G, H, A, B, C, R(37), 0x766A0ABB);
+    P(C, D, E, F, G, H, A, B, R(38), 0x81C2C92E);
+    P(B, C, D, E, F, G, H, A, R(39), 0x92722C85);
+    P(A, B, C, D, E, F, G, H, R(40), 0xA2BFE8A1);
+    P(H, A, B, C, D, E, F, G, R(41), 0xA81A664B);
+    P(G, H, A, B, C, D, E, F, R(42), 0xC24B8B70);
+    P(F, G, H, A, B, C, D, E, R(43), 0xC76C51A3);
+    P(E, F, G, H, A, B, C, D, R(44), 0xD192E819);
+    P(D, E, F, G, H, A, B, C, R(45), 0xD6990624);
+    P(C, D, E, F, G, H, A, B, R(46), 0xF40E3585);
+    P(B, C, D, E, F, G, H, A, R(47), 0x106AA070);
+    P(A, B, C, D, E, F, G, H, R(48), 0x19A4C116);
+    P(H, A, B, C, D, E, F, G, R(49), 0x1E376C08);
+    P(G, H, A, B, C, D, E, F, R(50), 0x2748774C);
+    P(F, G, H, A, B, C, D, E, R(51), 0x34B0BCB5);
+    P(E, F, G, H, A, B, C, D, R(52), 0x391C0CB3);
+    P(D, E, F, G, H, A, B, C, R(53), 0x4ED8AA4A);
+    P(C, D, E, F, G, H, A, B, R(54), 0x5B9CCA4F);
+    P(B, C, D, E, F, G, H, A, R(55), 0x682E6FF3);
+    P(A, B, C, D, E, F, G, H, R(56), 0x748F82EE);
+    P(H, A, B, C, D, E, F, G, R(57), 0x78A5636F);
+    P(G, H, A, B, C, D, E, F, R(58), 0x84C87814);
+    P(F, G, H, A, B, C, D, E, R(59), 0x8CC70208);
+    P(E, F, G, H, A, B, C, D, R(60), 0x90BEFFFA);
+    P(D, E, F, G, H, A, B, C, R(61), 0xA4506CEB);
+    P(C, D, E, F, G, H, A, B, R(62), 0xBEF9A3F7);
+    P(B, C, D, E, F, G, H, A, R(63), 0xC67178F2);
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+    ctx->state[5] += F;
+    ctx->state[6] += G;
+    ctx->state[7] += H;
 }
 
 /*
@@ -241,45 +241,45 @@ static void sha2_process(tiny_sha2_context * ctx, unsigned char data[64])
  */
 void tiny_sha2_update(tiny_sha2_context * ctx, unsigned char *input, int ilen)
 {
-	int fill;
-	unsigned long left;
-
-	if (ilen <= 0)
-		return;
-
-	left = ctx->total[0] & 0x3F;
-	fill = 64 - left;
-
-	ctx->total[0] += ilen;
-	ctx->total[0] &= 0xFFFFFFFF;
-
-	if (ctx->total[0] < (unsigned long)ilen)
-		ctx->total[1]++;
-
-	if (left && ilen >= fill) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, fill);
-		sha2_process(ctx, ctx->buffer);
-		input += fill;
-		ilen -= fill;
-		left = 0;
-	}
-
-	while (ilen >= 64) {
-		sha2_process(ctx, input);
-		input += 64;
-		ilen -= 64;
-	}
-
-	if (ilen > 0) {
-		memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
-	}
+    int fill;
+    unsigned long left;
+
+    if (ilen <= 0)
+        return;
+
+    left = ctx->total[0] & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += ilen;
+    ctx->total[0] &= 0xFFFFFFFF;
+
+    if (ctx->total[0] < (unsigned long)ilen)
+        ctx->total[1]++;
+
+    if (left && ilen >= fill) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, fill);
+        sha2_process(ctx, ctx->buffer);
+        input += fill;
+        ilen -= fill;
+        left = 0;
+    }
+
+    while (ilen >= 64) {
+        sha2_process(ctx, input);
+        input += 64;
+        ilen -= 64;
+    }
+
+    if (ilen > 0) {
+        memcpy((void *)(ctx->buffer + left), (void *)input, ilen);
+    }
 }
 
 static const unsigned char sha2_padding[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
 /*
@@ -287,33 +287,33 @@ static const unsigned char sha2_padding[64] = {
  */
 void tiny_sha2_finish(tiny_sha2_context * ctx, unsigned char output[32])
 {
-	unsigned long last, padn;
-	unsigned long high, low;
-	unsigned char msglen[8];
+    unsigned long last, padn;
+    unsigned long high, low;
+    unsigned char msglen[8];
 
-	high = (ctx->total[0] >> 29)
-	    | (ctx->total[1] << 3);
-	low = (ctx->total[0] << 3);
+    high = (ctx->total[0] >> 29)
+        | (ctx->total[1] << 3);
+    low = (ctx->total[0] << 3);
 
-	PUT_ULONG_BE(high, msglen, 0);
-	PUT_ULONG_BE(low, msglen, 4);
+    PUT_ULONG_BE(high, msglen, 0);
+    PUT_ULONG_BE(low, msglen, 4);
 
-	last = ctx->total[0] & 0x3F;
-	padn = (last < 56) ? (56 - last) : (120 - last);
+    last = ctx->total[0] & 0x3F;
+    padn = (last < 56) ? (56 - last) : (120 - last);
 
-	tiny_sha2_update(ctx, (unsigned char *)sha2_padding, padn);
-	tiny_sha2_update(ctx, msglen, 8);
+    tiny_sha2_update(ctx, (unsigned char *)sha2_padding, padn);
+    tiny_sha2_update(ctx, msglen, 8);
 
-	PUT_ULONG_BE(ctx->state[0], output, 0);
-	PUT_ULONG_BE(ctx->state[1], output, 4);
-	PUT_ULONG_BE(ctx->state[2], output, 8);
-	PUT_ULONG_BE(ctx->state[3], output, 12);
-	PUT_ULONG_BE(ctx->state[4], output, 16);
-	PUT_ULONG_BE(ctx->state[5], output, 20);
-	PUT_ULONG_BE(ctx->state[6], output, 24);
+    PUT_ULONG_BE(ctx->state[0], output, 0);
+    PUT_ULONG_BE(ctx->state[1], output, 4);
+    PUT_ULONG_BE(ctx->state[2], output, 8);
+    PUT_ULONG_BE(ctx->state[3], output, 12);
+    PUT_ULONG_BE(ctx->state[4], output, 16);
+    PUT_ULONG_BE(ctx->state[5], output, 20);
+    PUT_ULONG_BE(ctx->state[6], output, 24);
 
-	if (ctx->is224 == 0)
-		PUT_ULONG_BE(ctx->state[7], output, 28);
+    if (ctx->is224 == 0)
+        PUT_ULONG_BE(ctx->state[7], output, 28);
 }
 
 /*
@@ -321,42 +321,42 @@ void tiny_sha2_finish(tiny_sha2_context * ctx, unsigned char output[32])
  */
 void tiny_sha2(unsigned char *input, int ilen, unsigned char output[32], int is224)
 {
-	tiny_sha2_context ctx;
+    tiny_sha2_context ctx;
 
-	tiny_sha2_starts(&ctx, is224);
-	tiny_sha2_update(&ctx, input, ilen);
-	tiny_sha2_finish(&ctx, output);
+    tiny_sha2_starts(&ctx, is224);
+    tiny_sha2_update(&ctx, input, ilen);
+    tiny_sha2_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_sha2_context));
+    memset(&ctx, 0, sizeof(tiny_sha2_context));
 }
 
 /*
  * SHA-256 HMAC context setup
  */
 void tiny_sha2_hmac_starts(tiny_sha2_context * ctx, unsigned char *key, int keylen,
-		      int is224)
+              int is224)
 {
-	int i;
-	unsigned char sum[32];
+    int i;
+    unsigned char sum[32];
 
-	if (keylen > 64) {
-		tiny_sha2(key, keylen, sum, is224);
-		keylen = (is224) ? 28 : 32;
-		key = sum;
-	}
+    if (keylen > 64) {
+        tiny_sha2(key, keylen, sum, is224);
+        keylen = (is224) ? 28 : 32;
+        key = sum;
+    }
 
-	memset(ctx->ipad, 0x36, 64);
-	memset(ctx->opad, 0x5C, 64);
+    memset(ctx->ipad, 0x36, 64);
+    memset(ctx->opad, 0x5C, 64);
 
-	for (i = 0; i < keylen; i++) {
-		ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
-		ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
-	}
+    for (i = 0; i < keylen; i++) {
+        ctx->ipad[i] = (unsigned char)(ctx->ipad[i] ^ key[i]);
+        ctx->opad[i] = (unsigned char)(ctx->opad[i] ^ key[i]);
+    }
 
-	tiny_sha2_starts(ctx, is224);
-	tiny_sha2_update(ctx, ctx->ipad, 64);
+    tiny_sha2_starts(ctx, is224);
+    tiny_sha2_update(ctx, ctx->ipad, 64);
 
-	memset(sum, 0, sizeof(sum));
+    memset(sum, 0, sizeof(sum));
 }
 
 /*
@@ -364,7 +364,7 @@ void tiny_sha2_hmac_starts(tiny_sha2_context * ctx, unsigned char *key, int keyl
  */
 void tiny_sha2_hmac_update(tiny_sha2_context * ctx, unsigned char *input, int ilen)
 {
-	tiny_sha2_update(ctx, input, ilen);
+    tiny_sha2_update(ctx, input, ilen);
 }
 
 /*
@@ -372,35 +372,35 @@ void tiny_sha2_hmac_update(tiny_sha2_context * ctx, unsigned char *input, int il
  */
 void tiny_sha2_hmac_finish(tiny_sha2_context * ctx, unsigned char output[32])
 {
-	int is224, hlen;
-	unsigned char tmpbuf[32];
+    int is224, hlen;
+    unsigned char tmpbuf[32];
 
-	is224 = ctx->is224;
-	hlen = (is224 == 0) ? 32 : 28;
+    is224 = ctx->is224;
+    hlen = (is224 == 0) ? 32 : 28;
 
-	tiny_sha2_finish(ctx, tmpbuf);
-	tiny_sha2_starts(ctx, is224);
-	tiny_sha2_update(ctx, ctx->opad, 64);
-	tiny_sha2_update(ctx, tmpbuf, hlen);
-	tiny_sha2_finish(ctx, output);
+    tiny_sha2_finish(ctx, tmpbuf);
+    tiny_sha2_starts(ctx, is224);
+    tiny_sha2_update(ctx, ctx->opad, 64);
+    tiny_sha2_update(ctx, tmpbuf, hlen);
+    tiny_sha2_finish(ctx, output);
 
-	memset(tmpbuf, 0, sizeof(tmpbuf));
+    memset(tmpbuf, 0, sizeof(tmpbuf));
 }
 
 /*
  * output = HMAC-SHA-256( hmac key, input buffer )
  */
 void tiny_sha2_hmac(unsigned char *key, int keylen,
-	       unsigned char *input, int ilen,
-	       unsigned char output[32], int is224)
+           unsigned char *input, int ilen,
+           unsigned char output[32], int is224)
 {
-	tiny_sha2_context ctx;
+    tiny_sha2_context ctx;
 
-	tiny_sha2_hmac_starts(&ctx, key, keylen, is224);
-	tiny_sha2_hmac_update(&ctx, input, ilen);
-	tiny_sha2_hmac_finish(&ctx, output);
+    tiny_sha2_hmac_starts(&ctx, key, keylen, is224);
+    tiny_sha2_hmac_update(&ctx, input, ilen);
+    tiny_sha2_hmac_finish(&ctx, output);
 
-	memset(&ctx, 0, sizeof(tiny_sha2_context));
+    memset(&ctx, 0, sizeof(tiny_sha2_context));
 }
 
 #endif