mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

dns_result_t -> isc_result_t

Browse Source
This commit is contained in:
Andreas Gustafsson 1999-11-30 22:14:39 +00:00
parent 79c08618e9
commit fa6c5e38f4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/tests/dst/t_dst.c
View File

@ -586,7 +586,7 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
unsigned char *p; unsigned char *p;
unsigned char *data; unsigned char *data;
struct stat sb; struct stat sb;
dns_result_t dns_result; isc_result_t isc_result;
isc_buffer_t databuf; isc_buffer_t databuf;
isc_buffer_t sigbuf; isc_buffer_t sigbuf;
isc_region_t datareg; isc_region_t datareg;
@ -627,10 +627,10 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
(void) close(fd); (void) close(fd);
/* read key from file in a form usable by dst_verify */ /* read key from file in a form usable by dst_verify */
dns_result = dst_key_fromfile(keyname, id, alg, type, mctx, &key); isc_result = dst_key_fromfile(keyname, id, alg, type, mctx, &key);
if (dns_result != DNS_R_SUCCESS) { if (isc_result != ISC_R_SUCCESS) {
t_info("dst_key_fromfile failed %s\n", t_info("dst_key_fromfile failed %s\n",
dns_result_totext(dns_result)); isc_result_totext(isc_result));
(void) free(data); (void) free(data);
++*nprobs; ++*nprobs;
return; return;
@ -650,9 +650,9 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
memset(sig, 0, sizeof(sig)); memset(sig, 0, sizeof(sig));
isc_buffer_init(&sigbuf, sig, sizeof(sig), ISC_BUFFERTYPE_BINARY); isc_buffer_init(&sigbuf, sig, sizeof(sig), ISC_BUFFERTYPE_BINARY);
dns_result = dst_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf); isc_result = dst_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf);
if (dns_result != DNS_R_SUCCESS) { if (isc_result != ISC_R_SUCCESS) {
t_info("dst_sign(%d) failed %s\n", dst_result_totext(dns_result)); t_info("dst_sign(%d) failed %s\n", dst_result_totext(isc_result));
(void) free(data); (void) free(data);
(void) dst_key_free(key); (void) dst_key_free(key);
++*nprobs; ++*nprobs;
@ -690,12 +690,12 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
if (strstr(expected_result, "!")) if (strstr(expected_result, "!"))
exp_res = 1; exp_res = 1;
dns_result = dst_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg); isc_result = dst_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
if ( ((exp_res == 0) && (dns_result != DNS_R_SUCCESS)) || if ( ((exp_res == 0) && (isc_result != ISC_R_SUCCESS)) ||
((exp_res != 0) && (dns_result == DNS_R_SUCCESS))) { ((exp_res != 0) && (isc_result == ISC_R_SUCCESS))) {
t_info("dst_verify returned %s, expected %s\n", t_info("dst_verify returned %s, expected %s\n",
dns_result_totext(dns_result), isc_result_totext(isc_result),
expected_result); expected_result);
++*nfails; ++*nfails;
} }