X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=c41f38d7203dd91db8bdfd6d000529ba5fbbecb1;hb=0b911d4a813fe164d62ef6ef132c5a4f9a441d57;hp=fddb1ae3ebadfb5bdfbd5b96350001c487e1386a;hpb=630fb7d8dc740715cdc52114d736d64bf14f0798;p=tfcrypt.git

diff --git a/tfcrypt.h b/tfcrypt.h
index fddb1ae..c41f38d 100644
--- a/tfcrypt.h
+++ b/tfcrypt.h
@@ -119,6 +119,9 @@ int xmhexdump(int to, const void *data, size_t szdata, int hgroup, int hexstr, i
 #define mhexdump(data, szdata, group, newline) xmhexdump(1, data, szdata, group, do_full_hexdump, newline)
 #define mehexdump(data, szdata, group, newline) xmhexdump(2, data, szdata, group, do_full_hexdump, newline)
 
+size_t xstrlcpy(char *dst, const char *src, size_t size);
+size_t xstrlcat(char *dst, const char *src, size_t size);
+
 extern size_t nr_turns;
 extern int ctr_mode;
 extern size_t macbits;
@@ -203,6 +206,8 @@ void skein(void *hash, size_t bits, const void *key, const void *data, size_t sz
 void tf_key_tweak_compat(void *key);
 tfc_yesno skeinfd(void *hash, size_t bits, const void *key, int fd, tfc_fsize offset, tfc_fsize readto);
 
+void read_defaults(const char *path, tfc_yesno noerr);
+
 void gen_write_bytes(const char *foutname, tfc_fsize offset, tfc_fsize nrbytes);
 void do_edbase64(char **fargv);
 void do_sksum(char *spec, char **fargv);
@@ -221,6 +226,6 @@ enum {
 	TFC_MODE_SKSUM = -2, TFC_MODE_PLAIN = -1, TFC_MODE_CTR = 1,
 	TFC_MODE_STREAM, TFC_MODE_XTS, TFC_MODE_ECB, TFC_MODE_CBC, TFC_MODE_OCB
 };
-enum { TFC_CTR_SHOW = 1, TFC_CTR_HEAD, TFC_CTR_RAND };
+enum { TFC_CTR_SHOW = 1, TFC_CTR_HEAD, TFC_CTR_RAND, TFC_CTR_ZERO };
 
 #endif