Do not use base64 (#51)

... because it will require an explicit dependency since Ruby 3.4.0.
imanel · Sep 19, 2023 · 7402538 · 7402538
1 parent 85220ab
commit 7402538
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/websocket/handshake/handler/client04.rb b/lib/websocket/handshake/handler/client04.rb
@@ -34,13 +34,13 @@ def handshake_keys
         # Sec-WebSocket-Key value
         # @return [String] key
         def key
-          @key ||= Base64.encode64((1..16).map { rand(255).chr } * '').strip
+          @key ||= [(1..16).map { rand(255).chr } * ''].pack('m').strip
         end
 
         # Value of Sec-WebSocket-Accept that should be delivered back by server
         # @return [Sering] accept
         def accept
-          @accept ||= Base64.encode64(Digest::SHA1.digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')).strip
+          @accept ||= [Digest::SHA1.digest(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11')].pack('m').strip
         end
 
         # Verify if received header Sec-WebSocket-Accept matches generated one.

diff --git a/lib/websocket/handshake/handler/server04.rb b/lib/websocket/handshake/handler/server04.rb
@@ -33,7 +33,7 @@ def handshake_keys
         def signature
           return unless key
           string_to_sign = "#{key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-          Base64.encode64(Digest::SHA1.digest(string_to_sign)).chomp
+          [Digest::SHA1.digest(string_to_sign)].pack('m').chomp
         end
 
         def verify_key