Create a key directory in /tmp

Access to the source tree is not available with oss_fuzz.  Have
fuzz/dns_message_checksig build and populate a key directory for
the fuzzer to use.  This contains a key pair and a zone file which
has the public key from the key pair.  Clean it up on shutdown.

(cherry picked from commit 033057ba9d49081f609013a1fe57360825ce7109)

diff --git a/fuzz/dns_message_checksig.c b/fuzz/dns_message_checksig.c
index af01b9ad57734046146b9fb459607b01b720e9ef..a5da831e5e9781ff8ee5b1fc9de1b2b1ffd54669 100644 (file)
--- a/fuzz/dns_message_checksig.c
+++ b/fuzz/dns_message_checksig.c
@@ -14,6 +14,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include <isc/buffer.h>
 #include <isc/commandline.h>
@@ -89,9 +90,44 @@ static dns_view_t *view = NULL;
 static dns_tsigkey_t *tsigkey = NULL;
 static dns_tsig_keyring_t *ring = NULL;
 static dns_tsig_keyring_t *emptyring = NULL;
+static char *wd = NULL;
+static char template[] = "/tmp/dns-message-checksig-XXXXXX";
+
+static char f1[] = "Ksig0key.+008+55921.key";
+static char c1[] = "sig0key. IN KEY 512 3 8 "
+                  "AwEAAa22lgHi1vAbQvu5ETdTrm2H8rwga9tvyMa6LFiSDyevLvSv0Uo5 "
+                  "uvfrXnxaLdtBMts6e1Ly2piSH9JRbOGMNibOK4EXWhWAn8MII4SWgQAs "
+                  "bFwtiz4HyPn2wScrUQdo8DocKiQJBanesr7vDO8fdA6Rg1e0yAtSeNti "
+                  "e8avx46/HJa6CFs3CoE0sf6oOFSxM954AgCBTXOGNBt1Nt3Bhfqt2qyA "
+                  "TLFii5K1jLDTZDVkoiyDXL1M7wcTwKf9METgj1eQmH3GGlRM/OJ/j8xk "
+                  "ZiFGbL3cipWdiH48031jiV2hlc92mKn8Ya0d9AN6c44piza/JSFydZXw "
+                  "sY32nxzjDbs=\n";
+
+static char f2[] = "Ksig0key.+008+55921.private";
+static char c2[] = "Private-key-format: v1.3\n\
+Algorithm: 8 (RSASHA256)\n\
+Modulus: rbaWAeLW8BtC+7kRN1OubYfyvCBr22/IxrosWJIPJ68u9K/RSjm69+tefFot20Ey2zp7UvLamJIf0lFs4Yw2Js4rgRdaFYCfwwgjhJaBACxsXC2LPgfI+fbBJytRB2jwOhwqJAkFqd6yvu8M7x90DpGDV7TIC1J422J7xq/Hjr8clroIWzcKgTSx/qg4VLEz3ngCAIFNc4Y0G3U23cGF+q3arIBMsWKLkrWMsNNkNWSiLINcvUzvBxPAp/0wROCPV5CYfcYaVEz84n+PzGRmIUZsvdyKlZ2IfjzTfWOJXaGVz3aYqfxhrR30A3pzjimLNr8lIXJ1lfCxjfafHOMNuw==\n\
+PublicExponent: AQAB\n\
+PrivateExponent: GDfclFkR5ToFGH9rMTRMnP73Q5dzjLgkx4vyHcuzKtxcvAans4+hNj+NazckAy2E+mpzV2j95TJ4wZjSM2RvB5xLwBIc4Dg6oyAHL6Ikoae6gw64cHFOaYb808n8CyqWqfX+QWAz9sRSVZXnTuPViX3A+svR7ejVak9Bzr1NTDm0DFlrhaKVCYA++dKVZerfuNiXT/jQvrc4wMCa7WWsfLsFO8aTNkEhqUnmS9c5VYgr7MkCV4ENDBcISpQc9wElI0hl12QPaSj8iSdk9liYp+HTiOxOyp6BGGuecKAoQijMwrZy4qExdOxvowptll8+nZLtwGRn/un/xvIZY5OLAQ==\n\
+Prime1: ww3C6jwnrLQik/zxSgC0KuqgHq68cCjiRjwK2/euzs7NkMevFpXvV0cWO8x1/wKC1mszVLsUaKTvH6fzRsXfz5MPihzNzUYFwvobKVLserSxEwHNk+FKUU+q07Kf8WWnCqX5nX9QzVG1q4J8Q44N49I5S480jHLGYbyLZrEYMQE=\n\
+Prime2: 4/3Ozq/8vRgcO4bieFs4CbZR7C98HiTi65SiLBIKY09mDfCleZI0uurAYBluZJgHS5AC5cdyHFuJr3uKxvD+Mgdlru40U6cSCEdK7HAhyUGZUndWl28wyMEB6Kke1/owxVn0S4RKLPOgFI2668H6JObaqXf0wyY89RdVQP6VQrs=\n\
+Exponent1: Tbr9MyVX1j5PDVSev5P6OKQZvUB7PeM9ESo6VaCl3CqTxx+cic6ke86LcLcxSrewdkxwP1LydiVMWfwvOcP/RhRf+/Uwmp5OC35qNpSiQuAhNObiCw2b9T1fYU/s52FQKTEtgXNMOxZV5IxyguVoaaLMTG08TsAqiKZ/kyP99QE=\n\
+Exponent2: Q4qSNKrwLbixzHS2LL+hR0dK17RtiaSV0QKUVIf3qdoAusp6yxwkIOegnBeMm6JqLtl38kh2pq37iRAJWcxVEc8dMYiB2fJZpjgwmwDREYUsfcC611vqUN7UyO8pIwSMZDq045ZKPyzhVJV0NZmemEYHq0LNMO7oCheiewGwiDc=\n\
+Coefficient: T2u/J4NgyO+OqoLpXBIpTBzqrvDk8tb0feYgsp5d16hHvbXxNkMUR8cI07RdbI9HnEldtmhAnbQ6SvFiy2YYjpw/1Fz2WwdxRqLaDV7UlhrT+CqltvU9d/N/xThBNKDa23Wf5Vat+HRiLHSgzsY1PseVCWN+g4azuK2D8+DLeHE=\n\
+Created: 20220311073606\n\
+Publish: 20220311073606\n\
+Activate: 20220311073606\n";
+
+static char f3[] = "sig0key.db";
+static char c3[] = "sig0key. 0 IN SOA . . 0 0 0 0 0\n\
+sig0key. 0 IN NS .\n\
+sig0key. 0 IN KEY 512 3 8 AwEAAa22lgHi1vAbQvu5ETdTrm2H8rwga9tvyMa6LFiSDyevLvSv0Uo5 uvfrXnxaLdtBMts6e1Ly2piSH9JRbOGMNibOK4EXWhWAn8MII4SWgQAs bFwtiz4HyPn2wScrUQdo8DocKiQJBanesr7vDO8fdA6Rg1e0yAtSeNti e8avx46/HJa6CFs3CoE0sf6oOFSxM954AgCBTXOGNBt1Nt3Bhfqt2qyA TLFii5K1jLDTZDVkoiyDXL1M7wcTwKf9METgj1eQmH3GGlRM/OJ/j8xk ZiFGbL3cipWdiH48031jiV2hlc92mKn8Ya0d9AN6c44piza/JSFydZXw sY32nxzjDbs=\n";
 
 static void
 cleanup(void) {
+       char pathbuf[PATH_MAX];
+       char *pwd = getcwd(pathbuf, sizeof(pathbuf));
+
        if (view != NULL) {
                dns_view_detach(&view);
        }
@@ -107,6 +143,33 @@ cleanup(void) {
        if (mctx != NULL) {
                isc_mem_detach(&mctx);
        }
+       if (wd != NULL && chdir(wd) == 0) {
+               if (remove(f1) != 0) {
+                       fprintf(stderr, "remove(%s) failed\n", f1);
+               }
+               if (remove(f2) != 0) {
+                       fprintf(stderr, "remove(%s) failed\n", f2);
+               }
+               if (remove(f3) != 0) {
+                       fprintf(stderr, "remove(%s) failed\n", f3);
+               }
+               /*
+                * Restore working directory if possible before cleaning
+                * up the key directory.  This will help with any other
+                * cleanup routines and if this code is ever run under
+                * Windows as the directory should not be in use when
+                * rmdir() is called.
+                */
+               if (pwd != NULL && chdir(pwd) != 0) {
+                       fprintf(stderr, "can't restore working directory: %s\n",
+                               pwd);
+               }
+               if (rmdir(wd) != 0) {
+                       fprintf(stderr, "rmdir(%s) failed\n", wd);
+               }
+       } else {
+               fprintf(stderr, "cleanup of %s failed\n", wd ? wd : "(null)");
+       }
 }
 
 int
@@ -120,33 +183,77 @@ LLVMFuzzerInitialize(int *argc __attribute__((unused)),
                                     0xff, 0xff, 0xff, 0xff };
        dns_zone_t *zone = NULL;
        char pathbuf[PATH_MAX];
+       FILE *fd;
 
        atexit(cleanup);
 
+       wd = mkdtemp(template);
+       if (wd == NULL) {
+               fprintf(stderr, "mkdtemp failed\n");
+               return (1);
+       }
+
+       snprintf(pathbuf, sizeof(pathbuf), "%s/%s", wd, f1);
+       fd = fopen(pathbuf, "w");
+       if (fd == NULL) {
+               fprintf(stderr, "fopen(%s) failed\n", pathbuf);
+               return (1);
+       }
+       fputs(c1, fd);
+       fclose(fd);
+
+       snprintf(pathbuf, sizeof(pathbuf), "%s/%s", wd, f2);
+       fd = fopen(pathbuf, "w");
+       if (fd == NULL) {
+               fprintf(stderr, "fopen(%s) failed\n", pathbuf);
+               return (1);
+       }
+       fputs(c2, fd);
+       fclose(fd);
+
+       snprintf(pathbuf, sizeof(pathbuf), "%s/%s", wd, f3);
+       fd = fopen(pathbuf, "w");
+       if (fd == NULL) {
+               fprintf(stderr, "fopen(%s) failed\n", pathbuf);
+               return (1);
+       }
+       fputs(c3, fd);
+       fclose(fd);
+
        isc_mem_create(&mctx);
 
        result = dst_lib_init(mctx, NULL);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dst_lib_init failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_view_create(mctx, dns_rdataclass_in, "view", &view);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_view_create failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_tsigkeyring_create(mctx, &ring);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_tsigkeyring_create failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_tsigkeyring_create(mctx, &emptyring);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_tsigkeyring_create failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_name_fromstring(name, "tsig-key", 0, NULL);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_name_fromstring failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
@@ -154,49 +261,61 @@ LLVMFuzzerInitialize(int *argc __attribute__((unused)),
                                    sizeof(secret), false, NULL, 0, 0, mctx,
                                    ring, &tsigkey);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_tsigkey_create failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_name_fromstring(name, "sig0key", 0, NULL);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_name_fromstring failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_zone_create(&zone, mctx);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_zone_create failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_zone_setorigin(zone, name);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_zone_setorigin failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        dns_zone_setclass(zone, view->rdclass);
        dns_zone_settype(zone, dns_zone_primary);
 
-       snprintf(pathbuf, sizeof(pathbuf), FUZZDIR "/%s",
-                "dns_message_checksig.data");
-       result = dns_zone_setkeydirectory(zone, pathbuf);
+       result = dns_zone_setkeydirectory(zone, wd);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_zone_setkeydirectory failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
-       snprintf(pathbuf, sizeof(pathbuf), FUZZDIR "/%s",
-                "dns_message_checksig.data/sig0key.db");
        result = dns_zone_setfile(zone, pathbuf, dns_masterformat_text,
                                  &dns_master_style_default);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_zone_setfile failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_zone_load(zone, false);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_zone_load failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 
        result = dns_view_addzone(view, zone);
        if (result != ISC_R_SUCCESS) {
+               fprintf(stderr, "dns_view_addzone failed: %s\n",
+                       isc_result_totext(result));
                return (1);
        }
 

diff --git a/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.key b/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.key
deleted file mode 100644 (file)
index 84575a0..0000000
--- a/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.key
+++ /dev/null
@@ -1 +0,0 @@
-sig0key. IN KEY 512 3 8 AwEAAa22lgHi1vAbQvu5ETdTrm2H8rwga9tvyMa6LFiSDyevLvSv0Uo5 uvfrXnxaLdtBMts6e1Ly2piSH9JRbOGMNibOK4EXWhWAn8MII4SWgQAs bFwtiz4HyPn2wScrUQdo8DocKiQJBanesr7vDO8fdA6Rg1e0yAtSeNti e8avx46/HJa6CFs3CoE0sf6oOFSxM954AgCBTXOGNBt1Nt3Bhfqt2qyA TLFii5K1jLDTZDVkoiyDXL1M7wcTwKf9METgj1eQmH3GGlRM/OJ/j8xk ZiFGbL3cipWdiH48031jiV2hlc92mKn8Ya0d9AN6c44piza/JSFydZXw sY32nxzjDbs=

diff --git a/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.private b/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.private
deleted file mode 100644 (file)
index 4acc214..0000000
--- a/fuzz/dns_message_checksig.data/Ksig0key.+008+55921.private
+++ /dev/null
@@ -1,13 +0,0 @@
-Private-key-format: v1.3
-Algorithm: 8 (RSASHA256)
-Modulus: rbaWAeLW8BtC+7kRN1OubYfyvCBr22/IxrosWJIPJ68u9K/RSjm69+tefFot20Ey2zp7UvLamJIf0lFs4Yw2Js4rgRdaFYCfwwgjhJaBACxsXC2LPgfI+fbBJytRB2jwOhwqJAkFqd6yvu8M7x90DpGDV7TIC1J422J7xq/Hjr8clroIWzcKgTSx/qg4VLEz3ngCAIFNc4Y0G3U23cGF+q3arIBMsWKLkrWMsNNkNWSiLINcvUzvBxPAp/0wROCPV5CYfcYaVEz84n+PzGRmIUZsvdyKlZ2IfjzTfWOJXaGVz3aYqfxhrR30A3pzjimLNr8lIXJ1lfCxjfafHOMNuw==
-PublicExponent: AQAB
-PrivateExponent: GDfclFkR5ToFGH9rMTRMnP73Q5dzjLgkx4vyHcuzKtxcvAans4+hNj+NazckAy2E+mpzV2j95TJ4wZjSM2RvB5xLwBIc4Dg6oyAHL6Ikoae6gw64cHFOaYb808n8CyqWqfX+QWAz9sRSVZXnTuPViX3A+svR7ejVak9Bzr1NTDm0DFlrhaKVCYA++dKVZerfuNiXT/jQvrc4wMCa7WWsfLsFO8aTNkEhqUnmS9c5VYgr7MkCV4ENDBcISpQc9wElI0hl12QPaSj8iSdk9liYp+HTiOxOyp6BGGuecKAoQijMwrZy4qExdOxvowptll8+nZLtwGRn/un/xvIZY5OLAQ==
-Prime1: ww3C6jwnrLQik/zxSgC0KuqgHq68cCjiRjwK2/euzs7NkMevFpXvV0cWO8x1/wKC1mszVLsUaKTvH6fzRsXfz5MPihzNzUYFwvobKVLserSxEwHNk+FKUU+q07Kf8WWnCqX5nX9QzVG1q4J8Q44N49I5S480jHLGYbyLZrEYMQE=
-Prime2: 4/3Ozq/8vRgcO4bieFs4CbZR7C98HiTi65SiLBIKY09mDfCleZI0uurAYBluZJgHS5AC5cdyHFuJr3uKxvD+Mgdlru40U6cSCEdK7HAhyUGZUndWl28wyMEB6Kke1/owxVn0S4RKLPOgFI2668H6JObaqXf0wyY89RdVQP6VQrs=
-Exponent1: Tbr9MyVX1j5PDVSev5P6OKQZvUB7PeM9ESo6VaCl3CqTxx+cic6ke86LcLcxSrewdkxwP1LydiVMWfwvOcP/RhRf+/Uwmp5OC35qNpSiQuAhNObiCw2b9T1fYU/s52FQKTEtgXNMOxZV5IxyguVoaaLMTG08TsAqiKZ/kyP99QE=
-Exponent2: Q4qSNKrwLbixzHS2LL+hR0dK17RtiaSV0QKUVIf3qdoAusp6yxwkIOegnBeMm6JqLtl38kh2pq37iRAJWcxVEc8dMYiB2fJZpjgwmwDREYUsfcC611vqUN7UyO8pIwSMZDq045ZKPyzhVJV0NZmemEYHq0LNMO7oCheiewGwiDc=
-Coefficient: T2u/J4NgyO+OqoLpXBIpTBzqrvDk8tb0feYgsp5d16hHvbXxNkMUR8cI07RdbI9HnEldtmhAnbQ6SvFiy2YYjpw/1Fz2WwdxRqLaDV7UlhrT+CqltvU9d/N/xThBNKDa23Wf5Vat+HRiLHSgzsY1PseVCWN+g4azuK2D8+DLeHE=
-Created: 20220311073606
-Publish: 20220311073606
-Activate: 20220311073606

diff --git a/fuzz/dns_message_checksig.data/sig0key.db b/fuzz/dns_message_checksig.data/sig0key.db
deleted file mode 100644 (file)
index ecf15bf..0000000
--- a/fuzz/dns_message_checksig.data/sig0key.db
+++ /dev/null
@@ -1,14 +0,0 @@
-; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-;
-; SPDX-License-Identifier: MPL-2.0
-;
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0.  If a copy of the MPL was not distributed with this
-; file, you can obtain one at https://mozilla.org/MPL/2.0/.
-;
-; See the COPYRIGHT file distributed with this work for additional
-; information regarding copyright ownership.
-
-sig0key. 0 IN SOA . . 0 0 0 0 0
-sig0key. 0 IN NS .
-sig0key. 0 IN KEY 512 3 8 AwEAAa22lgHi1vAbQvu5ETdTrm2H8rwga9tvyMa6LFiSDyevLvSv0Uo5 uvfrXnxaLdtBMts6e1Ly2piSH9JRbOGMNibOK4EXWhWAn8MII4SWgQAs bFwtiz4HyPn2wScrUQdo8DocKiQJBanesr7vDO8fdA6Rg1e0yAtSeNti e8avx46/HJa6CFs3CoE0sf6oOFSxM954AgCBTXOGNBt1Nt3Bhfqt2qyA TLFii5K1jLDTZDVkoiyDXL1M7wcTwKf9METgj1eQmH3GGlRM/OJ/j8xk ZiFGbL3cipWdiH48031jiV2hlc92mKn8Ya0d9AN6c44piza/JSFydZXw sY32nxzjDbs=