common/encrypt: accept '-' character in no-key names

[xfstests-dev.git] / common / encrypt

diff --git a/common/encrypt b/common/encrypt
index 766a6d817f59753d6e79641375cdf1e655468e84..f90c4ef05a3f2803d6af85dab6cd5a1cb526a07b 100644 (file)
--- a/common/encrypt
+++ b/common/encrypt
@@ -935,5 +935,8 @@ _filter_nokey_filenames()
 {
        local dir=$1
 
-       sed "s|${dir}${dir:+/}[A-Za-z0-9+,_]\+|${dir}${dir:+/}NOKEY_NAME|g"
+       # The no-key name format is a filesystem implementation detail that has
+       # varied slightly over time.  Just look for names that consist entirely
+       # of characters that have ever been used in such names.
+       sed "s|${dir}${dir:+/}[A-Za-z0-9+,_-]\+|${dir}${dir:+/}NOKEY_NAME|g"
 }