diff options
Diffstat (limited to 'lib/isccc')
| -rw-r--r-- | lib/isccc/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/isccc/alist.c | 5 | ||||
| -rw-r--r-- | lib/isccc/api | 2 | ||||
| -rw-r--r-- | lib/isccc/cc.c | 10 | ||||
| -rw-r--r-- | lib/isccc/sexpr.c | 3 |
5 files changed, 13 insertions, 11 deletions
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in index 1a33be9163b2..843e510a6f06 100644 --- a/lib/isccc/Makefile.in +++ b/lib/isccc/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2007, 2009, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2007, 2009, 2011, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001, 2003 Internet Software Consortium. # # Permission to use, copy, modify, and/or distribute this software for any @@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@ @BIND9_MAKE_INCLUDES@ -CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES} +CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCC_INCLUDES} @ISC_OPENSSL_INC@ CDEFINES = CWARNINGS = diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c index 4f1743ed4972..cec8b5e55030 100644 --- a/lib/isccc/alist.c +++ b/lib/isccc/alist.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004, 2005, 2007, 2015 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -40,6 +40,7 @@ #include <isccc/alist.h> #include <isc/assertions.h> +#include <isc/print.h> #include <isccc/result.h> #include <isccc/sexpr.h> #include <isccc/util.h> @@ -50,7 +51,7 @@ #define ALIST_TAG "*alist*" #define MAX_INDENT 64 -static char spaces[MAX_INDENT + 1] = +static char spaces[MAX_INDENT + 1] = " "; isccc_sexpr_t * diff --git a/lib/isccc/api b/lib/isccc/api index 864bdc90941c..a27437f4335b 100644 --- a/lib/isccc/api +++ b/lib/isccc/api @@ -5,5 +5,5 @@ # 9.9: 90-109 # 9.9-sub: 130-139 LIBINTERFACE = 90 -LIBREVISION = 6 +LIBREVISION = 7 LIBAGE = 0 diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c index 69e7f7cee0b7..30252336026d 100644 --- a/lib/isccc/cc.c +++ b/lib/isccc/cc.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004-2007, 2012, 2013 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004-2007, 2012, 2013, 2015 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2001-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -160,7 +160,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target) isccc_sexpr_t *kv, *elt, *k, *v; char *ks; isc_result_t result; - size_t len; + unsigned int len; for (elt = isccc_alist_first(alist); elt != NULL; @@ -169,7 +169,7 @@ table_towire(isccc_sexpr_t *alist, isccc_region_t *target) k = ISCCC_SEXPR_CAR(kv); ks = isccc_sexpr_tostring(k); v = ISCCC_SEXPR_CDR(kv); - len = strlen(ks); + len = (unsigned int)strlen(ks); INSIST(len <= 255U); /* * Emit the key name. @@ -313,8 +313,8 @@ verify(isccc_sexpr_t *alist, unsigned char *data, unsigned int length, /* * Verify. */ - if (!isc_safe_memcmp((unsigned char *) isccc_sexpr_tostring(hmd5), - digestb64, HMD5_LENGTH)) + if (!isc_safe_memequal((unsigned char *) isccc_sexpr_tostring(hmd5), + digestb64, HMD5_LENGTH)) return (ISCCC_R_BADAUTH); return (ISC_R_SUCCESS); diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c index df11a9303175..9b7d5d7f3749 100644 --- a/lib/isccc/sexpr.c +++ b/lib/isccc/sexpr.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004, 2005, 2007, 2014 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004, 2005, 2007, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -40,6 +40,7 @@ #include <string.h> #include <isc/assertions.h> +#include <isc/print.h> #include <isccc/sexpr.h> #include <isccc/util.h> |