mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Use isc_base64_decodestring() instead of an explicit lexer.

Browse Source
This commit is contained in:
Brian Wellington
2000-07-18 01:14:17 +00:00
parent 2b8f0e9fac
commit 9df7d74e42
2 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bin/named/tsigconf.c
View File

@@ -15,13 +15,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: tsigconf.c,v 1.8 2000/07/18 00:44:52 bwelling Exp $ */ /* $Id: tsigconf.c,v 1.9 2000/07/18 01:14:17 bwelling Exp $ */
#include <config.h> #include <config.h>
#include <isc/base64.h> #include <isc/base64.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/lex.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/string.h> #include <isc/string.h>
@@ -32,7 +31,6 @@ static isc_result_t
add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring, add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
isc_mem_t *mctx) isc_mem_t *mctx)
{ {
isc_lex_t *lex = NULL;
dns_c_kdef_t *key; dns_c_kdef_t *key;
unsigned char *secret = NULL; unsigned char *secret = NULL;
int secretalloc = 0; int secretalloc = 0;
@@ -46,7 +44,7 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
dns_name_t *alg, tempalg; dns_name_t *alg, tempalg;
char keynamedata[1024], algdata[1024]; char keynamedata[1024], algdata[1024];
isc_buffer_t keynamesrc, keynamebuf, algsrc, algbuf; isc_buffer_t keynamesrc, keynamebuf, algsrc, algbuf;
isc_buffer_t secretsrc, secretbuf; isc_buffer_t secretbuf;
dns_name_init(&keyname, NULL); dns_name_init(&keyname, NULL);
@@ -90,21 +88,11 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
ret = ISC_R_NOMEMORY; ret = ISC_R_NOMEMORY;
goto failure; goto failure;
} }
isc_buffer_init(&secretsrc, key->secret, strlen(key->secret));
isc_buffer_add(&secretsrc, strlen(key->secret));
isc_buffer_init(&secretbuf, secret, secretlen); isc_buffer_init(&secretbuf, secret, secretlen);
ret = isc_lex_create(mctx, strlen(key->secret), &lex); ret = isc_base64_decodestring(mctx, key->secret, &secretbuf);
if (ret != ISC_R_SUCCESS)
goto failure;
ret = isc_lex_openbuffer(lex, &secretsrc);
if (ret != ISC_R_SUCCESS)
goto failure;
ret = isc_base64_tobuffer(lex, &secretbuf, -1);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto failure; goto failure;
secretlen = isc_buffer_usedlength(&secretbuf); secretlen = isc_buffer_usedlength(&secretbuf);
isc_lex_close(lex);
isc_lex_destroy(&lex);
isc_stdtime_get(&now); isc_stdtime_get(&now);
ret = dns_tsigkey_create(&keyname, alg, secret, secretlen, ret = dns_tsigkey_create(&keyname, alg, secret, secretlen,
@@ -119,10 +107,8 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
failure: failure:
if (lex != NULL)
isc_lex_destroy(&lex);
if (secret != NULL) if (secret != NULL)
isc_mem_put(mctx, secret, secretlen); isc_mem_put(mctx, secret, secretalloc);
return (ret); return (ret);
} }

22
lib/dns/tsigconf.c
View File

@@ -15,13 +15,12 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: tsigconf.c,v 1.8 2000/07/18 00:44:52 bwelling Exp $ */ /* $Id: tsigconf.c,v 1.9 2000/07/18 01:14:17 bwelling Exp $ */
#include <config.h> #include <config.h>
#include <isc/base64.h> #include <isc/base64.h>
#include <isc/buffer.h> #include <isc/buffer.h>
#include <isc/lex.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/string.h> #include <isc/string.h>
@@ -32,7 +31,6 @@ static isc_result_t
add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring, add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
isc_mem_t *mctx) isc_mem_t *mctx)
{ {
isc_lex_t *lex = NULL;
dns_c_kdef_t *key; dns_c_kdef_t *key;
unsigned char *secret = NULL; unsigned char *secret = NULL;
int secretalloc = 0; int secretalloc = 0;
@@ -46,7 +44,7 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
dns_name_t *alg, tempalg; dns_name_t *alg, tempalg;
char keynamedata[1024], algdata[1024]; char keynamedata[1024], algdata[1024];
isc_buffer_t keynamesrc, keynamebuf, algsrc, algbuf; isc_buffer_t keynamesrc, keynamebuf, algsrc, algbuf;
isc_buffer_t secretsrc, secretbuf; isc_buffer_t secretbuf;
dns_name_init(&keyname, NULL); dns_name_init(&keyname, NULL);
@@ -90,21 +88,11 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
ret = ISC_R_NOMEMORY; ret = ISC_R_NOMEMORY;
goto failure; goto failure;
} }
isc_buffer_init(&secretsrc, key->secret, strlen(key->secret));
isc_buffer_add(&secretsrc, strlen(key->secret));
isc_buffer_init(&secretbuf, secret, secretlen); isc_buffer_init(&secretbuf, secret, secretlen);
ret = isc_lex_create(mctx, strlen(key->secret), &lex); ret = isc_base64_decodestring(mctx, key->secret, &secretbuf);
if (ret != ISC_R_SUCCESS)
goto failure;
ret = isc_lex_openbuffer(lex, &secretsrc);
if (ret != ISC_R_SUCCESS)
goto failure;
ret = isc_base64_tobuffer(lex, &secretbuf, -1);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
goto failure; goto failure;
secretlen = isc_buffer_usedlength(&secretbuf); secretlen = isc_buffer_usedlength(&secretbuf);
isc_lex_close(lex);
isc_lex_destroy(&lex);
isc_stdtime_get(&now); isc_stdtime_get(&now);
ret = dns_tsigkey_create(&keyname, alg, secret, secretlen, ret = dns_tsigkey_create(&keyname, alg, secret, secretlen,
@@ -119,10 +107,8 @@ add_initial_keys(dns_c_kdeflist_t *list, dns_tsig_keyring_t *ring,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
failure: failure:
if (lex != NULL)
isc_lex_destroy(&lex);
if (secret != NULL) if (secret != NULL)
isc_mem_put(mctx, secret, secretlen); isc_mem_put(mctx, secret, secretalloc);
return (ret); return (ret);
} }