When reading public key from file, also read state

The 'dst_key_fromnamedfile()' function did not read and store the
key state from the .state file when reading a public key file.

(cherry picked from commit fa05c1b8da1ee9dfe5b005a00edf8178c2e884d4)

diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index cde7bb8b45dbcd1230b23a5cfa0784c6984d5648..b5ebc0ca91143a8f3b78e5e0fe1a3a21c2b3f8dd 100644 (file)
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -569,8 +569,8 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
                      isc_mem_t *mctx, dst_key_t **keyp) {
        isc_result_t result;
        dst_key_t *pubkey = NULL, *key = NULL;
-       char *newfilename = NULL;
-       int newfilenamelen = 0;
+       char *newfilename = NULL, *statefilename = NULL;
+       int newfilenamelen = 0, statefilenamelen = 0;
        isc_lex_t *lex = NULL;
 
        REQUIRE(dst_initialized);
@@ -604,9 +604,39 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
        newfilename = NULL;
        RETERR(result);
 
+       /*
+        * Read the state file, if requested by type.
+        */
+       if ((type & DST_TYPE_STATE) != 0) {
+               statefilenamelen = strlen(filename) + 7;
+               if (dirname != NULL) {
+                       statefilenamelen += strlen(dirname) + 1;
+               }
+               statefilename = isc_mem_get(mctx, statefilenamelen);
+               result = addsuffix(statefilename, statefilenamelen, dirname,
+                                  filename, ".state");
+               INSIST(result == ISC_R_SUCCESS);
+       }
+
+       pubkey->kasp = false;
+       if ((type & DST_TYPE_STATE) != 0) {
+               result = dst_key_read_state(statefilename, mctx, &pubkey);
+               if (result == ISC_R_SUCCESS) {
+                       pubkey->kasp = true;
+               } else if (result == ISC_R_FILENOTFOUND) {
+                       /* Having no state is valid. */
+                       result = ISC_R_SUCCESS;
+               }
+               RETERR(result);
+       }
+
        if ((type & (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC)) == DST_TYPE_PUBLIC ||
            (pubkey->key_flags & DNS_KEYFLAG_TYPEMASK) == DNS_KEYTYPE_NOKEY)
        {
+               if (statefilename != NULL) {
+                       isc_mem_put(mctx, statefilename, statefilenamelen);
+               }
+
                result = computeid(pubkey);
                if (result != ISC_R_SUCCESS) {
                        dst_key_free(&pubkey);
@@ -636,32 +666,6 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
                RETERR(DST_R_UNSUPPORTEDALG);
        }
 
-       /*
-        * Read the state file, if requested by type.
-        */
-       if ((type & DST_TYPE_STATE) != 0) {
-               newfilenamelen = strlen(filename) + 7;
-               if (dirname != NULL) {
-                       newfilenamelen += strlen(dirname) + 1;
-               }
-               newfilename = isc_mem_get(mctx, newfilenamelen);
-               result = addsuffix(newfilename, newfilenamelen, dirname,
-                                  filename, ".state");
-               INSIST(result == ISC_R_SUCCESS);
-
-               key->kasp = false;
-               result = dst_key_read_state(newfilename, mctx, &key);
-               if (result == ISC_R_SUCCESS) {
-                       key->kasp = true;
-               } else if (result == ISC_R_FILENOTFOUND) {
-                       /* Having no state is valid. */
-                       result = ISC_R_SUCCESS;
-               }
-               isc_mem_put(mctx, newfilename, newfilenamelen);
-               newfilename = NULL;
-               RETERR(result);
-       }
-
        newfilenamelen = strlen(filename) + 9;
        if (dirname != NULL) {
                newfilenamelen += strlen(dirname) + 1;
@@ -678,6 +682,20 @@ dst_key_fromnamedfile(const char *filename, const char *dirname, int type,
        RETERR(key->func->parse(key, lex, pubkey));
        isc_lex_destroy(&lex);
 
+       key->kasp = false;
+       if ((type & DST_TYPE_STATE) != 0) {
+               result = dst_key_read_state(statefilename, mctx, &key);
+               if (result == ISC_R_SUCCESS) {
+                       key->kasp = true;
+               } else if (result == ISC_R_FILENOTFOUND) {
+                       /* Having no state is valid. */
+                       result = ISC_R_SUCCESS;
+               }
+               isc_mem_put(mctx, statefilename, statefilenamelen);
+               statefilename = NULL;
+       }
+       RETERR(result);
+
        RETERR(computeid(key));
 
        if (pubkey->key_id != key->key_id) {
@@ -695,6 +713,9 @@ out:
        if (newfilename != NULL) {
                isc_mem_put(mctx, newfilename, newfilenamelen);
        }
+       if (statefilename != NULL) {
+               isc_mem_put(mctx, statefilename, statefilenamelen);
+       }
        if (lex != NULL) {
                isc_lex_destroy(&lex);
        }