diff dbutil.h @ 943:185b241a0b4a coverity

merge
author Matt Johnston <matt@ucc.asn.au>
date Fri, 25 Jul 2014 22:23:50 +0800
parents 5daedffd0769
children f92eb625c48d
line wrap: on
line diff
--- a/dbutil.h	Sat Mar 08 21:02:02 2014 +0800
+++ b/dbutil.h	Fri Jul 25 22:23:50 2014 +0800
@@ -62,9 +62,9 @@
 #endif
 
 enum dropbear_prio {
-	DROPBEAR_PRIO_DEFAULT,
-	DROPBEAR_PRIO_LOWDELAY,
-	DROPBEAR_PRIO_BULK,
+	DROPBEAR_PRIO_DEFAULT = 'dffd',
+	DROPBEAR_PRIO_LOWDELAY = 'lddl',
+	DROPBEAR_PRIO_BULK = 'bllb',
 };
 
 char * stripcontrol(const char * text);
@@ -106,4 +106,9 @@
 /* Returns 0 if a and b have the same contents */
 int constant_time_memcmp(const void* a, const void *b, size_t n);
 
+/* Returns a time in seconds that doesn't go backwards - does not correspond to
+a real-world clock */
+time_t monotonic_now();
+
+
 #endif /* _DBUTIL_H_ */