Increase Crypto::Bcrypt performance

Optimizes the Blowfish and Bcrypt algorithms by using stack allocated objects (StaticArray) instead of a HEAP allocation (Array), and raw pointer accesses. The implementation is still not on par with alternative C implementations (e.g. as used by the Ruby extension).
crystal-lang · Jan 20, 2017 · 42e2a52 · 42e2a52
1 parent 80692e9
commit 42e2a52
Show file tree

Hide file tree

Showing 4 changed files with 263 additions and 266 deletions.
diff --git a/spec/std/crypto/blowfish_spec.cr b/spec/std/crypto/blowfish_spec.cr
@@ -3,40 +3,40 @@ require "crypto/blowfish"
 
 describe "Crypto::Blowfish" do
   vectors = [
-    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], Int32[0x00000000, 0x00000000], Int32[0x4EF99745, 0x6198DD78]},
-    {UInt8[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF], Int32[0xFFFFFFFF, 0xFFFFFFFF], Int32[0x51866FD5, 0xB85ECB8A]},
-    {UInt8[0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], Int32[0x10000000, 0x00000001], Int32[0x7D856F9A, 0x613063F2]},
-    {UInt8[0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11], Int32[0x11111111, 0x11111111], Int32[0x2466DD87, 0x8B963C9D]},
-    {UInt8[0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF], Int32[0x11111111, 0x11111111], Int32[0x61F9C380, 0x2281B096]},
-    {UInt8[0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11], Int32[0x01234567, 0x89ABCDEF], Int32[0x7D0CC630, 0xAFDA1EC7]},
-    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], Int32[0x00000000, 0x00000000], Int32[0x4EF99745, 0x6198DD78]},
-    {UInt8[0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10], Int32[0x01234567, 0x89ABCDEF], Int32[0x0ACEAB0F, 0xC6A0A28D]},
-    {UInt8[0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57], Int32[0x01A1D6D0, 0x39776742], Int32[0x59C68245, 0xEB05282B]},
-    {UInt8[0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E], Int32[0x5CD54CA8, 0x3DEF57DA], Int32[0xB1B8CC0B, 0x250F09A0]},
-    {UInt8[0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86], Int32[0x0248D438, 0x06F67172], Int32[0x1730E577, 0x8BEA1DA4]},
-    {UInt8[0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E], Int32[0x51454B58, 0x2DDF440A], Int32[0xA25E7856, 0xCF2651EB]},
-    {UInt8[0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6], Int32[0x42FD4430, 0x59577FA2], Int32[0x353882B1, 0x09CE8F1A]},
-    {UInt8[0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE], Int32[0x059B5E08, 0x51CF143A], Int32[0x48F4D088, 0x4C379918]},
-    {UInt8[0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6], Int32[0x0756D8E0, 0x774761D2], Int32[0x432193B7, 0x8951FC98]},
-    {UInt8[0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE], Int32[0x762514B8, 0x29BF486A], Int32[0x13F04154, 0xD69D1AE5]},
-    {UInt8[0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16], Int32[0x3BDD1190, 0x49372802], Int32[0x2EEDDA93, 0xFFD39C79]},
-    {UInt8[0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F], Int32[0x26955F68, 0x35AF609A], Int32[0xD887E039, 0x3C2DA6E3]},
-    {UInt8[0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46], Int32[0x164D5E40, 0x4F275232], Int32[0x5F99D04F, 0x5B163969]},
-    {UInt8[0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E], Int32[0x6B056E18, 0x759F5CCA], Int32[0x4A057A3B, 0x24D3977B]},
-    {UInt8[0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76], Int32[0x004BD6EF, 0x09176062], Int32[0x452031C1, 0xE4FADA8E]},
-    {UInt8[0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07], Int32[0x480D3900, 0x6EE762F2], Int32[0x7555AE39, 0xF59B87BD]},
-    {UInt8[0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F], Int32[0x437540C8, 0x698F3CFA], Int32[0x53C55F9C, 0xB49FC019]},
-    {UInt8[0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7], Int32[0x072D43A0, 0x77075292], Int32[0x7A8E7BFA, 0x937E89A3]},
-    {UInt8[0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF], Int32[0x02FE5577, 0x8117F12A], Int32[0xCF9C5D7A, 0x4986ADB5]},
-    {UInt8[0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6], Int32[0x1D9D5C50, 0x18F728C2], Int32[0xD1ABB290, 0x658BC778]},
-    {UInt8[0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF], Int32[0x30553228, 0x6D6F295A], Int32[0x55CB3774, 0xD13EF201]},
-    {UInt8[0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01], Int32[0x01234567, 0x89ABCDEF], Int32[0xFA34EC48, 0x47B268B2]},
-    {UInt8[0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E], Int32[0x01234567, 0x89ABCDEF], Int32[0xA7907951, 0x08EA3CAE]},
-    {UInt8[0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE], Int32[0x01234567, 0x89ABCDEF], Int32[0xC39E072D, 0x9FAC631D]},
-    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], Int32[0xFFFFFFFF, 0xFFFFFFFF], Int32[0x014933E0, 0xCDAFF6E4]},
-    {UInt8[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF], Int32[0x00000000, 0x00000000], Int32[0xF21E9A77, 0xB71C49BC]},
-    {UInt8[0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF], Int32[0x00000000, 0x00000000], Int32[0x24594688, 0x5754369A]},
-    {UInt8[0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10], Int32[0xFFFFFFFF, 0xFFFFFFFF], Int32[0x6B5C5A9C, 0x5D9E0A5A]},
+    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], UInt32[0x00000000, 0x00000000], UInt32[0x4EF99745, 0x6198DD78]},
+    {UInt8[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF], UInt32[0xFFFFFFFF, 0xFFFFFFFF], UInt32[0x51866FD5, 0xB85ECB8A]},
+    {UInt8[0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], UInt32[0x10000000, 0x00000001], UInt32[0x7D856F9A, 0x613063F2]},
+    {UInt8[0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11], UInt32[0x11111111, 0x11111111], UInt32[0x2466DD87, 0x8B963C9D]},
+    {UInt8[0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF], UInt32[0x11111111, 0x11111111], UInt32[0x61F9C380, 0x2281B096]},
+    {UInt8[0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11], UInt32[0x01234567, 0x89ABCDEF], UInt32[0x7D0CC630, 0xAFDA1EC7]},
+    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], UInt32[0x00000000, 0x00000000], UInt32[0x4EF99745, 0x6198DD78]},
+    {UInt8[0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10], UInt32[0x01234567, 0x89ABCDEF], UInt32[0x0ACEAB0F, 0xC6A0A28D]},
+    {UInt8[0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57], UInt32[0x01A1D6D0, 0x39776742], UInt32[0x59C68245, 0xEB05282B]},
+    {UInt8[0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E], UInt32[0x5CD54CA8, 0x3DEF57DA], UInt32[0xB1B8CC0B, 0x250F09A0]},
+    {UInt8[0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86], UInt32[0x0248D438, 0x06F67172], UInt32[0x1730E577, 0x8BEA1DA4]},
+    {UInt8[0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E], UInt32[0x51454B58, 0x2DDF440A], UInt32[0xA25E7856, 0xCF2651EB]},
+    {UInt8[0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6], UInt32[0x42FD4430, 0x59577FA2], UInt32[0x353882B1, 0x09CE8F1A]},
+    {UInt8[0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE], UInt32[0x059B5E08, 0x51CF143A], UInt32[0x48F4D088, 0x4C379918]},
+    {UInt8[0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6], UInt32[0x0756D8E0, 0x774761D2], UInt32[0x432193B7, 0x8951FC98]},
+    {UInt8[0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE], UInt32[0x762514B8, 0x29BF486A], UInt32[0x13F04154, 0xD69D1AE5]},
+    {UInt8[0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16], UInt32[0x3BDD1190, 0x49372802], UInt32[0x2EEDDA93, 0xFFD39C79]},
+    {UInt8[0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F], UInt32[0x26955F68, 0x35AF609A], UInt32[0xD887E039, 0x3C2DA6E3]},
+    {UInt8[0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46], UInt32[0x164D5E40, 0x4F275232], UInt32[0x5F99D04F, 0x5B163969]},
+    {UInt8[0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E], UInt32[0x6B056E18, 0x759F5CCA], UInt32[0x4A057A3B, 0x24D3977B]},
+    {UInt8[0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76], UInt32[0x004BD6EF, 0x09176062], UInt32[0x452031C1, 0xE4FADA8E]},
+    {UInt8[0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07], UInt32[0x480D3900, 0x6EE762F2], UInt32[0x7555AE39, 0xF59B87BD]},
+    {UInt8[0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F], UInt32[0x437540C8, 0x698F3CFA], UInt32[0x53C55F9C, 0xB49FC019]},
+    {UInt8[0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7], UInt32[0x072D43A0, 0x77075292], UInt32[0x7A8E7BFA, 0x937E89A3]},
+    {UInt8[0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF], UInt32[0x02FE5577, 0x8117F12A], UInt32[0xCF9C5D7A, 0x4986ADB5]},
+    {UInt8[0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6], UInt32[0x1D9D5C50, 0x18F728C2], UInt32[0xD1ABB290, 0x658BC778]},
+    {UInt8[0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF], UInt32[0x30553228, 0x6D6F295A], UInt32[0x55CB3774, 0xD13EF201]},
+    {UInt8[0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01], UInt32[0x01234567, 0x89ABCDEF], UInt32[0xFA34EC48, 0x47B268B2]},
+    {UInt8[0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E], UInt32[0x01234567, 0x89ABCDEF], UInt32[0xA7907951, 0x08EA3CAE]},
+    {UInt8[0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE], UInt32[0x01234567, 0x89ABCDEF], UInt32[0xC39E072D, 0x9FAC631D]},
+    {UInt8[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00], UInt32[0xFFFFFFFF, 0xFFFFFFFF], UInt32[0x014933E0, 0xCDAFF6E4]},
+    {UInt8[0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF], UInt32[0x00000000, 0x00000000], UInt32[0xF21E9A77, 0xB71C49BC]},
+    {UInt8[0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF], UInt32[0x00000000, 0x00000000], UInt32[0x24594688, 0x5754369A]},
+    {UInt8[0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10], UInt32[0xFFFFFFFF, 0xFFFFFFFF], UInt32[0x6B5C5A9C, 0x5D9E0A5A]},
   ]
 
   it "encrypt and decrypt pair" do

diff --git a/src/crypto/bcrypt.cr b/src/crypto/bcrypt.cr
@@ -37,10 +37,10 @@ class Crypto::Bcrypt
   private DIGEST_SIZE = 31
 
   # bcrypt IV: "OrpheanBeholderScryDoubt"
-  private CIPHER_TEXT = Int32[
+  private CIPHER_TEXT = UInt32.static_array(
     0x4f727068, 0x65616e42, 0x65686f6c,
     0x64657253, 0x63727944, 0x6f756274,
-  ]
+  )
 
   def self.hash_secret(password, cost = DEFAULT_COST) : String
     passwordb = password.to_unsafe.to_slice(password.bytesize + 1) # include leading 0
@@ -94,8 +94,8 @@ class Crypto::Bcrypt
     blowfish = Blowfish.new(BLOWFISH_ROUNDS)
     blowfish.enhance_key_schedule(salt, password, cost)
 
-    cdata = CIPHER_TEXT.dup
-    size = cdata.size
+    cipher = CIPHER_TEXT.dup
+    cdata = cipher.to_unsafe
 
     0.step(to: 4, by: 2) do |i|
       64.times do
@@ -104,10 +104,10 @@ class Crypto::Bcrypt
       end
     end
 
-    ret = Bytes.new(size * 4)
+    ret = Bytes.new(cipher.size * 4)
     j = -1
 
-    size.times do |i|
+    cipher.size.times do |i|
       ret[j += 1] = (cdata[i] >> 24).to_u8
       ret[j += 1] = (cdata[i] >> 16).to_u8
       ret[j += 1] = (cdata[i] >> 8).to_u8

diff --git a/src/crypto/bcrypt/blowfish.cr b/src/crypto/bcrypt/blowfish.cr
@@ -16,27 +16,25 @@ class Crypto::Bcrypt::Blowfish < Crypto::Blowfish
     pos = 0
 
     0.upto(17) do |i|
-      @p[i] ^= next_word(key, pointerof(pos))
+      @p.to_unsafe[i] ^= next_word(key, pointerof(pos))
     end
 
-    l, r, pos = 0, 0, 0
+    l, r, pos = 0_u32, 0_u32, 0
 
-    0.step(to: 17, by: 2) do |i|
+    (0..17).step(2) do |i|
       l ^= next_word(data, pointerof(pos))
       r ^= next_word(data, pointerof(pos))
       l, r = encrypt_pair(l, r)
-      @p[i] = l
-      @p[i + 1] = r
+      @p.to_unsafe[i] = l
+      @p.to_unsafe[i + 1] = r
     end
 
-    0.upto(3) do |i|
-      0.step(to: 255, by: 2) do |j|
-        l ^= next_word(data, pointerof(pos))
-        r ^= next_word(data, pointerof(pos))
-        l, r = encrypt_pair(l, r)
-        @s[i][j] = l
-        @s[i][j + 1] = r
-      end
+    (0..1023).step(2) do |i|
+      l ^= next_word(data, pointerof(pos))
+      r ^= next_word(data, pointerof(pos))
+      l, r = encrypt_pair(l, r)
+      @s.to_unsafe[i] = l
+      @s.to_unsafe[i + 1] = r
     end
   end
 end