Rename "uri" to "pkcs11-uri"

The name "uri" was considered to be too generic and could potentially
clash with a future URI configuration option. Renamed to "pkcs11-uri".

Note that this option name was also preferred over "pkcs11uri", the
dash is considered to be the more clearer form.

diff --git a/bin/tests/system/checkconf/good-kasp.conf b/bin/tests/system/checkconf/good-kasp.conf
index 40b5793ad07ceaf3f2d00e29aacc98143c163fb6..95ba817b3b324b658cae2fa50028f5c83a7c4275 100644 (file)
--- a/bin/tests/system/checkconf/good-kasp.conf
+++ b/bin/tests/system/checkconf/good-kasp.conf
@@ -41,7 +41,7 @@ dnssec-policy "test" {
 };
 key-store "hsm" {
        directory ".";
-       uri "pkcs11:token=bind9;pin-value=1234";
+       pkcs11-uri "pkcs11:token=bind9;pin-value=1234";
 };
 options {
        dnssec-policy "default";

diff --git a/bin/tests/system/checkconf/good.conf.in b/bin/tests/system/checkconf/good.conf.in
index 59ecbcec44a856d542c47b6ddc9ea11b8dc8c0fa..2fde415a4002d294544876358b9858e2398543c5 100644 (file)
--- a/bin/tests/system/checkconf/good.conf.in
+++ b/bin/tests/system/checkconf/good.conf.in
@@ -41,7 +41,7 @@ dnssec-policy "test" {
 };
 key-store "hsm" {
        directory ".";
-       uri "pkcs11:token=bind9;pin-value=1234";
+       pkcs11-uri "pkcs11:token=bind9;pin-value=1234";
 };
 options {
        avoid-v4-udp-ports {

diff --git a/bin/tests/system/enginepkcs11/ns1/named.conf.in b/bin/tests/system/enginepkcs11/ns1/named.conf.in
index 2e04e45b266f63aaaa2aaec840c07fc268c70312..b6c2d2df9d7400459688c6c031a846eac0ea660f 100644 (file)
--- a/bin/tests/system/enginepkcs11/ns1/named.conf.in
+++ b/bin/tests/system/enginepkcs11/ns1/named.conf.in
@@ -37,12 +37,12 @@ controls {
 
 key-store "hsm" {
        directory ".";
-       uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
+       pkcs11-uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
 };
 
 key-store "pin" {
        directory ".";
-       uri "pkcs11:token=softhsm2-enginepkcs11;pin-source=pin";
+       pkcs11-uri "pkcs11:token=softhsm2-enginepkcs11;pin-source=pin";
 };
 
 key-store "disk" {

diff --git a/bin/tests/system/enginepkcs11/ns2/named.conf.in b/bin/tests/system/enginepkcs11/ns2/named.conf.in
index 262419e983d578b387b742ee9a3db5d6765989ec..0622a949ff1d74891d659fd52f04a094a709dd9e 100644 (file)
--- a/bin/tests/system/enginepkcs11/ns2/named.conf.in
+++ b/bin/tests/system/enginepkcs11/ns2/named.conf.in
@@ -38,17 +38,17 @@ key "keyforview2" {
 
 key-store "hsm" {
        directory ".";
-       uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
+       pkcs11-uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
 };
 
 key-store "hsm2" {
        directory "keys";
-       uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
+       pkcs11-uri "pkcs11:token=softhsm2-enginepkcs11;pin-value=1234";
 };
 
 key-store "pin" {
        directory ".";
-       uri "pkcs11:token=softhsm2-enginepkcs11;pin-source=pin";
+       pkcs11-uri "pkcs11:token=softhsm2-enginepkcs11;pin-source=pin";
 };
 
 key-store "disk" {

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 6989c4fab7613396e48fccea377f3b5ea78fc8fc..3ebcfc82a5961a3d5841f7fc35cc75781ec49f50 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -621,7 +621,7 @@ The following options can be specified in a :any:`key-store` statement:
    The ``directory`` specifies where key files for this key should be stored.
    This is similar to using the zone's ``key-directory``.
 
-.. namedconf:statement:: uri
+.. namedconf:statement:: pkcs11-uri
    :tags: dnssec, pkcs11
 
    The ``uri`` is a string that specifies a PKCS#11 URI Scheme (defined in

diff --git a/doc/misc/options b/doc/misc/options
index bde27bd36dfe38a5b12b607d1a7aa4e3ac2d5ecb..25c23e9e06b1bc3da4582172b56f695b6bc79025 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -44,7 +44,7 @@ key <string> {
 
 key-store <string> {
        directory <string>;
-       uri <quoted_string>;
+       pkcs11-uri <quoted_string>;
 }; // may occur multiple times
 
 logging {

diff --git a/lib/isccfg/kaspconf.c b/lib/isccfg/kaspconf.c
index 9bd4ebb3e9a98efdd6bb08343547ac3402acf526..583f482f106fa496307dcc0ed5b765d32afa2fcb 100644 (file)
--- a/lib/isccfg/kaspconf.c
+++ b/lib/isccfg/kaspconf.c
@@ -780,7 +780,8 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx,
                maps[i] = NULL;
                dns_keystore_setdirectory(keystore,
                                          get_string(maps, "directory"));
-               dns_keystore_setpkcs11uri(keystore, get_string(maps, "uri"));
+               dns_keystore_setpkcs11uri(keystore,
+                                         get_string(maps, "pkcs11-uri"));
        }
 
        /* Append it to the list for future lookups. */

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 216eebce30998f6514aca01ff54f76182f385a9c..8465139e0b86ffba7a6bf1803d6bbd957eb640f3 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -2601,10 +2601,11 @@ static cfg_type_t cfg_type_key = { "key",         cfg_parse_named_map,
 /*%
  * A key-store statement.
  */
-static cfg_clausedef_t keystore_clauses[] = { { "directory", &cfg_type_astring,
-                                               0 },
-                                             { "uri", &cfg_type_qstring, 0 },
-                                             { NULL, NULL, 0 } };
+static cfg_clausedef_t keystore_clauses[] = {
+       { "directory", &cfg_type_astring, 0 },
+       { "pkcs11-uri", &cfg_type_qstring, 0 },
+       { NULL, NULL, 0 }
+};
 
 static cfg_clausedef_t *keystore_clausesets[] = { keystore_clauses, NULL };
 static cfg_type_t cfg_type_keystoreopts = {