update to 9.7.1-P2
[tridge/bind9.git] / bin / tests / system / tkey / keycreate.c
index 5540866a0e2e05b4f2bb996796255e2dccbb7017..23e6d4247648b7171d885f89b52d428433977c03 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keycreate.c,v 1.15 2007/06/19 23:47:06 tbox Exp $ */
+/* $Id: keycreate.c,v 1.18 2009/09/01 00:22:25 jinmei Exp $ */
 
 #include <config.h>
 
@@ -135,7 +135,7 @@ sendquery(isc_task_t *task, isc_event_t *event) {
        isc_region_t r;
        isc_result_t result;
        dns_fixedname_t keyname;
-       dns_fixedname_t ownername;      
+       dns_fixedname_t ownername;
        isc_buffer_t namestr, keybuf;
        unsigned char keydata[9];
        dns_message_t *query;
@@ -153,14 +153,14 @@ sendquery(isc_task_t *task, isc_event_t *event) {
        isc_buffer_init(&namestr, "tkeytest.", 9);
        isc_buffer_add(&namestr, 9);
        result = dns_name_fromtext(dns_fixedname_name(&keyname), &namestr,
-                                  NULL, ISC_FALSE, NULL);
+                                  NULL, 0, NULL);
        CHECK("dns_name_fromtext", result);
 
        dns_fixedname_init(&ownername);
        isc_buffer_init(&namestr, ownername_str, strlen(ownername_str));
        isc_buffer_add(&namestr, strlen(ownername_str));
        result = dns_name_fromtext(dns_fixedname_name(&ownername), &namestr,
-                                  NULL, ISC_FALSE, NULL);
+                                  NULL, 0, NULL);
        CHECK("dns_name_fromtext", result);
 
        isc_buffer_init(&keybuf, keydata, 9);
@@ -285,7 +285,7 @@ main(int argc, char *argv[]) {
 
        ourkey = NULL;
        type = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_KEY;
-       result = dst_key_fromnamedfile(ourkeyname, type, mctx, &ourkey);
+       result = dst_key_fromnamedfile(ourkeyname, NULL, type, mctx, &ourkey);
        CHECK("dst_key_fromnamedfile", result);
 
        isc_buffer_init(&nonce, noncedata, sizeof(noncedata));