Prevent possible buffer overflows when using very large (>= 8192 bit) RSA keys.

[oweals/tinc.git] / src / protocol.h

diff --git a/src/protocol.h b/src/protocol.h
index 0eae830d187b2a30b059b03cdad4bd06416efcbb..d6a35be77230215b239b9bd6da8b478258cddea0 100644 (file)
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,7 +1,7 @@
 /*
     protocol.h -- header for protocol.c
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.h,v 1.5.4.42 2003/07/29 10:50:15 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_PROTOCOL_H__
@@ -29,6 +29,12 @@
 
 #define PROT_CURRENT 17
 
+/* Silly Windows */
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
 /* Request numbers */
 
 typedef enum request_t {
@@ -48,9 +54,14 @@ typedef struct past_request_t {
        time_t firstseen;
 } past_request_t;
 
-/* Maximum size of strings in a request */
+extern bool tunnelserver;
+
+/* Maximum size of strings in a request.
+ * scanf terminates %2048s with a NUL character,
+ * but the NUL character can be written after the 2048th non-NUL character.
+ */
 
-#define MAX_STRING_SIZE 2048
+#define MAX_STRING_SIZE 2049
 #define MAX_STRING "%2048s"
 
 #include "edge.h"
@@ -60,7 +71,7 @@ typedef struct past_request_t {
 
 /* Basic functions */
 
-extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((format(printf, 2, 3)));
+extern bool send_request(struct connection_t *, const char *, ...) __attribute__ ((__format__(printf, 2, 3)));
 extern void forward_request(struct connection_t *);
 extern bool receive_request(struct connection_t *);
 extern bool check_id(const char *);