From: Alex Elder <aelder@sgi.com>
To: xfs@oss.sgi.com
Subject: [PATCH 03/12] xfsprogs: drop unneeded use of a random character
Date: Thu, 30 Dec 2010 14:40:24 -0600 [thread overview]
Message-ID: <1293741624.2294.355.camel@doink> (raw)
With the exception of the last five bytes, an obfuscated filename is
simply a random string of (filesystem-acceptable) characters. The
last five bytes are chosen, based on the random portion before them,
such that the resulting obfuscated name has the same hash value as
the original filename.
This is done by essentially working backwards from the difference
between the original hash and the hash value computed for the
obfuscated name so far, picking final bytes based on how that
difference gets manipulated by completing the hash computation.
Of those last 5 bytes, all but the upper half of the first one are
completely determined by this process. The upper part of the first
one is currently computed as 4 random bits, just like the entire
first part of the obfuscated name.
But the lower nibble of that byte is already effectively random,
resulting from the hash computation (or the difference between two
of them). We can choose to use 0's for that upper nibble and it
will have no significant effect on the randomoness of the result.
Doing this simplifies the generation of two of the final five
characters, and makes all five of them get computed in a consistent
way.
Add the use of a mask in the one case it wasn't used to be even more
consistent.
Signed-off-by: Alex Elder <aelder@sgi.com>
---
db/metadump.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: b/db/metadump.c
===================================================================
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -472,8 +472,7 @@ generate_obfuscated_name(
*/
newhash = rol32(newhash, 3) ^ hash;
- newp[namelen - 5] = (newhash >> 28) |
- (random_filename_char() & 0xf0);
+ newp[namelen - 5] = (newhash >> 28) & 0x7f;
if (is_invalid_char(newp[namelen - 5]))
continue;
newp[namelen - 4] = (newhash >> 21) & 0x7f;
@@ -485,8 +484,7 @@ generate_obfuscated_name(
newp[namelen - 2] = (newhash >> 7) & 0x7f;
if (is_invalid_char(newp[namelen - 2]))
continue;
- newp[namelen - 1] = ((newhash >> 0) ^
- (newp[namelen - 5] >> 4)) & 0x7f;
+ newp[namelen - 1] = (newhash >> 0) & 0x7f;
if (is_invalid_char(newp[namelen - 1]))
continue;
break;
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
reply other threads:[~2010-12-30 20:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1293741624.2294.355.camel@doink \
--to=aelder@sgi.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox