ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

dst function name cleanup

Browse Source
This commit is contained in:
Brian Wellington
2000-05-17 22:48:10 +00:00
parent 02fdafbf53
commit 81ab85fd39
12 changed files with 176 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tests/dst/dst_test.c
View File

@@ -49,13 +49,13 @@ use(dst_key_t *key) {
isc_buffer_add(&databuf, strlen(data));
isc_buffer_usedregion(&databuf, &datareg);
ret = dst_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf);
ret = dst_key_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf);
printf("sign(%d) returned: %s\n", dst_key_alg(key),
isc_result_totext(ret));
isc_buffer_forward(&sigbuf, 1);
isc_buffer_remainingregion(&sigbuf, &sigreg);
ret = dst_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
ret = dst_key_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
printf("verify(%d) returned: %s\n", dst_key_alg(key),
isc_result_totext(ret));
}
@@ -146,13 +146,13 @@ dh(char *name1, int id1, char *name2, int id2, isc_mem_t *mctx) {
return;
isc_buffer_init(&b1, array1, sizeof(array1));
ret = dst_computesecret(key1, key2, &b1);
ret = dst_key_computesecret(key1, key2, &b1);
printf("computesecret() returned: %s\n", isc_result_totext(ret));
if (ret != 0)
return;
isc_buffer_init(&b2, array2, sizeof(array2));
ret = dst_computesecret(key2, key1, &b2);
ret = dst_key_computesecret(key2, key1, &b2);
printf("computesecret() returned: %s\n", isc_result_totext(ret));
if (ret != 0)
return;

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

@@ -88,7 +88,7 @@ use(dst_key_t *key, isc_result_t exp_result, int *nfails) {
isc_buffer_add(&databuf, strlen(data));
isc_buffer_usedregion(&databuf, &datareg);
ret = dst_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf);
ret = dst_key_sign(DST_SIGMODE_ALL, key, NULL, &datareg, &sigbuf);
if (ret != exp_result) {
t_info("dst_sign(%d) returned (%s) expected (%s)\n",
dst_key_alg(key), dst_result_totext(ret),
@@ -99,7 +99,7 @@ use(dst_key_t *key, isc_result_t exp_result, int *nfails) {
isc_buffer_remainingregion(&sigbuf, &sigreg);
ret = dst_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
ret = dst_key_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
if (ret != exp_result) {
t_info("dst_verify(%d) returned (%s) expected (%s)\n",
dst_key_alg(key), dst_result_totext(ret),
@@ -197,7 +197,7 @@ dh(char *name1, int id1, char *name2, int id2, isc_mem_t *mctx,
cleandir(tmp);
isc_buffer_init(&b1, array1, sizeof(array1));
ret = dst_computesecret(key1, key2, &b1);
ret = dst_key_computesecret(key1, key2, &b1);
if (ret != 0) {
t_info("dst_computesecret() returned: %s\n",
dst_result_totext(ret));
@@ -206,7 +206,7 @@ dh(char *name1, int id1, char *name2, int id2, isc_mem_t *mctx,
}
isc_buffer_init(&b2, array2, sizeof(array2));
ret = dst_computesecret(key2, key1, &b2);
ret = dst_key_computesecret(key2, key1, &b2);
if (ret != 0) {
t_info("dst_computesecret() returned: %s\n",
dst_result_totext(ret));
@@ -702,7 +702,8 @@ t2_sigchk(char *datapath, char *sigpath, char *keyname,
if (strstr(expected_result, "!"))
exp_res = 1;
isc_result = dst_verify(DST_SIGMODE_ALL, key, NULL, &datareg, &sigreg);
isc_result = dst_key_verify(DST_SIGMODE_ALL, key, NULL, &datareg,
&sigreg);
if ( ((exp_res == 0) && (isc_result != ISC_R_SUCCESS)) ||
((exp_res != 0) && (isc_result == ISC_R_SUCCESS))) {