[src/netbsd-1-6]: src/dist/bind/lib/dst Pull up revision 1.3 (requested by it...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba10bd4a4f79
branches:  netbsd-1-6
changeset: 528182:ba10bd4a4f79
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:43:13 2002 +0000

description:
Pull up revision 1.3 (requested by itojun in ticket #387):
Update to BIND 8.3.3.  Fixes buffer overrun in resolver code.

diffstat:

 dist/bind/lib/dst/dst_internal.h |  25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r 3e1805048a18 -r ba10bd4a4f79 dist/bind/lib/dst/dst_internal.h
--- a/dist/bind/lib/dst/dst_internal.h  Fri Jun 28 11:43:03 2002 +0000
+++ b/dist/bind/lib/dst/dst_internal.h  Fri Jun 28 11:43:13 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dst_internal.h,v 1.2 2000/10/08 20:03:12 is Exp $      */
+/*     $NetBSD: dst_internal.h,v 1.2.2.1 2002/06/28 11:43:13 lukem Exp $       */
 
 #ifndef DST_INTERNAL_H
 #define DST_INTERNAL_H
@@ -67,13 +67,14 @@
 #ifdef REPORT_ERRORS
 #define EREPORT(str)           printf str
 #else
-#define EREPORT(str)
+#define EREPORT(str)           (void)0
 #endif
 
 /* use our own special macro to FRRE memory */
 
 #ifndef SAFE_FREE
-#define SAFE_FREE(a) if(a != NULL){memset(a,0, sizeof(*a)); free(a); a=NULL;}
+#define SAFE_FREE(a) \
+do{if(a != NULL){memset(a,0, sizeof(*a)); free(a); a=NULL;}} while (0)
 #define SAFE_FREE2(a,s) if (a != NULL && s > 0){memset(a,0, s);free(a); a=NULL;}
 #endif
 
@@ -100,22 +101,22 @@
 } dst_func;
 
 extern dst_func *dst_t_func[DST_MAX_ALGS];
-static const char key_file_fmt_str[] = "Private-key-format: v%s\nAlgorithm: %d (%s)\n";
-extern char *dst_path;
+extern const char *key_file_fmt_str;
+extern const char *dst_path;
 
 #ifndef DST_HASH_SIZE
 #define DST_HASH_SIZE 20       /* RIPEMD160 and SHA-1 are 20 bytes MD5 is 16 */
 #endif
 
-int dst_bsafe_init();
+int dst_bsafe_init(void);
 
-int dst_rsaref_init();
+int dst_rsaref_init(void);
 
-int dst_hmac_md5_init();
+int dst_hmac_md5_init(void);
 
-int dst_cylink_init();
+int dst_cylink_init(void);
 
-int dst_eay_dss_init();
+int dst_eay_dss_init(void);
 
 /* support functions */
 /* base64 to bignum conversion routines */
@@ -160,6 +161,10 @@
 #else
 # define DUMP(a,b,c,d)
 #endif
+void
+dst_s_dump(const int mode, const u_char *data, const int size,
+            const char *msg);
+
 
 
 #endif /* DST_INTERNAL_H */