]> git.ipfire.org Git - thirdparty/knot-dns.git/commitdiff
keymgr/import-bind: tolerate blank lines in privkey
authorLibor Peltan <libor.peltan@nic.cz>
Mon, 7 Dec 2020 12:30:43 +0000 (13:30 +0100)
committerLibor Peltan <libor.peltan@nic.cz>
Mon, 7 Dec 2020 12:30:43 +0000 (13:30 +0100)
src/utils/keymgr/bind_privkey.c
tests-extra/tests/dnssec/revoked/data/Kexample.com.+013+65449.private

index c7b71373a0d07f77cb5b0ebdc2d42a7ec86b907d..9879f6bb2a7553dd13be0a572f695868e3cc4da4 100644 (file)
@@ -162,6 +162,11 @@ static int parse_line(bind_privkey_t *params, char *line, size_t length)
        assert(params);
        assert(line);
 
+       strip(&line, &length);
+       if (length == 0) {
+               return KNOT_EOK; // blank line
+       }
+
        char *separator = memchr(line, ':', length);
        if (!separator) {
                return DNSSEC_MALFORMED_DATA;
index eed34e3d7bf2d6d1e8613889cd6f88d4de7dadb3..c801b6012cda9ef65630f63083167697b7b22c30 100644 (file)
@@ -1,8 +1,10 @@
 Private-key-format: v1.3
 Algorithm: 13 (ECDSAP256SHA256)
 PrivateKey: 0GOBknxw/CvEg1XAtnMaq/MHnSZ67lGT8Xlfm2KzTOE=
+        
 Created: 20201103110016
 Publish: 20201103110016
 Activate: 20201103110016
 Inactive: 20201103120016
 Revoke: 20201103120016
+