src/zlevis

@@ -12,29 +12,14 @@ if [ "$1" = "--summary" ]; then
     exit 0
 fi
 
-# Function to display usage information of zlevis
+# Function to display usage information when called
 info() {
     exec >&2
-    echo "Usage: \"zlevis {decrypt|encrypt} {pool|key}\""
+    echo "Usage: \"zlevis {decrypt|encrypt} {pool|key} [options]\""
     exit 2
 }
 
-# Function to display usage information of zlevis encrypt pool
-encrypt_pool_info() {
-    exec >&2
-    echo "Usage: \"zlevis encrypt pool <pool> '{\"property\":\"value\"}' < file.key\""
-    echo
-    echo "This command uses the following configuration properties:"
-    echo "  hash: <string> -> Hash algorithm used in the computation of the object name (default: sha256)."
-    echo "  key: <string> -> Algorithm type for the generated key (default: ecc)."
-    echo "  pcr_bank: <string> -> PCR algorithm bank to use for policy (default: first supported by TPM)."
-    echo "  pcr_ids: <string> -> PCR list used for policy. If not present, no policy is used."
-    echo "  pcr_digest: <string> -> Binary PCR hashes encoded in base64. If not present, the hash values are looked up."
-    exit 2
-}
-
-# Determine the argument path and execute the relevant script or function
-if [ -t 0]; then
+# Case statement to handle the argument path
 case "$1" in
     "decrypt") 
         case "$2" in
@@ -45,31 +30,13 @@ if [ -t 0]; then
     ;;
     "encrypt")
         case "$2" in
-                "pool") encrypt_pool_info;;
-                "key") zlevis-encrypt;;
-                *) info;;
-            esac
-        ;;
-        *) info;;
-    esac
-else
-    case "$1" in
-        "decrypt") 
-            case "$2" in
-                "key") zlevis-decrypt;;
-                *) info;;
-            esac
-        ;;
-        "encrypt")
-            case "$2" in
-                "pool") read -r -d . key || zfs set tpm:jwe=$(printf "%s" "$key" | zlevis-encrypt "$4") "$3";;
+            "pool") read -r -d . key && zfs set tpm:jwe=$(printf "%s" "$key" | zlevis-encrypt "$4") "$3";;
             "key") zlevis-encrypt "$3";;
             *) info;;
         esac
     ;;
     *) info;;
 esac
-fi
 
 # Exit with the status of the last command
 exit $?

src/zlevis-encrypt

@@ -66,7 +66,7 @@ fi
 
 # Validate the configuration input
 if ! cfg="$(jose fmt -j "$1" -Oo- 2>/dev/null)"; then
-    echo "Configuration '{\"property\":\"value\"}' is not present or malformed" >&2
+    echo "Configuration '{\"property\":\"value\"}' is malformed" >&2
     exit 1
 fi