mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-18 04:23:44 +02:00
7772992636
Upstream has a few code cleanups, more eagerly burns sensitive memory and includes the fix for CVE-2012-0920. Full changelog: https://matt.ucc.asn.au/dropbear/CHANGES Local changes: - Removed PKG_MULTI which is no longer in options.h (even before 2011.54) - Merged DO_HOST_LOOKUP into 120-openwrt_options.patch - Removed LD from make opts (now included in TARGET_CONFIGURE_OPTS) - Removed 400-CVE-2012-0920.patch which is included in 2012.55 Signed-off-by: Catalin Patulea <cat@vv.carleton.ca> Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34496 3c298f89-4303-0410-b956-a3cf2f4a3e73
15 lines
492 B
Diff
15 lines
492 B
Diff
--- a/dbutil.h
|
|
+++ b/dbutil.h
|
|
@@ -93,6 +93,10 @@ int m_str_to_uint(const char* str, unsig
|
|
#define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL}
|
|
|
|
/* Dropbear assertion */
|
|
-#define dropbear_assert(X) do { if (!(X)) { fail_assert(#X, __FILE__, __LINE__); } } while (0)
|
|
+#ifndef DROPBEAR_ASSERT_ENABLED
|
|
+#define DROPBEAR_ASSERT_ENABLED 0
|
|
+#endif
|
|
+
|
|
+#define dropbear_assert(X) do { if (DROPBEAR_ASSERT_ENABLED && !(X)) { fail_assert(#X, __FILE__, __LINE__); } } while (0)
|
|
|
|
#endif /* _DBUTIL_H_ */
|