X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=cbe9f52b785b8430f438ade5c3d7e53271fd16df;hp=4563a2491e84d54c79392b74d50a1b00afbe7bae;hb=b4a26b17a38c3dd1cc6e086a17649b94b0ab8e37;hpb=fe5e9cc422cd72526ccfceffbc7e5af8ac83b407

diff --git a/util.h b/util.h
index 4563a24..cbe9f52 100644
--- a/util.h
+++ b/util.h
@@ -4,6 +4,8 @@
 #include "secnet.h"
 #include <gmp.h>
 
+#include "hackypar.h"
+
 #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \
 						     __FILE__,__LINE__); } \
 while(0)
@@ -16,15 +18,22 @@ while(0)
 #define BUF_FREE(buf) do { (buf)->free=True; } while(0)
 
 extern void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
-			       uint32_t line);
+			       int line);
 extern void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
-			       uint32_t line);
-extern void buffer_new(struct buffer_if *buffer, uint32_t len);
-extern void buffer_init(struct buffer_if *buffer, uint32_t max_start_pad);
-extern void *buf_append(struct buffer_if *buf, uint32_t amount);
-extern void *buf_prepend(struct buffer_if *buf, uint32_t amount);
-extern void *buf_unappend(struct buffer_if *buf, uint32_t amount);
-extern void *buf_unprepend(struct buffer_if *buf, uint32_t amount);
+			       int line);
+extern void buffer_new(struct buffer_if *buffer, int32_t len);
+extern void buffer_init(struct buffer_if *buffer, int32_t max_start_pad);
+extern void buffer_copy(struct buffer_if *dst, const struct buffer_if *src);
+extern void *buf_append(struct buffer_if *buf, int32_t amount);
+extern void *buf_prepend(struct buffer_if *buf, int32_t amount);
+extern void *buf_unappend(struct buffer_if *buf, int32_t amount);
+extern void *buf_unprepend(struct buffer_if *buf, int32_t amount);
+
+extern void buffer_readonly_view(struct buffer_if *n, const void*, int32_t len);
+extern void buffer_readonly_clone(struct buffer_if *n, const struct buffer_if*);
+  /* Caller must only use unappend, unprepend et al. on n.
+   * New buffer state (in n) before this can be undefined.  After use,
+   * it must NOT be freed. */
 
 extern void buf_append_string(struct buffer_if *buf, cstring_t s);
 
@@ -32,8 +41,10 @@ extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);
 
 extern char *write_mpstring(MP_INT *a);
 
-extern uint32_t write_mpbin(MP_INT *a, uint8_t *buffer, uint32_t buflen);
+extern int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen);
 
 extern struct log_if *init_log(list_t *loglist);
 
+extern int consttime_memeq(const void *s1, const void *s2, size_t n);
+
 #endif /* util_h */