tableprinter: code cleanup

[libucw.git] / ucw / sha1.h

diff --git a/ucw/sha1.h b/ucw/sha1.h
index 4b17da548c97c6eaf98b158dddd2a28f7e6a43b4..563bbb37b900ba307ff6a3a59339332064be9c8f 100644 (file)
--- a/ucw/sha1.h
+++ b/ucw/sha1.h
@@ -14,6 +14,17 @@
 #ifndef _UCW_SHA1_H
 #define _UCW_SHA1_H
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define sha1_final ucw_sha1_final
+#define sha1_hash_buffer ucw_sha1_hash_buffer
+#define sha1_hmac ucw_sha1_hmac
+#define sha1_hmac_final ucw_sha1_hmac_final
+#define sha1_hmac_init ucw_sha1_hmac_init
+#define sha1_hmac_update ucw_sha1_hmac_update
+#define sha1_init ucw_sha1_init
+#define sha1_update ucw_sha1_update
+#endif
+
 /**
  * Internal SHA1 state.
  * You should use it just as an opaque handle only.
@@ -33,7 +44,7 @@ void sha1_init(sha1_context *hd); /** Initialize new algorithm run in the @hd co
  * @sha1_init()). It has the same effect as concatenating all the data
  * together and passing them at once.
  */
-void sha1_update(sha1_context *hd, const byte *inbuf, uns inlen);
+void sha1_update(sha1_context *hd, const byte *inbuf, uint inlen);
 /**
  * No more @sha1_update() calls will be done. This terminates the hash
  * and returns a pointer to it.
@@ -55,13 +66,13 @@ byte *sha1_final(sha1_context *hd);
  *  sha1_update(&hd, buffer, length);
  *  memcpy(outbuf, sha1_final(&hd), SHA1_SIZE);
  */
-void sha1_hash_buffer(byte *outbuf, const byte *buffer, uns length);
+void sha1_hash_buffer(byte *outbuf, const byte *buffer, uint length);
 
 /**
  * SHA1 HMAC message authentication. If you provide @key and @data,
  * the result will be stored in @outbuf.
  */
-void sha1_hmac(byte *outbuf, const byte *key, uns keylen, const byte *data, uns datalen);
+void sha1_hmac(byte *outbuf, const byte *key, uint keylen, const byte *data, uint datalen);
 
 /**
  * The HMAC also exists in a stream version in a way analogous to the
@@ -72,8 +83,8 @@ typedef struct {
   sha1_context octx;
 } sha1_hmac_context;
 
-void sha1_hmac_init(sha1_hmac_context *hd, const byte *key, uns keylen);       /** Initialize HMAC with context @hd and the given key. See sha1_init(). */
-void sha1_hmac_update(sha1_hmac_context *hd, const byte *data, uns datalen);   /** Hash another @datalen bytes of data. See sha1_update(). */
+void sha1_hmac_init(sha1_hmac_context *hd, const byte *key, uint keylen);      /** Initialize HMAC with context @hd and the given key. See sha1_init(). */
+void sha1_hmac_update(sha1_hmac_context *hd, const byte *data, uint datalen);  /** Hash another @datalen bytes of data. See sha1_update(). */
 byte *sha1_hmac_final(sha1_hmac_context *hd);                                  /** Terminate the HMAC and return a pointer to the allocated hash. See sha1_final(). */
 
 #define SHA1_SIZE 20 /** Size of the SHA1 hash in its binary representation **/