id_shuffler 0.0.1 → 0.0.2

data/ext/id_shuffler/id_shuffler.c

@@ -15,25 +15,27 @@ static VALUE r_base32_shuffle(VALUE self, VALUE original_num, VALUE key_str) {
   // initialize the feistel network and lfsr
   unsigned int keypos, key_len;
   unsigned long l, r, r_orig;
-  unsigned long lfsr_bit, lfsr_outbit, lfsr_num;
+  unsigned long lfsr, lfsr_check_bit, lfsr_out_bit, lfsr_round;
   l = (original >> 15) & 32767;
   r = original & 32767;
   key_len = strlen(key);
   // apply the feistel network in a loop over each char in key. the round
-  // function uses the key char as the taps mask for a single iteration of an
-  // lfsr.
+  // function uses the current key character as the taps mask for several
+  // iterations of a 32-bit lfsr
   for (keypos = 0; keypos < key_len; keypos++) {
     r_orig = r;
-    lfsr_num = r+key[keypos];
-    lfsr_outbit = 0;
-    for (lfsr_bit = 0; lfsr_bit < 15; lfsr_bit++) {
-      if ((key[keypos] & (1 >> lfsr_bit)) > 0) {
-        lfsr_outbit = lfsr_outbit ^ ((lfsr_num & (1 >> lfsr_bit)) >> lfsr_bit);
+    lfsr = r + 255; // ensure nonzero starting condition in the lfsr
+    for (lfsr_round = 0; lfsr_round < 15; lfsr_round++) {
+      lfsr_out_bit = 0;
+      for (lfsr_check_bit = 0; lfsr_check_bit < 8; lfsr_check_bit++) {
+        if ((key[keypos] & (1 << lfsr_check_bit)) > 0) {
+          lfsr_out_bit = lfsr_out_bit ^ ((lfsr & (1 << lfsr_check_bit)) >> lfsr_check_bit);
+        }
       }
+      lfsr = (lfsr << 1) + lfsr_out_bit;
     }
-    lfsr_num = (lfsr_num >> 1) + (lfsr_outbit << 14);
-    lfsr_num = lfsr_num & 32767;
-    r = (l ^ lfsr_num);
+    lfsr = lfsr & 32767;
+    r = (l ^ lfsr);
     l = r_orig;
   }
   // base32 encode the result
@@ -73,25 +75,27 @@ static VALUE r_base32_unshuffle(VALUE self, VALUE shuffled_str, VALUE key_str) {
       return INT2NUM(-1);
     }
   }
-  // iterate the feistel network in reverse
+  // unwind
   int keypos,key_len;
   unsigned long l, r, l_orig;
-  unsigned long lfsr_bit, lfsr_outbit, lfsr_num;
+  unsigned long lfsr, lfsr_check_bit, lfsr_out_bit, lfsr_round;
   l = (shuffled >> 15) & 32767;
   r = shuffled & 32767;
   key_len = strlen(key);
   for (keypos = (key_len - 1); keypos >= 0; keypos--) {
     l_orig = l;
-    lfsr_num = l+key[keypos];
-    lfsr_outbit = 0;
-    for (lfsr_bit = 0; lfsr_bit < 15; lfsr_bit++) {
-      if ((key[keypos] & (1 >> lfsr_bit)) > 0) {
-        lfsr_outbit = lfsr_outbit ^ ((lfsr_num & (1 >> lfsr_bit)) >> lfsr_bit);
+    lfsr = l + 255;
+    for (lfsr_round = 0; lfsr_round < 15; lfsr_round++) {
+      lfsr_out_bit = 0;
+      for (lfsr_check_bit = 0; lfsr_check_bit < 8; lfsr_check_bit++) {
+        if ((key[keypos] & (1 << lfsr_check_bit)) > 0) {
+          lfsr_out_bit = lfsr_out_bit ^ ((lfsr & (1 << lfsr_check_bit)) >> lfsr_check_bit);
+        }
       }
+      lfsr = (lfsr << 1) + lfsr_out_bit;
     }
-    lfsr_num = (lfsr_num >> 1) + (lfsr_outbit << 14);
-    lfsr_num = lfsr_num & 32767;
-    l = (r ^ lfsr_num);
+    lfsr = lfsr & 32767;
+    l = (r ^ lfsr);
     r = l_orig;
   }
   // return the resulting original number as a ruby fixnum

data/lib/id_shuffler.rb

@@ -17,6 +17,10 @@ class IdShuffler
     @key = Digest::MD5.digest(key)
   end
 
+  # note the c extension defines the two class methods:
+  # - shuffle_with_raw_key
+  # - unshuffle_with_raw_key
+
   def shuffle(i)
     self.class.shuffle_with_raw_key(i.to_i, @key)
   end
@@ -25,16 +29,16 @@ class IdShuffler
     self.class.unshuffle_with_raw_key(s.to_s, @key)
   end
 
+  # these class methods are here for convenience but they are slower because the
+  # md5 is computed each time. better to use an instance with an initialized
+  # key.
+
   def self.shuffle(i, key)
-    @keycache ||= {}
-    @keycache[key] ||= Digest::MD5.digest(key)
-    shuffle_with_raw_key(i.to_i, @keycache[key])
+    shuffle_with_raw_key(i.to_i, Digest::MD5.digest(key))
   end
 
   def self.unshuffle(s, key)
-    @keycache ||= {}
-    @keycache[key] ||= Digest::MD5.digest(key)
-    unshuffle_with_raw_key(s.to_s, @keycache[key])
+    unshuffle_with_raw_key(s.to_s, Digest::MD5.digest(key))
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id_shuffler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: