1999-07-12 20:08:42 +00:00
|
|
|
/*
|
|
|
|
* Portions Copyright (c) 1995-1999 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-05-08 14:38:29 +00:00
|
|
|
* $Id: dst_parse.c,v 1.12 2000/05/08 14:37:03 tale Exp $
|
1999-07-12 20:08:42 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <isc/base64.h>
|
1999-10-08 22:25:14 +00:00
|
|
|
#include <isc/dir.h>
|
1999-07-12 20:08:42 +00:00
|
|
|
#include <isc/lex.h>
|
|
|
|
#include <isc/mem.h>
|
2000-05-08 14:38:29 +00:00
|
|
|
#include <isc/string.h>
|
2000-04-28 01:12:23 +00:00
|
|
|
#include <isc/util.h>
|
|
|
|
|
1999-10-08 22:25:14 +00:00
|
|
|
/* XXXBEW For chmod. This should be removed. */
|
1999-07-12 20:08:42 +00:00
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#include "dst_internal.h"
|
|
|
|
#include "dst_parse.h"
|
|
|
|
#include "dst/result.h"
|
|
|
|
|
|
|
|
|
|
|
|
#define PRIVATE_KEY_STR "Private-key-format:"
|
|
|
|
#define ALGORITHM_STR "Algorithm:"
|
|
|
|
#define RSA_STR "RSA"
|
1999-09-27 16:55:45 +00:00
|
|
|
#define DH_STR "DH"
|
1999-07-12 20:08:42 +00:00
|
|
|
#define DSA_STR "DSA"
|
1999-09-02 15:56:33 +00:00
|
|
|
#define HMACMD5_STR "HMAC_MD5"
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
struct parse_map {
|
|
|
|
int value;
|
|
|
|
char *tag;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct parse_map map[] = {
|
|
|
|
{TAG_RSA_MODULUS, "Modulus:"},
|
|
|
|
{TAG_RSA_PUBLICEXPONENT, "PublicExponent:"},
|
|
|
|
{TAG_RSA_PRIVATEEXPONENT, "PrivateExponent:"},
|
|
|
|
{TAG_RSA_PRIME1, "Prime1:"},
|
|
|
|
{TAG_RSA_PRIME2, "Prime2:"},
|
|
|
|
{TAG_RSA_EXPONENT1, "Exponent1:"},
|
|
|
|
{TAG_RSA_EXPONENT2, "Exponent2:"},
|
|
|
|
{TAG_RSA_COEFFICIENT, "Coefficient:"},
|
|
|
|
|
1999-09-27 16:55:45 +00:00
|
|
|
{TAG_DH_PRIME, "Prime(p):"},
|
|
|
|
{TAG_DH_GENERATOR, "Generator(g):"},
|
|
|
|
{TAG_DH_PRIVATE, "Private_value(x):"},
|
|
|
|
{TAG_DH_PUBLIC, "Public_value(y):"},
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
{TAG_DSA_PRIME, "Prime(p):"},
|
|
|
|
{TAG_DSA_SUBPRIME, "Subprime(q):"},
|
|
|
|
{TAG_DSA_BASE, "Base(g):"},
|
|
|
|
{TAG_DSA_PRIVATE, "Private_value(x):"},
|
|
|
|
{TAG_DSA_PUBLIC, "Public_value(y):"},
|
|
|
|
|
|
|
|
{TAG_HMACMD5_KEY, "Key:"},
|
|
|
|
{0, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
1999-09-30 17:41:36 +00:00
|
|
|
find_value(const char *s, const int alg) {
|
1999-07-12 20:08:42 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; ; i++) {
|
|
|
|
if (map[i].tag == NULL)
|
|
|
|
return (-1);
|
1999-09-30 17:41:36 +00:00
|
|
|
else if (strcasecmp(s, map[i].tag) == 0 &&
|
|
|
|
TAG_ALG(map[i].value) == alg)
|
1999-07-12 20:08:42 +00:00
|
|
|
return (map[i].value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
|
|
|
find_tag(const int value) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; ; i++) {
|
|
|
|
if (map[i].tag == NULL)
|
|
|
|
return (NULL);
|
|
|
|
else if (value == map[i].value)
|
|
|
|
return (map[i].tag);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_rsa(const dst_private_t *priv) {
|
|
|
|
int i, j;
|
|
|
|
if (priv->nelements != RSA_NTAGS)
|
|
|
|
return (-1);
|
|
|
|
for (i = 0; i < RSA_NTAGS; i++) {
|
|
|
|
for (j = 0; j < priv->nelements; j++)
|
|
|
|
if (priv->elements[j].tag == TAG(DST_ALG_RSA, i))
|
|
|
|
break;
|
|
|
|
if (j == priv->nelements)
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1999-09-27 16:55:45 +00:00
|
|
|
static int
|
|
|
|
check_dh(const dst_private_t *priv) {
|
|
|
|
int i, j;
|
|
|
|
if (priv->nelements != DH_NTAGS)
|
|
|
|
return (-1);
|
|
|
|
for (i = 0; i < DH_NTAGS; i++) {
|
|
|
|
for (j = 0; j < priv->nelements; j++)
|
|
|
|
if (priv->elements[j].tag == TAG(DST_ALG_DH, i))
|
|
|
|
break;
|
|
|
|
if (j == priv->nelements)
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
1999-07-12 20:08:42 +00:00
|
|
|
static int
|
|
|
|
check_dsa(const dst_private_t *priv) {
|
|
|
|
int i, j;
|
|
|
|
if (priv->nelements != DSA_NTAGS)
|
|
|
|
return (-1);
|
|
|
|
for (i = 0; i < DSA_NTAGS; i++) {
|
|
|
|
for (j = 0; j < priv->nelements; j++)
|
|
|
|
if (priv->elements[j].tag == TAG(DST_ALG_DSA, i))
|
|
|
|
break;
|
|
|
|
if (j == priv->nelements)
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_hmac_md5(const dst_private_t *priv) {
|
|
|
|
if (priv->nelements != HMACMD5_NTAGS)
|
|
|
|
return (-1);
|
|
|
|
if (priv->elements[0].tag != TAG_HMACMD5_KEY)
|
|
|
|
return (-1);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_data(const dst_private_t *priv, const int alg) {
|
|
|
|
switch (alg) {
|
|
|
|
case DST_ALG_RSA:
|
|
|
|
return (check_rsa(priv));
|
1999-09-27 16:55:45 +00:00
|
|
|
case DST_ALG_DH:
|
|
|
|
return (check_dh(priv));
|
1999-07-12 20:08:42 +00:00
|
|
|
case DST_ALG_DSA:
|
|
|
|
return (check_dsa(priv));
|
1999-09-02 15:56:33 +00:00
|
|
|
case DST_ALG_HMACMD5:
|
1999-07-12 20:08:42 +00:00
|
|
|
return (check_hmac_md5(priv));
|
|
|
|
default:
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_UNSUPPORTEDALG);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
dst_s_free_private_structure_fields(dst_private_t *priv, isc_mem_t *mctx) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (priv == NULL)
|
|
|
|
return;
|
|
|
|
for (i = 0; i < priv->nelements; i++) {
|
|
|
|
if (priv->elements[i].data == NULL)
|
|
|
|
continue;
|
|
|
|
memset(priv->elements[i].data, 0, MAXFIELDSIZE);
|
|
|
|
isc_mem_put(mctx, priv->elements[i].data, MAXFIELDSIZE);
|
|
|
|
}
|
|
|
|
priv->nelements = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
1999-10-05 15:04:27 +00:00
|
|
|
dst_s_parse_private_key_file(const char *name, const int alg,
|
|
|
|
const isc_uint16_t id, dst_private_t *priv,
|
|
|
|
isc_mem_t *mctx)
|
1999-07-12 20:08:42 +00:00
|
|
|
{
|
1999-10-08 22:25:14 +00:00
|
|
|
char filename[ISC_DIR_NAMEMAX];
|
1999-07-12 20:08:42 +00:00
|
|
|
int n = 0, ret, major, minor;
|
|
|
|
isc_buffer_t b;
|
|
|
|
isc_lex_t *lex = NULL;
|
|
|
|
isc_token_t token;
|
|
|
|
unsigned int opt = ISC_LEXOPT_EOL;
|
|
|
|
isc_result_t iret;
|
1999-09-01 18:56:19 +00:00
|
|
|
isc_result_t error = DST_R_INVALIDPRIVATEKEY;
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
REQUIRE(priv != NULL);
|
|
|
|
|
|
|
|
priv->nelements = 0;
|
|
|
|
|
|
|
|
ret = dst_s_build_filename(filename, name, id, alg, PRIVATE_KEY,
|
1999-10-08 22:25:14 +00:00
|
|
|
sizeof(filename));
|
1999-07-12 20:08:42 +00:00
|
|
|
if (ret < 0)
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_NAMETOOLONG);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
1999-08-20 17:03:30 +00:00
|
|
|
iret = isc_lex_create(mctx, 1024, &lex);
|
1999-07-12 20:08:42 +00:00
|
|
|
if (iret != ISC_R_SUCCESS)
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_NOMEMORY);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
iret = isc_lex_openfile(lex, filename);
|
|
|
|
if (iret != ISC_R_SUCCESS)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
#define NEXTTOKEN(lex, opt, token) \
|
|
|
|
{ \
|
|
|
|
iret = isc_lex_gettoken(lex, opt, token); \
|
|
|
|
if (iret != ISC_R_SUCCESS) \
|
|
|
|
goto fail; \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define READLINE(lex, opt, token) \
|
|
|
|
do { \
|
|
|
|
NEXTTOKEN(lex, opt, token) \
|
|
|
|
} while ((*token).type != isc_tokentype_eol) \
|
|
|
|
|
|
|
|
/* Read the description line */
|
|
|
|
NEXTTOKEN(lex, opt, &token);
|
|
|
|
if (token.type != isc_tokentype_string ||
|
|
|
|
strcmp(token.value.as_pointer, PRIVATE_KEY_STR) != 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
NEXTTOKEN(lex, opt, &token);
|
|
|
|
if (token.type != isc_tokentype_string ||
|
|
|
|
((char *)token.value.as_pointer)[0] != 'v')
|
|
|
|
goto fail;
|
|
|
|
if (sscanf(token.value.as_pointer, "v%d.%d", &major, &minor) != 2)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (major > MAJOR_VERSION ||
|
|
|
|
(major == MAJOR_VERSION && minor > MINOR_VERSION))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
READLINE(lex, opt, &token);
|
|
|
|
|
|
|
|
/* Read the algorithm line */
|
|
|
|
NEXTTOKEN(lex, opt, &token);
|
|
|
|
if (token.type != isc_tokentype_string ||
|
|
|
|
strcmp(token.value.as_pointer, ALGORITHM_STR) != 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
NEXTTOKEN(lex, opt | ISC_LEXOPT_NUMBER, &token);
|
|
|
|
if (token.type != isc_tokentype_number ||
|
|
|
|
token.value.as_ulong != (unsigned long) alg)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
READLINE(lex, opt, &token);
|
|
|
|
|
|
|
|
/* Read the key data */
|
|
|
|
for (n = 0; n < MAXFIELDS; n++) {
|
|
|
|
int tag;
|
|
|
|
unsigned char *data;
|
|
|
|
isc_region_t r;
|
|
|
|
|
|
|
|
iret = isc_lex_gettoken(lex, opt, &token);
|
|
|
|
if (iret == ISC_R_EOF)
|
|
|
|
break;
|
|
|
|
if (iret != ISC_R_SUCCESS)
|
|
|
|
goto fail;
|
|
|
|
if (token.type != isc_tokentype_string)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
memset(&priv->elements[n], 0, sizeof(dst_private_element_t));
|
1999-09-30 17:41:36 +00:00
|
|
|
tag = find_value(token.value.as_pointer, alg);
|
1999-07-12 20:08:42 +00:00
|
|
|
if (tag < 0 || TAG_ALG(tag) != alg)
|
|
|
|
goto fail;
|
|
|
|
priv->elements[n].tag = tag;
|
|
|
|
|
|
|
|
data = (unsigned char *) isc_mem_get(mctx, MAXFIELDSIZE);
|
|
|
|
if (data == NULL) {
|
1999-09-01 18:56:19 +00:00
|
|
|
error = DST_R_INVALIDPRIVATEKEY;
|
1999-07-12 20:08:42 +00:00
|
|
|
goto fail;
|
|
|
|
}
|
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, data, MAXFIELDSIZE);
|
1999-07-12 20:08:42 +00:00
|
|
|
ret = isc_base64_tobuffer(lex, &b, -1);
|
|
|
|
if (ret != ISC_R_SUCCESS)
|
|
|
|
goto fail;
|
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(&b, &r);
|
1999-07-12 20:08:42 +00:00
|
|
|
priv->elements[n].length = r.length;
|
|
|
|
priv->elements[n].data = r.base;
|
|
|
|
|
|
|
|
READLINE(lex, opt, &token);
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->nelements = n;
|
|
|
|
|
|
|
|
if (check_data(priv, alg) < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
isc_lex_close(lex);
|
|
|
|
isc_lex_destroy(&lex);
|
|
|
|
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
fail:
|
|
|
|
if (lex != NULL) {
|
|
|
|
isc_lex_close(lex);
|
|
|
|
isc_lex_destroy(&lex);
|
|
|
|
}
|
|
|
|
|
|
|
|
priv->nelements = n;
|
|
|
|
dst_s_free_private_structure_fields(priv, mctx);
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_INVALIDPRIVATEKEY);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
1999-10-05 15:04:27 +00:00
|
|
|
dst_s_write_private_key_file(const char *name, const int alg,
|
|
|
|
const isc_uint16_t id, const dst_private_t *priv)
|
1999-07-12 20:08:42 +00:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
int ret, i;
|
|
|
|
isc_result_t iret;
|
1999-10-08 22:25:14 +00:00
|
|
|
char filename[ISC_DIR_NAMEMAX];
|
1999-07-12 20:08:42 +00:00
|
|
|
char buffer[MAXFIELDSIZE * 2];
|
|
|
|
|
|
|
|
REQUIRE(priv != NULL);
|
|
|
|
|
|
|
|
if (check_data(priv, alg) < 0)
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_INVALIDPRIVATEKEY);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
ret = dst_s_build_filename(filename, name, id, alg, PRIVATE_KEY,
|
1999-10-08 22:25:14 +00:00
|
|
|
sizeof(filename));
|
1999-07-12 20:08:42 +00:00
|
|
|
if (ret < 0)
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_NAMETOOLONG);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
if ((fp = fopen(filename, "w")) == NULL)
|
1999-09-01 18:56:19 +00:00
|
|
|
return (DST_R_WRITEERROR);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
1999-10-08 22:25:14 +00:00
|
|
|
/* XXXBEW This won't exist on non-unix systems. Hmmm.... */
|
1999-07-12 20:08:42 +00:00
|
|
|
chmod(filename, 0600);
|
|
|
|
|
|
|
|
fprintf(fp, "%s v%d.%d\n", PRIVATE_KEY_STR, MAJOR_VERSION,
|
|
|
|
MINOR_VERSION);
|
|
|
|
|
|
|
|
fprintf(fp, "%s %d ", ALGORITHM_STR, alg);
|
|
|
|
switch (alg) {
|
|
|
|
case DST_ALG_RSA: fprintf(fp, "(RSA)\n"); break;
|
1999-09-27 16:55:45 +00:00
|
|
|
case DST_ALG_DH: fprintf(fp, "(DH)\n"); break;
|
1999-07-12 20:08:42 +00:00
|
|
|
case DST_ALG_DSA: fprintf(fp, "(DSA)\n"); break;
|
1999-09-02 15:56:33 +00:00
|
|
|
case DST_ALG_HMACMD5: fprintf(fp, "(HMAC_MD5)\n"); break;
|
1999-07-12 20:08:42 +00:00
|
|
|
default : fprintf(fp, "(?)\n"); break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < priv->nelements; i++) {
|
|
|
|
isc_buffer_t b;
|
|
|
|
isc_region_t r;
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
s = find_tag(priv->elements[i].tag);
|
|
|
|
|
|
|
|
r.base = priv->elements[i].data;
|
|
|
|
r.length = priv->elements[i].length;
|
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, buffer, sizeof(buffer));
|
1999-07-12 20:08:42 +00:00
|
|
|
iret = isc_base64_totext(&r, sizeof(buffer), "", &b);
|
|
|
|
if (iret != ISC_R_SUCCESS) {
|
|
|
|
fclose(fp);
|
1999-10-20 22:14:15 +00:00
|
|
|
return (DST_R_INVALIDPRIVATEKEY);
|
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_usedregion(&b, &r);
|
1999-07-12 20:08:42 +00:00
|
|
|
|
|
|
|
fprintf(fp, "%s ", s);
|
|
|
|
fwrite(r.base, 1, r.length, fp);
|
|
|
|
fprintf(fp, "\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(fp);
|
1999-10-20 22:14:15 +00:00
|
|
|
return (ISC_R_SUCCESS);
|
1999-07-12 20:08:42 +00:00
|
|
|
}
|