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

bug fixes from the last commit

Browse Source
This commit is contained in:
Brian Wellington
2000-05-15 21:30:45 +00:00
parent 34b394b43e
commit c5de87b086
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/sec/dst/bsafe_link.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: bsafe_link.c,v 1.18 2000/05/15 21:02:27 bwelling Exp $ * $Id: bsafe_link.c,v 1.19 2000/05/15 21:30:39 bwelling Exp $
*/ */
#if defined(BSAFE) || defined(DNSSAFE) #if defined(BSAFE) || defined(DNSSAFE)
@@ -623,7 +623,7 @@ dst_bsafe_from_file(dst_key_t *key, const isc_uint16_t id, isc_mem_t *mctx) {
/* /*
* Read private key file. * Read private key file.
*/ */
ret = dst_s_parse_private_key_file(key, &priv, mctx); ret = dst_s_parse_private_key_file(key, id, &priv, mctx);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);
/* /*

7
lib/dns/sec/dst/dst_parse.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: dst_parse.c,v 1.14 2000/05/15 21:02:32 bwelling Exp $ * $Id: dst_parse.c,v 1.15 2000/05/15 21:30:41 bwelling Exp $
*/ */
#include <config.h> #include <config.h>
@@ -187,8 +187,8 @@ dst_s_free_private_structure_fields(dst_private_t *priv, isc_mem_t *mctx) {
} }
int int
dst_s_parse_private_key_file(const dst_key_t *key, dst_private_t *priv, dst_s_parse_private_key_file(const dst_key_t *key, const isc_uint16_t id,
isc_mem_t *mctx) dst_private_t *priv, isc_mem_t *mctx)
{ {
char filename[ISC_DIR_NAMEMAX]; char filename[ISC_DIR_NAMEMAX];
int n = 0, ret, major, minor; int n = 0, ret, major, minor;
@@ -203,6 +203,7 @@ dst_s_parse_private_key_file(const dst_key_t *key, dst_private_t *priv,
priv->nelements = 0; priv->nelements = 0;
isc_buffer_init(&b, filename, sizeof(filename)); isc_buffer_init(&b, filename, sizeof(filename));
key->key_id = id;
ret = dst_key_buildfilename(key, DST_TYPE_PRIVATE, &b); ret = dst_key_buildfilename(key, DST_TYPE_PRIVATE, &b);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);

4
lib/dns/sec/dst/dst_parse.h
View File

@@ -78,8 +78,8 @@ void
dst_s_free_private_structure_fields(dst_private_t *priv, isc_mem_t *mctx); dst_s_free_private_structure_fields(dst_private_t *priv, isc_mem_t *mctx);
int int
dst_s_parse_private_key_file(const dst_key_t *key, dst_private_t *priv, dst_s_parse_private_key_file(const dst_key_t *key, const isc_uint16_t id,
isc_mem_t *mctx); dst_private_t *priv, isc_mem_t *mctx);
int int
dst_s_write_private_key_file(const dst_key_t *key, const dst_private_t *priv); dst_s_write_private_key_file(const dst_key_t *key, const dst_private_t *priv);

4
lib/dns/sec/dst/hmac_link.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: hmac_link.c,v 1.25 2000/05/15 21:02:35 bwelling Exp $ * $Id: hmac_link.c,v 1.26 2000/05/15 21:30:43 bwelling Exp $
*/ */
#include <config.h> #include <config.h>
@@ -399,7 +399,7 @@ dst_hmacmd5_from_file(dst_key_t *key, const isc_uint16_t id, isc_mem_t *mctx) {
#define DST_RET(a) {ret = a; goto err;} #define DST_RET(a) {ret = a; goto err;}
/* read private key file */ /* read private key file */
ret = dst_s_parse_private_key_file(key, &priv, mctx); ret = dst_s_parse_private_key_file(key, id, &priv, mctx);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);

4
lib/dns/sec/dst/openssl_link.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: openssl_link.c,v 1.22 2000/05/15 21:02:36 bwelling Exp $ * $Id: openssl_link.c,v 1.23 2000/05/15 21:30:44 bwelling Exp $
*/ */
#if defined(OPENSSL) #if defined(OPENSSL)
@@ -450,7 +450,7 @@ dst_openssl_from_file(dst_key_t *key, const isc_uint16_t id, isc_mem_t *mctx) {
#define DST_RET(a) {ret = a; goto err;} #define DST_RET(a) {ret = a; goto err;}
/* read private key file */ /* read private key file */
ret = dst_s_parse_private_key_file(key, &priv, mctx); ret = dst_s_parse_private_key_file(key, id, &priv, mctx);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);

4
lib/dns/sec/dst/openssldh_link.c
View File

@@ -19,7 +19,7 @@
/* /*
* Principal Author: Brian Wellington * Principal Author: Brian Wellington
* $Id: openssldh_link.c,v 1.15 2000/05/15 21:02:37 bwelling Exp $ * $Id: openssldh_link.c,v 1.16 2000/05/15 21:30:45 bwelling Exp $
*/ */
#if defined(OPENSSL) #if defined(OPENSSL)
@@ -441,7 +441,7 @@ dst_openssldh_from_file(dst_key_t *key, const isc_uint16_t id,
#define DST_RET(a) {ret = a; goto err;} #define DST_RET(a) {ret = a; goto err;}
/* read private key file */ /* read private key file */
ret = dst_s_parse_private_key_file(key, &priv, mctx); ret = dst_s_parse_private_key_file(key, id, &priv, mctx);
if (ret != ISC_R_SUCCESS) if (ret != ISC_R_SUCCESS)
return (ret); return (ret);