WIP: JRE stuff

1 files changed, 13 insertions, 6 deletions

diff --git a/src/digest/digest.h b/src/digest/digest.h
index d047b8e..2887b8a 100644
--- a/src/digest/digest.h
+++ b/src/digest/digest.h
@@ -4,20 +4,24 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#define L2_SHA1_BLOCKLEN (64) /* 512 / 8 = 64 */
-#define L2_SHA1_DIGESTLEN (5) /* 160 / 32 = 5 */
+#include "macros.h"
+
+#define L2_SHA1__BLOCKLEN (64) /* 512 / 8 = 64 */
+#define L2_SHA1__DIGESTLEN (5) /* 160 / 32 = 5 */
+
 #define L2_SHA1_HEX_STRLEN (40)
+#define L2_SHA1_DIGEST_BYTES (20)
 
 typedef struct tag_l2_sha1_state {
   /* struct members are internal do not use directly */
-  uint32_t state[L2_SHA1_DIGESTLEN];
-  uint8_t chunk[L2_SHA1_BLOCKLEN];
+  uint32_t state[L2_SHA1__DIGESTLEN];
+  uint8_t chunk[L2_SHA1__BLOCKLEN];
   size_t nchunk;
   uint64_t totallen;
 } l2_sha1_state_t;
 
 typedef struct tag_l2_sha1_digest {
-  uint32_t state[L2_SHA1_DIGESTLEN];
+  uint32_t state[L2_SHA1__DIGESTLEN];
 } l2_sha1_digest_t;
 
 void l2_sha1_init(l2_sha1_state_t *st);
@@ -25,8 +29,11 @@ void l2_sha1_update(l2_sha1_state_t *st, const void *data, size_t sz);
 void l2_sha1_finalize(l2_sha1_state_t *st, l2_sha1_digest_t *digest);
 
 int l2_sha1_digest_compare(const l2_sha1_digest_t *d1, const l2_sha1_digest_t *d2);
-void l2_sha1_digest_copy(l2_sha1_digest_t *restrict dest, const l2_sha1_digest_t *restrict src);
+void l2_sha1_digest_copy(l2_sha1_digest_t *L2_RESTRICT dest, const l2_sha1_digest_t *L2_RESTRICT src);
 void l2_sha1_digest_to_hex(const l2_sha1_digest_t *dg, char *out);
 int l2_sha1_digest_from_hex(l2_sha1_digest_t *dg, const char *in);
 
+void l2_sha1_digest_to_buffer(const l2_sha1_digest_t *dg, void *odata);
+void l2_sha1_digest_from_buffer(l2_sha1_digest_t *dg, const void *data);
+
 #endif /* include guard */