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

329. [func] omapi_auth_register() now takes a size_t argument for

Browse Source 
the length of a key's secret data.  Previously
			OMAPI only stored secrets up to the first NUL byte.

This change was made to cope with decoded base64 secrets, so in this
revision omapiconf.c and rndc.c also decode the secret.
This commit is contained in:
David Lawrence
2000-07-11 22:03:12 +00:00
parent 9bf765ab3a
commit ce2be9b721
5 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/omapi/auth.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: auth.c,v 1.9 2000/06/28 03:09:44 tale Exp $ */
/* $Id: auth.c,v 1.10 2000/07/11 22:03:10 tale Exp $ */
/* Principal Author: DCL */
@@ -58,6 +58,7 @@ struct auth {
unsigned int magic;
char *name;
char *secret;
size_t secretlen;
unsigned int algorithms;
ISC_LINK(auth_t) link;
@@ -133,10 +134,8 @@ auth_makekey(const char *name, unsigned int algorithm, dst_key_t **key) {
return (ISC_R_UNEXPECTED);
}
length = strlen(auth->secret);
isc_buffer_init(&secret, auth->secret, length);
isc_buffer_add(&secret, length);
isc_buffer_init(&secret, auth->secret, auth->secretlen);
isc_buffer_add(&secret, auth->secretlen);
length = strlen(auth->name);
isc_buffer_init(&srcb, auth->name, length);
@@ -171,8 +170,8 @@ auth_delete(auth_t *a) {
}
isc_result_t
omapi_auth_register(const char *name, const char *secret,
unsigned int algorithms)
omapi_auth_register(const char *name, unsigned int algorithms,
const unsigned char *secret, size_t secretlen)
{
auth_t *new = NULL;
isc_result_t result = ISC_R_SUCCESS;
@@ -199,9 +198,13 @@ omapi_auth_register(const char *name, const char *secret,
if (new->name == NULL)
result = ISC_R_NOMEMORY;
new->secret = isc_mem_strdup(omapi_mctx, secret);
new->secret = isc_mem_allocate(omapi_mctx, secretlen);
if (new->secret == NULL)
result = ISC_R_NOMEMORY;
else {
memcpy(new->secret, secret, secretlen);
new->secretlen = secretlen;
}
new->algorithms = algorithms;

6
lib/omapi/include/omapi/omapi.h
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: omapi.h,v 1.14 2000/07/10 11:22:59 tale Exp $ */
/* $Id: omapi.h,v 1.15 2000/07/11 22:03:12 tale Exp $ */
/*
* Definitions for the object management API and protocol.
@@ -94,8 +94,8 @@ struct omapi_object {
* Public functions defined in auth.c.
*/
isc_result_t
omapi_auth_register(const char *name, const char *secret,
unsigned int algorithms);
omapi_auth_register(const char *name, unsigned int algorithms,
const unsigned char *secret, size_t secretlen);
void
omapi_auth_deregister(const char *name);