Move private_type_record() to conf.sh.common

The function 'private_type_record()' is now used in multiple system
setup scripts and should be moved to the common configuration script
conf.sh.common.

(cherry picked from commit c92128eada7c59892d84b54462c87130685ac87d)

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index a02ea713680941b57e78afe6f5d0735b414cae89..979fa99ed1ca0aa9026244120a3aed6eeaec1ede 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -410,6 +410,22 @@ keyfile_to_key_id() {
        echo "$1" | sed "s/.*+0\{0,4\}//"
 }
 
+# private_type_record: write a private type record recording the state of the
+# signing process
+#
+# For a given zone ($1), algorithm number ($2) and key file ($3), print the
+# private type record with default type value of 65534, indicating that the
+# signing process for this key is completed.
+private_type_record() {
+        _zone=$1
+        _algorithm=$2
+        _keyfile=$3
+
+        _id=$(keyfile_to_key_id "$_keyfile")
+
+        printf "%s. 0 IN TYPE65534 %s 5 %02x%04x0000\n" "$_zone" "\\#" "$_algorithm" "$_id"
+}
+
 # nextpart*() - functions for reading files incrementally
 #
 # These functions aim to facilitate looking for (or waiting for)

diff --git a/bin/tests/system/kasp/ns3/setup.sh b/bin/tests/system/kasp/ns3/setup.sh
index 30c56f06c16cf59d475afcdee455a745b310e179..c2e0598f59920eb43a0ff9b4d7019338ca7defbf 100644 (file)
--- a/bin/tests/system/kasp/ns3/setup.sh
+++ b/bin/tests/system/kasp/ns3/setup.sh
@@ -22,16 +22,6 @@ setup() {
        echo "$zone" >> zones
 }
 
-private_type_record() {
-       _zone=$1
-       _algorithm=$2
-       _keyfile=$3
-
-       _id=$(keyfile_to_key_id "$_keyfile")
-
-       printf "%s. 0 IN TYPE65534 %s 5 %02x%04x0000\n" "$_zone" "\\#" "$_algorithm" "$_id"
-}
-
 # Set in the key state files the Predecessor/Successor fields.
 # Key $1 is the predecessor of key $2.
 key_successor() {

diff --git a/bin/tests/system/kasp/ns6/setup.sh b/bin/tests/system/kasp/ns6/setup.sh
index 7fc6633ae3a163af15ba41485bfdb82d0fd8a28d..5f934ae9cc0536624207e23f11fb62d5020096f0 100644 (file)
--- a/bin/tests/system/kasp/ns6/setup.sh
+++ b/bin/tests/system/kasp/ns6/setup.sh
@@ -21,17 +21,6 @@ setup() {
        infile="${zone}.db.infile"
 }
 
-private_type_record() {
-       _zone=$1
-       _algorithm=$2
-       _keyfile=$3
-
-       _id=$(keyfile_to_key_id "$_keyfile")
-
-       printf "%s. 0 IN TYPE65534 %s 5 %02x%04x0000\n" "$_zone" "\\#" "$_algorithm" "$_id"
-}
-
-
 # Make lines shorter by storing key states in environment variables.
 H="HIDDEN"
 R="RUMOURED"

diff --git a/bin/tests/system/keymgr2kasp/ns3/setup.sh b/bin/tests/system/keymgr2kasp/ns3/setup.sh
index 1bb89ad37b1313f742efa2cb26166616e85f4724..f2d8c3bab605ae844c7a3cb61e2d79c4516b649a 100644 (file)
--- a/bin/tests/system/keymgr2kasp/ns3/setup.sh
+++ b/bin/tests/system/keymgr2kasp/ns3/setup.sh
@@ -21,17 +21,6 @@ setup() {
        infile="${zone}.db.infile"
 }
 
-private_type_record() {
-       _zone=$1
-       _algorithm=$2
-       _keyfile=$3
-
-       _id=$(keyfile_to_key_id "$_keyfile")
-
-       printf "%s. 0 IN TYPE65534 %s 5 %02x%04x0000\n" "$_zone" "\\#" "$_algorithm" "$_id"
-}
-
-
 # Make lines shorter by storing key states in environment variables.
 H="HIDDEN"
 R="RUMOURED"

diff --git a/bin/tests/system/keymgr2kasp/ns4/setup.sh b/bin/tests/system/keymgr2kasp/ns4/setup.sh
index 148de97570d8f9b11bb7c8f9cc503a937009cb4f..18f6f322de63ca1f7cdbadd0d09830a08506125b 100644 (file)
--- a/bin/tests/system/keymgr2kasp/ns4/setup.sh
+++ b/bin/tests/system/keymgr2kasp/ns4/setup.sh
@@ -14,16 +14,6 @@
 
 echo_i "ns4/setup.sh"
 
-private_type_record() {
-       _zone=$1
-       _algorithm=$2
-       _keyfile=$3
-
-       _id=$(keyfile_to_key_id "$_keyfile")
-
-       printf "%s. 0 IN TYPE65534 %s 5 %02x%04x0000\n" "$_zone" "\\#" "$_algorithm" "$_id"
-}
-
 # Make lines shorter by storing key states in environment variables.
 H="HIDDEN"
 R="RUMOURED"