1999-07-12 20:08:42 +00:00
|
|
|
/*
|
|
|
|
* Portions Copyright (c) 1995-1998 by Network Associates, Inc.
|
2000-05-08 14:38:29 +00:00
|
|
|
* Portions Copyright (C) 1999, 2000 Internet Software Consortium.
|
1999-07-12 20:08:42 +00:00
|
|
|
*
|
2000-05-08 14:38:29 +00:00
|
|
|
* Permission to use, copy, modify, and distribute this software for any
|
1999-07-12 20:08:42 +00:00
|
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
|
|
* copyright notice and this permission notice appear in all copies.
|
|
|
|
*
|
2000-05-08 14:38:29 +00:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM AND
|
|
|
|
* NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
|
|
|
* SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
|
|
* FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE CONSORTIUM OR NETWORK
|
|
|
|
* ASSOCIATES 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.
|
1999-07-12 20:08:42 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Principal Author: Brian Wellington
|
2000-06-02 18:57:51 +00:00
|
|
|
* $Id: hmac_link.c,v 1.29 2000/06/02 18:57:45 bwelling Exp $
|
1999-07-12 20:08:42 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
2000-05-08 14:38:29 +00:00
|
|
|
#include <isc/mem.h>
|
|
|
|
#include <isc/string.h>
|
2000-04-28 01:12:23 +00:00
|
|
|
#include <isc/util.h>
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-05-02 03:54:17 +00:00
|
|
|
#include <dst/result.h>
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
#include "dst_internal.h"
|
|
|
|
#include "dst_parse.h"
|
|
|
|
|
2000-04-20 18:27:43 +00:00
|
|
|
#include <openssl/md5.h>
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
#define HMAC_LEN 64
|
|
|
|
#define HMAC_IPAD 0x36
|
|
|
|
#define HMAC_OPAD 0x5c
|
|
|
|
|
1999-10-29 05:25:57 +00:00
|
|
|
#define RETERR(x) do { \
|
1999-10-18 21:35:46 +00:00
|
|
|
ret = (x); \
|
|
|
|
if (ret != ISC_R_SUCCESS) \
|
|
|
|
return (ret); \
|
|
|
|
} while (0)
|
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static isc_result_t hmacmd5_fromdns(dst_key_t *key, isc_buffer_t *data);
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
typedef struct hmackey {
|
|
|
|
unsigned char ipad[64], opad[64];
|
|
|
|
} HMAC_Key;
|
|
|
|
|
2000-05-02 03:54:17 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_createctx(dst_key_t *key, dst_context_t *dctx) {
|
|
|
|
dst_context_t *md5ctx = NULL;
|
|
|
|
HMAC_Key *hkey = key->opaque;
|
|
|
|
isc_region_t r;
|
|
|
|
isc_result_t result;
|
|
|
|
|
|
|
|
result = dst_context_create(DST_KEY_MD5, dctx->mctx, &md5ctx);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
r.base = hkey->ipad;
|
|
|
|
r.length = HMAC_LEN;
|
|
|
|
result = dst_context_adddata(md5ctx, &r);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
|
|
|
dst_context_destroy(&md5ctx);
|
|
|
|
return (result);
|
|
|
|
}
|
|
|
|
dctx->opaque = md5ctx;
|
|
|
|
return (ISC_R_SUCCESS);
|
|
|
|
}
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static void
|
|
|
|
hmacmd5_destroyctx(dst_context_t *dctx) {
|
|
|
|
dst_context_t *md5ctx = dctx->opaque;
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
if (md5ctx != NULL)
|
|
|
|
dst_context_destroy(&md5ctx);
|
|
|
|
}
|
2000-05-02 03:54:17 +00:00
|
|
|
|
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_adddata(dst_context_t *dctx, const isc_region_t *data) {
|
|
|
|
dst_context_t *md5ctx = dctx->opaque;
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
return (dst_context_adddata(md5ctx, data));
|
|
|
|
}
|
2000-05-02 03:54:17 +00:00
|
|
|
|
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_sign(dst_context_t *dctx, isc_buffer_t *sig) {
|
|
|
|
dst_context_t *md5ctx = dctx->opaque;
|
|
|
|
dst_key_t *key = dctx->key;
|
|
|
|
HMAC_Key *hkey = key->opaque;
|
|
|
|
isc_region_t r;
|
|
|
|
isc_result_t result;
|
|
|
|
unsigned char digest[MD5_DIGEST_LENGTH];
|
|
|
|
isc_buffer_t b;
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_buffer_init(&b, digest, sizeof(digest));
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
result = dst_context_digest(md5ctx, &b);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
dst_context_destroy(&md5ctx);
|
|
|
|
dctx->opaque = NULL;
|
2000-05-02 03:54:17 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
result = dst_context_create(DST_KEY_MD5, dctx->mctx, &md5ctx);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
dctx->opaque = md5ctx;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
r.base = hkey->opad;
|
|
|
|
r.length = HMAC_LEN;
|
|
|
|
result = dst_context_adddata(md5ctx, &r);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
|
|
|
|
isc_buffer_usedregion(&b, &r);
|
|
|
|
result = dst_context_adddata(md5ctx, &r);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
|
|
|
|
result = dst_context_digest(md5ctx, sig);
|
|
|
|
return (result);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-03-06 20:06:01 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_verify(dst_context_t *dctx, const isc_region_t *sig) {
|
|
|
|
dst_context_t *md5ctx = dctx->opaque;
|
|
|
|
dst_key_t *key = dctx->key;
|
|
|
|
HMAC_Key *hkey = key->opaque;
|
1999-07-12 20:08:42 +00:00
|
|
|
isc_region_t r;
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_result_t result;
|
|
|
|
unsigned char digest[MD5_DIGEST_LENGTH];
|
|
|
|
isc_buffer_t b;
|
1999-10-26 19:43:25 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_buffer_init(&b, digest, sizeof(digest));
|
1999-10-26 19:43:25 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
result = dst_context_digest(md5ctx, &b);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
dst_context_destroy(&md5ctx);
|
|
|
|
dctx->opaque = NULL;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
result = dst_context_create(DST_KEY_MD5, dctx->mctx, &md5ctx);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
dctx->opaque = md5ctx;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
r.base = hkey->opad;
|
|
|
|
r.length = HMAC_LEN;
|
|
|
|
result = dst_context_adddata(md5ctx, &r);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_buffer_usedregion(&b, &r);
|
|
|
|
result = dst_context_adddata(md5ctx, &r);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_buffer_clear(&b);
|
|
|
|
result = dst_context_digest(md5ctx, &b);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
return (result);
|
|
|
|
|
|
|
|
if (memcmp(digest, sig->base, MD5_DIGEST_LENGTH) != 0)
|
|
|
|
return (DST_R_VERIFYFAILURE);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static isc_boolean_t
|
|
|
|
hmacmd5_compare(const dst_key_t *key1, const dst_key_t *key2) {
|
|
|
|
HMAC_Key *hkey1, *hkey2;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
hkey1 = (HMAC_Key *)key1->opaque;
|
|
|
|
hkey2 = (HMAC_Key *)key2->opaque;
|
1999-10-26 19:43:25 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
if (hkey1 == NULL && hkey2 == NULL)
|
|
|
|
return (ISC_TRUE);
|
|
|
|
else if (hkey1 == NULL || hkey2 == NULL)
|
|
|
|
return (ISC_FALSE);
|
1999-10-26 19:43:25 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
if (memcmp(hkey1->ipad, hkey2->ipad, HMAC_LEN) == 0)
|
|
|
|
return (ISC_TRUE);
|
|
|
|
else
|
|
|
|
return (ISC_FALSE);
|
|
|
|
}
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static isc_result_t
|
|
|
|
hmacmd5_generate(dst_key_t *key, int unused) {
|
|
|
|
isc_buffer_t b;
|
|
|
|
isc_result_t ret;
|
|
|
|
int bytes;
|
|
|
|
unsigned char data[HMAC_LEN];
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
UNUSED(unused);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
bytes = (key->key_size + 7) / 8;
|
|
|
|
if (bytes > 64) {
|
|
|
|
bytes = 64;
|
|
|
|
key->key_size = 512;
|
|
|
|
}
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
memset(data, 0, HMAC_LEN);
|
|
|
|
isc_buffer_init(&b, data, sizeof(data));
|
|
|
|
ret = dst_random_get(bytes, &b);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
return (ret);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
ret = hmacmd5_fromdns(key, &b);
|
|
|
|
memset(data, 0, HMAC_LEN);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
return (ret);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
1999-09-27 16:55:45 +00:00
|
|
|
static isc_boolean_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_isprivate(const dst_key_t *key) {
|
2000-05-02 03:54:17 +00:00
|
|
|
UNUSED(key);
|
1999-09-23 20:54:38 +00:00
|
|
|
return (ISC_TRUE);
|
|
|
|
}
|
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static void
|
|
|
|
hmacmd5_destroy(dst_key_t *key) {
|
|
|
|
HMAC_Key *hkey = key->opaque;
|
|
|
|
memset(hkey, 0, sizeof(HMAC_Key));
|
|
|
|
isc_mem_put(key->mctx, hkey, sizeof(HMAC_Key));
|
|
|
|
}
|
|
|
|
|
2000-03-06 20:06:01 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_todns(const dst_key_t *key, isc_buffer_t *data) {
|
1999-07-12 20:08:42 +00:00
|
|
|
HMAC_Key *hkey;
|
|
|
|
isc_region_t r;
|
|
|
|
unsigned int bytes, i;
|
|
|
|
|
|
|
|
REQUIRE(key->opaque != NULL);
|
|
|
|
|
|
|
|
hkey = (HMAC_Key *) key->opaque;
|
|
|
|
|
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_availableregion(data, &r);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
bytes = (key->key_size + 7) / 8;
|
|
|
|
if (r.length < bytes)
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_NOSPACE);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
for (i = 0; i < bytes; i++)
|
|
|
|
*r.base++ = hkey->ipad[i] ^ HMAC_IPAD;
|
|
|
|
|
|
|
|
isc_buffer_add(data, bytes);
|
|
|
|
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-03-06 20:06:01 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_fromdns(dst_key_t *key, isc_buffer_t *data) {
|
1999-07-12 20:08:42 +00:00
|
|
|
HMAC_Key *hkey;
|
|
|
|
isc_region_t r;
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_mem_t *mctx = key->mctx;
|
1999-07-12 20:08:42 +00:00
|
|
|
int i, keylen;
|
|
|
|
|
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(data, &r);
|
1999-07-12 20:08:42 +00:00
|
|
|
if (r.length == 0)
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
hkey = (HMAC_Key *) isc_mem_get(mctx, sizeof(HMAC_Key));
|
|
|
|
if (hkey == NULL)
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_NOMEMORY);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
memset(hkey->ipad, 0, sizeof(hkey->ipad));
|
1999-07-29 17:21:23 +00:00
|
|
|
memset(hkey->opad, 0, sizeof(hkey->opad));
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
if (r.length > HMAC_LEN) {
|
|
|
|
MD5_CTX ctx;
|
1999-10-18 21:35:46 +00:00
|
|
|
unsigned char digest[MD5_DIGEST_LENGTH];
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-04-20 01:13:21 +00:00
|
|
|
MD5_Init(&ctx);
|
|
|
|
MD5_Update(&ctx, r.base, r.length);
|
|
|
|
MD5_Final(digest, &ctx);
|
1999-10-18 21:35:46 +00:00
|
|
|
memcpy(hkey->ipad, digest, MD5_DIGEST_LENGTH);
|
|
|
|
memcpy(hkey->opad, digest, MD5_DIGEST_LENGTH);
|
|
|
|
keylen = MD5_DIGEST_LENGTH;
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
memcpy(hkey->ipad, r.base, r.length);
|
1999-07-29 17:21:23 +00:00
|
|
|
memcpy(hkey->opad, r.base, r.length);
|
1999-07-12 20:08:42 +00:00
|
|
|
keylen = r.length;
|
|
|
|
}
|
|
|
|
|
2000-05-02 03:54:17 +00:00
|
|
|
/*
|
|
|
|
* XOR key with ipad and opad values.
|
|
|
|
*/
|
1999-07-12 20:08:42 +00:00
|
|
|
for (i = 0; i < HMAC_LEN; i++) {
|
|
|
|
hkey->ipad[i] ^= HMAC_IPAD;
|
|
|
|
hkey->opad[i] ^= HMAC_OPAD;
|
|
|
|
}
|
2000-06-01 02:33:26 +00:00
|
|
|
key->key_id = dst_s_id_calc(r.base, r.length);
|
1999-07-12 20:08:42 +00:00
|
|
|
key->key_size = keylen * 8;
|
|
|
|
key->opaque = hkey;
|
|
|
|
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-03-06 20:06:01 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_tofile(const dst_key_t *key) {
|
1999-07-12 20:08:42 +00:00
|
|
|
int i, cnt = 0;
|
|
|
|
HMAC_Key *hkey;
|
|
|
|
dst_private_t priv;
|
|
|
|
unsigned char keydata[HMAC_LEN];
|
2000-03-15 18:52:23 +00:00
|
|
|
int bytes = (key->key_size + 7) / 8;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
if (key->opaque == NULL)
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_NULLKEY);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
hkey = (HMAC_Key *) key->opaque;
|
2000-03-15 18:52:23 +00:00
|
|
|
memset(keydata, 0, HMAC_LEN);
|
|
|
|
for (i = 0; i < bytes; i++)
|
1999-07-12 20:08:42 +00:00
|
|
|
keydata[i] = hkey->ipad[i] ^ HMAC_IPAD;
|
|
|
|
|
|
|
|
priv.elements[cnt].tag = TAG_HMACMD5_KEY;
|
2000-03-15 18:52:23 +00:00
|
|
|
priv.elements[cnt].length = bytes;
|
1999-07-12 20:08:42 +00:00
|
|
|
priv.elements[cnt++].data = keydata;
|
|
|
|
|
|
|
|
priv.nelements = cnt;
|
2000-05-15 21:02:39 +00:00
|
|
|
return (dst_s_write_private_key_file(key, &priv));
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-03-06 20:06:01 +00:00
|
|
|
static isc_result_t
|
2000-06-02 18:57:51 +00:00
|
|
|
hmacmd5_fromfile(dst_key_t *key, const isc_uint16_t id) {
|
1999-07-12 20:08:42 +00:00
|
|
|
dst_private_t priv;
|
2000-03-06 20:06:01 +00:00
|
|
|
isc_result_t ret;
|
1999-07-12 20:08:42 +00:00
|
|
|
isc_buffer_t b;
|
2000-06-02 18:57:51 +00:00
|
|
|
isc_mem_t *mctx = key->mctx;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
/* read private key file */
|
2000-05-15 21:30:45 +00:00
|
|
|
ret = dst_s_parse_private_key_file(key, id, &priv, mctx);
|
1999-10-20 22:14:15 +00:00
|
|
|
if (ret != ISC_R_SUCCESS)
|
1999-07-12 20:08:42 +00:00
|
|
|
return (ret);
|
|
|
|
|
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(&b, priv.elements[0].data, priv.elements[0].length);
|
2000-06-01 02:33:26 +00:00
|
|
|
isc_buffer_add(&b, priv.elements[0].length);
|
1999-07-12 20:08:42 +00:00
|
|
|
dst_s_free_private_structure_fields(&priv, mctx);
|
|
|
|
memset(&priv, 0, sizeof(priv));
|
2000-06-02 18:57:51 +00:00
|
|
|
return (hmacmd5_fromdns(key, &b));
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
static struct dst_func hmacmd5_functions = {
|
|
|
|
hmacmd5_createctx,
|
|
|
|
hmacmd5_destroyctx,
|
|
|
|
hmacmd5_adddata,
|
|
|
|
hmacmd5_sign,
|
|
|
|
hmacmd5_verify,
|
|
|
|
NULL, /* digest */
|
|
|
|
NULL, /* computesecret */
|
|
|
|
hmacmd5_compare,
|
|
|
|
NULL, /* paramcompare */
|
|
|
|
hmacmd5_generate,
|
|
|
|
hmacmd5_isprivate,
|
|
|
|
hmacmd5_destroy,
|
|
|
|
hmacmd5_todns,
|
|
|
|
hmacmd5_fromdns,
|
|
|
|
hmacmd5_tofile,
|
|
|
|
hmacmd5_fromfile,
|
|
|
|
};
|
1999-07-12 20:08:42 +00:00
|
|
|
|
2000-06-02 18:57:51 +00:00
|
|
|
void
|
|
|
|
dst_s_hmacmd5_init(struct dst_func **funcp) {
|
|
|
|
REQUIRE(funcp != NULL && *funcp == NULL);
|
|
|
|
*funcp = &hmacmd5_functions;
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|