pullup:

 669.   [bug]           dnssec-keygen now makes the public key file
                        non-world-readable for symmetric keys. [RT #403]

diff --git a/CHANGES b/CHANGES
index d49db84ff526c9f4630d203e4cbf52bb9480b383..ec8a90885428e690f824689dc6b67230bdcbfe5b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
  822.  [bug]           Sending nxrrset prerequisites would crash nsupdate.
                        [RT #1248]
 
+ 669.  [bug]           dnssec-keygen now makes the public key file
+                       non-world-readable for symmetric keys. [RT #403]
+
        --- 9.1.2 released ---
 
        --- 9.1.2rc1 released ---

diff --git a/lib/dns/sec/dst/dst_internal.h b/lib/dns/sec/dst/dst_internal.h
index e1fe9c7601d6427d41aef5eea03c8cb7cbfdcf9a..d31a1ea05e639165d48cefbc9d11c12df5e9d70d 100644 (file)
--- a/lib/dns/sec/dst/dst_internal.h
+++ b/lib/dns/sec/dst/dst_internal.h
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.30.4.1 2001/01/09 22:48:19 bwelling Exp $ */
+/* $Id: dst_internal.h,v 1.30.4.2 2001/05/10 21:14:14 gson Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
@@ -81,6 +81,7 @@ struct dst_func {
                                      const dst_key_t *key2);
        isc_result_t (*generate)(dst_key_t *key, int parms);
        isc_boolean_t (*isprivate)(const dst_key_t *key);
+       isc_boolean_t (*issymmetric)(void);
        void (*destroy)(dst_key_t *key);
 
        /* conversion functions */

diff --git a/lib/dns/sec/dst/gssapi_link.c b/lib/dns/sec/dst/gssapi_link.c
index 25cf5b0e9368341a9631530a3ce0152d99fef474..cba6ecf7c1e08fa0216d95ce11d469ce7fb9d361 100644 (file)
--- a/lib/dns/sec/dst/gssapi_link.c
+++ b/lib/dns/sec/dst/gssapi_link.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: gssapi_link.c,v 1.4.4.1 2001/01/09 22:48:25 bwelling Exp $
+ * $Id: gssapi_link.c,v 1.4.4.2 2001/05/10 21:14:16 gson Exp $
  */
 
 #ifdef GSSAPI
@@ -182,6 +182,12 @@ gssapi_isprivate(const dst_key_t *key) {
         return (ISC_TRUE);
 }
 
+static isc_boolean_t
+gssapi_issymmetric(const dst_key_t *key) {
+       UNUSED(key);
+        return (ISC_TRUE);
+}
+
 static void
 gssapi_destroy(dst_key_t *key) {
        UNUSED(key);
@@ -199,6 +205,7 @@ static dst_func_t gssapi_functions = {
        NULL, /* paramcompare */
        gssapi_generate,
        gssapi_isprivate,
+       gssapi_issymetric,
        gssapi_destroy,
        NULL, /* todns */
        NULL, /* fromdns */

diff --git a/lib/dns/sec/dst/hmac_link.c b/lib/dns/sec/dst/hmac_link.c
index e0f2a06e4e2b0718d3c12546a0587a26e7e1653b..ef8b51ab0538fba9ad64f7a7c4ef6e8359734ece 100644 (file)
--- a/lib/dns/sec/dst/hmac_link.c
+++ b/lib/dns/sec/dst/hmac_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.45.4.2 2001/04/10 01:10:22 gson Exp $
+ * $Id: hmac_link.c,v 1.45.4.3 2001/05/10 21:14:17 gson Exp $
  */
 
 #include <config.h>
@@ -157,6 +157,11 @@ hmacmd5_isprivate(const dst_key_t *key) {
         return (ISC_TRUE);
 }
 
+static isc_boolean_t
+hmacmd5_issymmetric(void) {
+        return (ISC_TRUE);
+}
+
 static void
 hmacmd5_destroy(dst_key_t *key) {
        HMAC_Key *hkey = key->opaque;
@@ -267,6 +272,7 @@ static dst_func_t hmacmd5_functions = {
        NULL, /* paramcompare */
        hmacmd5_generate,
        hmacmd5_isprivate,
+       hmacmd5_issymmetric,
        hmacmd5_destroy,
        hmacmd5_todns,
        hmacmd5_fromdns,

diff --git a/lib/dns/sec/dst/openssl_link.c b/lib/dns/sec/dst/openssl_link.c
index 4290c801a768ec7beea639b421d7803d74c1fe2b..290ef08ca4b5a1ec8b52e58b9360c316eeefddc6 100644 (file)
--- a/lib/dns/sec/dst/openssl_link.c
+++ b/lib/dns/sec/dst/openssl_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.39.4.2 2001/04/10 01:10:25 gson Exp $
+ * $Id: openssl_link.c,v 1.39.4.3 2001/05/10 21:14:18 gson Exp $
  */
 #if defined(OPENSSL)
 
@@ -214,6 +214,11 @@ openssldsa_isprivate(const dst_key_t *key) {
         return (ISC_TF(dsa != NULL && dsa->priv_key != NULL));
 }
 
+static isc_boolean_t
+openssldsa_issymmetric(void) {
+        return (ISC_FALSE);
+}
+
 static void
 openssldsa_destroy(dst_key_t *key) {
        DSA *dsa = key->opaque;
@@ -427,6 +432,7 @@ static dst_func_t openssldsa_functions = {
        NULL, /* paramcompare */
        openssldsa_generate,
        openssldsa_isprivate,
+       openssldsa_issymmetric,
        openssldsa_destroy,
        openssldsa_todns,
        openssldsa_fromdns,

diff --git a/lib/dns/sec/dst/openssldh_link.c b/lib/dns/sec/dst/openssldh_link.c
index 30a4022ee7257080438ad69a47be3ca22c6d3f87..b5bbf7fbae90a2dc6304826e256c821c3e0a94d0 100644 (file)
--- a/lib/dns/sec/dst/openssldh_link.c
+++ b/lib/dns/sec/dst/openssldh_link.c
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.32.4.2 2001/04/10 01:10:23 gson Exp $
+ * $Id: openssldh_link.c,v 1.32.4.3 2001/05/10 21:14:19 gson Exp $
  */
 
 #if defined(OPENSSL)
@@ -170,6 +170,11 @@ openssldh_isprivate(const dst_key_t *key) {
         return (ISC_TF(dh != NULL && dh->priv_key != NULL));
 }
 
+static isc_boolean_t
+openssldh_issymmetric(void) {
+        return (ISC_FALSE);
+}
+
 static void
 openssldh_destroy(dst_key_t *key) {
        DH *dh = key->opaque;
@@ -519,6 +524,7 @@ static dst_func_t openssldh_functions = {
        openssldh_paramcompare,
        openssldh_generate,
        openssldh_isprivate,
+       openssldh_issymmetric,
        openssldh_destroy,
        openssldh_todns,
        openssldh_fromdns,

diff --git a/lib/dns/sec/dst/opensslrsa_link.c b/lib/dns/sec/dst/opensslrsa_link.c
index f5f1b1ac57147ae02dbe749103a250e6de48aff0..094fe902fb5ffd9532266e51c807f31f465a9e51 100644 (file)
--- a/lib/dns/sec/dst/opensslrsa_link.c
+++ b/lib/dns/sec/dst/opensslrsa_link.c
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: opensslrsa_link.c,v 1.6.4.2 2001/04/10 01:10:26 gson Exp $
+ * $Id: opensslrsa_link.c,v 1.6.4.3 2001/05/10 21:14:20 gson Exp $
  */
 #if defined(OPENSSL)
 
@@ -229,6 +229,11 @@ opensslrsa_isprivate(const dst_key_t *key) {
         return (ISC_TF(rsa != NULL && rsa->d != NULL));
 }
 
+static isc_boolean_t
+opensslrsa_issymmetric(void) {
+        return (ISC_FALSE);
+}
+
 static void
 opensslrsa_destroy(dst_key_t *key) {
        RSA *rsa = key->opaque;
@@ -483,6 +488,7 @@ static dst_func_t opensslrsa_functions = {
        NULL, /* paramcompare */
        opensslrsa_generate,
        opensslrsa_isprivate,
+       opensslrsa_issymmetric,
        opensslrsa_destroy,
        opensslrsa_todns,
        opensslrsa_fromdns,