common/fuzzy: if the fuzz verb is random, keep fuzzing until we get a new value

[xfstests-dev.git] / common / encrypt

diff --git a/common/encrypt b/common/encrypt
index 85f71d5b4c36fe3e24f9e2465fa5a08b80e420d1..a6fd89d991224136704d105d144d5b43fb4cc4a4 100644 (file)
--- a/common/encrypt
+++ b/common/encrypt
@@ -71,6 +71,10 @@ _scratch_mkfs_encrypted()
        ext4|f2fs)
                _scratch_mkfs -O encrypt
                ;;
+       ubifs)
+               # erase the UBI volume; reformated automatically on next mount
+               $UBIUPDATEVOL_PROG ${SCRATCH_DEV} -t
+               ;;
        *)
                _notrun "No encryption support for $FSTYP"
                ;;
@@ -84,25 +88,34 @@ _new_session_keyring()
        $KEYCTL_PROG new_session >>$seqres.full
 }
 
-#
-# Generate a random encryption key, add it to the session keyring, and print out
-# the resulting key descriptor (example: "8bf798e1a494e1ec").  Requires the
-# keyctl program.  It's assumed the caller has already set up a test-scoped
-# session keyring using _new_session_keyring.
-#
-_generate_encryption_key()
+# Generate a key descriptor (16 character hex string)
+_generate_key_descriptor()
 {
-       # Generate a key descriptor (16 character hex string)
        local keydesc=""
+       local i
        for ((i = 0; i < 8; i++)); do
                keydesc="${keydesc}$(printf "%02x" $(( $RANDOM % 256 )))"
        done
+       echo $keydesc
+}
 
-       # Generate the actual encryption key (64 bytes)
+# Generate a raw encryption key, but don't add it to the keyring yet.
+_generate_raw_encryption_key()
+{
        local raw=""
+       local i
        for ((i = 0; i < 64; i++)); do
                raw="${raw}\\x$(printf "%02x" $(( $RANDOM % 256 )))"
        done
+       echo $raw
+}
+
+# Add the specified raw encryption key to the session keyring, using the
+# specified key descriptor.
+_add_encryption_key()
+{
+       local keydesc=$1
+       local raw=$2
 
        #
        # Add the key to the session keyring.  The required structure is:
@@ -134,6 +147,21 @@ _generate_encryption_key()
        fi
        echo -n -e "${mode}${raw}${size}" |
                $KEYCTL_PROG padd logon $FSTYP:$keydesc @s >>$seqres.full
+}
+
+#
+# Generate a random encryption key, add it to the session keyring, and print out
+# the resulting key descriptor (example: "8bf798e1a494e1ec").  Requires the
+# keyctl program.  It's assumed the caller has already set up a test-scoped
+# session keyring using _new_session_keyring.
+#
+_generate_encryption_key()
+{
+       local keydesc=$(_generate_key_descriptor)
+       local raw=$(_generate_raw_encryption_key)
+
+       _add_encryption_key $keydesc $raw
+
        echo $keydesc
 }