1999-07-12 20:08:42 +00:00
|
|
|
/*
|
2000-02-03 23:08:31 +00:00
|
|
|
* Copyright (C) 1999, 2000 Internet Software Consortium.
|
1999-07-12 20:08:42 +00:00
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
|
|
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
|
|
* SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
1999-07-13 02:05:01 +00:00
|
|
|
#include <unistd.h> /* XXX */
|
|
|
|
|
2000-05-08 14:38:29 +00:00
|
|
|
#include <isc/buffer.h>
|
1999-07-12 20:08:42 +00:00
|
|
|
#include <isc/mem.h>
|
2000-05-08 19:23:32 +00:00
|
|
|
#include <isc/region.h>
|
|
|
|
#include <isc/string.h> /* Required for HP/UX (and others?) */
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-24 23:13:32 +00:00
|
|
|
#include <dns/fixedname.h>
|
|
|
|
#include <dns/name.h>
|
2000-03-18 00:42:07 +00:00
|
|
|
#include <dns/result.h>
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
#include <dst/dst.h>
|
|
|
|
#include <dst/result.h>
|
|
|
|
|
2000-06-01 19:11:07 +00:00
|
|
|
char *current;
|
|
|
|
const char *tmp = "/tmp";
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
static void
|
2000-06-02 18:59:33 +00:00
|
|
|
use(dst_key_t *key, isc_mem_t *mctx) {
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_t ret;
|
2000-06-01 19:11:07 +00:00
|
|
|
const char *data = "This is some data";
|
1999-07-12 20:08:42 +00:00
|
|
|
unsigned char sig[512];
|
|
|
|
isc_buffer_t databuf, sigbuf;
|
|
|
|
isc_region_t datareg, sigreg;
|
2000-06-02 18:59:33 +00:00
|
|
|
dst_context_t *ctx = NULL;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&sigbuf, sig, sizeof(sig));
|
2000-06-01 19:11:07 +00:00
|
|
|
/*
|
|
|
|
* Advance 1 byte for fun.
|
|
|
|
*/
|
1999-07-12 20:08:42 +00:00
|
|
|
isc_buffer_add(&sigbuf, 1);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&databuf, data, strlen(data));
|
1999-07-12 20:08:42 +00:00
|
|
|
isc_buffer_add(&databuf, strlen(data));
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_usedregion(&databuf, &datareg);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:59:33 +00:00
|
|
|
ret = dst_context_create(key, mctx, &ctx);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
printf("contextcreate(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
ret = dst_context_adddata(ctx, &datareg);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
printf("adddata(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
ret = dst_context_sign(ctx, &sigbuf);
|
1999-07-12 20:08:42 +00:00
|
|
|
printf("sign(%d) returned: %s\n", dst_key_alg(key),
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_totext(ret));
|
2000-06-02 18:59:33 +00:00
|
|
|
dst_context_destroy(&ctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
isc_buffer_forward(&sigbuf, 1);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_remainingregion(&sigbuf, &sigreg);
|
2000-06-02 18:59:33 +00:00
|
|
|
ret = dst_context_create(key, mctx, &ctx);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
printf("contextcreate(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
ret = dst_context_adddata(ctx, &datareg);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
printf("adddata(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
ret = dst_context_verify(ctx, &sigreg);
|
1999-07-12 20:08:42 +00:00
|
|
|
printf("verify(%d) returned: %s\n", dst_key_alg(key),
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_totext(ret));
|
2000-06-02 18:59:33 +00:00
|
|
|
dst_context_destroy(&ctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-04-05 22:21:17 +00:00
|
|
|
static void
|
|
|
|
dns(dst_key_t *key, isc_mem_t *mctx) {
|
|
|
|
unsigned char buffer1[2048];
|
|
|
|
unsigned char buffer2[2048];
|
|
|
|
isc_buffer_t buf1, buf2;
|
|
|
|
isc_region_t r1, r2;
|
|
|
|
dst_key_t *newkey = NULL;
|
|
|
|
isc_result_t ret;
|
|
|
|
isc_boolean_t match;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&buf1, buffer1, sizeof(buffer1));
|
2000-04-05 22:21:17 +00:00
|
|
|
ret = dst_key_todns(key, &buf1);
|
|
|
|
printf("todns(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
return;
|
|
|
|
ret = dst_key_fromdns(dst_key_name(key), &buf1, mctx, &newkey);
|
|
|
|
printf("fromdns(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
return;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&buf2, buffer2, sizeof(buffer2));
|
2000-04-05 22:21:17 +00:00
|
|
|
ret = dst_key_todns(newkey, &buf2);
|
|
|
|
printf("todns2(%d) returned: %s\n", dst_key_alg(key),
|
|
|
|
isc_result_totext(ret));
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
return;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_usedregion(&buf1, &r1);
|
|
|
|
isc_buffer_usedregion(&buf2, &r2);
|
2000-05-24 03:27:47 +00:00
|
|
|
match = ISC_TF(r1.length == r2.length &&
|
|
|
|
memcmp(r1.base, r2.base, r1.length) == 0);
|
|
|
|
printf("compare(%d): %s\n", dst_key_alg(key),
|
|
|
|
match ? "true" : "false");
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_free(&newkey);
|
2000-04-05 22:21:17 +00:00
|
|
|
}
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
static void
|
2000-05-24 23:13:32 +00:00
|
|
|
io(dns_name_t *name, int id, int alg, int type, isc_mem_t *mctx) {
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_t *key = NULL;
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_t ret;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
chdir(current);
|
|
|
|
ret = dst_key_fromfile(name, id, alg, type, mctx, &key);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-07-12 20:08:42 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
chdir(tmp);
|
|
|
|
ret = dst_key_tofile(key, type);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-07-12 20:08:42 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
2000-06-02 18:59:33 +00:00
|
|
|
use(key, mctx);
|
2000-04-05 22:21:17 +00:00
|
|
|
dns(key, mctx);
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_free(&key);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 21:26:08 +00:00
|
|
|
static void
|
2000-05-24 23:13:32 +00:00
|
|
|
dh(dns_name_t *name1, int id1, dns_name_t *name2, int id2, isc_mem_t *mctx) {
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_t *key1 = NULL, *key2 = NULL;
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_t ret;
|
1999-10-27 21:26:08 +00:00
|
|
|
isc_buffer_t b1, b2;
|
|
|
|
isc_region_t r1, r2;
|
|
|
|
unsigned char array1[1024], array2[1024];
|
|
|
|
int alg = DST_ALG_DH;
|
|
|
|
int type = DST_TYPE_PUBLIC|DST_TYPE_PRIVATE;
|
|
|
|
|
|
|
|
chdir(current);
|
|
|
|
ret = dst_key_fromfile(name1, id1, alg, type, mctx, &key1);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
ret = dst_key_fromfile(name2, id2, alg, type, mctx, &key2);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("read(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
chdir(tmp);
|
|
|
|
ret = dst_key_tofile(key1, type);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
ret = dst_key_tofile(key2, type);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("write(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&b1, array1, sizeof(array1));
|
2000-05-17 22:48:10 +00:00
|
|
|
ret = dst_key_computesecret(key1, key2, &b1);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("computesecret() returned: %s\n", isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&b2, array2, sizeof(array2));
|
2000-05-17 22:48:10 +00:00
|
|
|
ret = dst_key_computesecret(key2, key1, &b2);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("computesecret() returned: %s\n", isc_result_totext(ret));
|
1999-10-27 21:26:08 +00:00
|
|
|
if (ret != 0)
|
|
|
|
return;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_usedregion(&b1, &r1);
|
|
|
|
isc_buffer_usedregion(&b2, &r2);
|
1999-10-27 21:26:08 +00:00
|
|
|
|
|
|
|
if (r1.length != r2.length || memcmp(r1.base, r2.base, r1.length) != 0)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
printf("secrets don't match\n");
|
|
|
|
printf("secret 1: %d bytes\n", r1.length);
|
|
|
|
for (i = 0; i < (int) r1.length; i++)
|
|
|
|
printf("%02x ", r1.base[i]);
|
|
|
|
printf("\n");
|
|
|
|
printf("secret 2: %d bytes\n", r2.length);
|
|
|
|
for (i = 0; i < (int) r2.length; i++)
|
|
|
|
printf("%02x ", r2.base[i]);
|
|
|
|
printf("\n");
|
|
|
|
}
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_free(&key1);
|
|
|
|
dst_key_free(&key2);
|
1999-10-27 21:26:08 +00:00
|
|
|
}
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
static void
|
|
|
|
generate(int alg, isc_mem_t *mctx) {
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_t ret;
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_t *key = NULL;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-24 23:13:32 +00:00
|
|
|
ret = dst_key_generate(dns_rootname, alg, 512, 0, 0, 0, mctx, &key);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("generate(%d) returned: %s\n", alg, isc_result_totext(ret));
|
1999-07-12 20:08:42 +00:00
|
|
|
|
1999-10-27 21:26:08 +00:00
|
|
|
if (alg != DST_ALG_DH)
|
2000-06-02 18:59:33 +00:00
|
|
|
use(key, mctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-19 00:20:59 +00:00
|
|
|
dst_key_free(&key);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-05-24 03:27:47 +00:00
|
|
|
get_random(void) {
|
1999-07-12 20:08:42 +00:00
|
|
|
unsigned char data[25];
|
|
|
|
isc_buffer_t databuf;
|
2000-03-06 20:04:15 +00:00
|
|
|
isc_result_t ret;
|
1999-07-12 20:08:42 +00:00
|
|
|
unsigned int i;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&databuf, data, sizeof(data));
|
1999-10-20 19:08:57 +00:00
|
|
|
ret = dst_random_get(sizeof(data), &databuf);
|
2000-03-06 20:04:15 +00:00
|
|
|
printf("random() returned: %s\n", isc_result_totext(ret));
|
1999-07-12 20:08:42 +00:00
|
|
|
for (i = 0; i < sizeof data; i++)
|
|
|
|
printf("%02x ", data[i]);
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-05-24 03:27:47 +00:00
|
|
|
main(void) {
|
1999-07-12 20:08:42 +00:00
|
|
|
isc_mem_t *mctx = NULL;
|
2000-05-24 23:13:32 +00:00
|
|
|
isc_buffer_t b;
|
|
|
|
dns_fixedname_t fname;
|
|
|
|
dns_name_t *name;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
isc_mem_create(0, 0, &mctx);
|
|
|
|
|
|
|
|
current = isc_mem_get(mctx, 256);
|
|
|
|
getcwd(current, 256);
|
|
|
|
|
2000-03-06 20:04:15 +00:00
|
|
|
dns_result_register();
|
|
|
|
dst_result_register();
|
|
|
|
|
2000-05-24 23:13:32 +00:00
|
|
|
dns_fixedname_init(&fname);
|
|
|
|
name = dns_fixedname_name(&fname);
|
|
|
|
isc_buffer_init(&b, "test.", 5);
|
2000-05-25 18:00:08 +00:00
|
|
|
isc_buffer_add(&b, 5);
|
2000-05-24 23:13:32 +00:00
|
|
|
dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
|
|
|
|
io(name, 6204, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
|
|
|
io(name, 54622, DST_ALG_RSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-24 23:13:32 +00:00
|
|
|
io(name, 0, DST_ALG_DSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
|
|
|
io(name, 0, DST_ALG_RSA, DST_TYPE_PRIVATE|DST_TYPE_PUBLIC, mctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-24 23:13:32 +00:00
|
|
|
isc_buffer_init(&b, "dh.", 3);
|
2000-05-25 18:00:08 +00:00
|
|
|
isc_buffer_add(&b, 3);
|
2000-05-24 23:13:32 +00:00
|
|
|
dns_name_fromtext(name, &b, NULL, ISC_FALSE, NULL);
|
|
|
|
dh(name, 18088, name, 48443, mctx);
|
1999-10-27 21:26:08 +00:00
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
generate(DST_ALG_RSA, mctx);
|
1999-10-27 21:26:08 +00:00
|
|
|
generate(DST_ALG_DH, mctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
generate(DST_ALG_DSA, mctx);
|
1999-09-02 15:56:33 +00:00
|
|
|
generate(DST_ALG_HMACMD5, mctx);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
get_random();
|
|
|
|
|
|
|
|
isc_mem_put(mctx, current, 256);
|
|
|
|
/* isc_mem_stats(mctx, stdout);*/
|
|
|
|
isc_mem_destroy(&mctx);
|
|
|
|
|
2000-05-08 20:12:46 +00:00
|
|
|
return (0);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|