EzSSL 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43edff0aff40d417ab9dbbe9daf4217324a03b473e137794f7159366098a2d3a
-  data.tar.gz: d227aaf919fc6dcc4e554dca40dd8d5032f2e5f24598187b9333e0332f627e5f
+  metadata.gz: f381e57cd92893ee88b828ed535e451972d2a1d88a3aed3cb78961f8b4cdfa75
+  data.tar.gz: 7cf236a5ba8f17b493ffb29fd0f5d195b0b1fd911f87403bd6b1fde66802da34
 SHA512:
-  metadata.gz: e3e6ac65c51a8aae19339984b32b209c2abb6370c17ed81427278f81b762cb6a177bdbf57d5ddd5155c815b2778a7bf8bef7bec2ebe3237c83fdc62e8aa83b6e
-  data.tar.gz: 7502c80f193ef387a2c422e6f2037eccb229eec3cc6b84a24ae96b84aac9f38e6127119993ea16339d43eea6387579a01e685ec6614bc069e15896e679f75802
+  metadata.gz: a150f6ff4ad094d50ce9fa88ebe7314ff9aa80e04f6c450528804438fe87bcd5af9130f343397f0dd6be86c5c02850a7faa4f591ac94ee40a09c05fb62dc345d
+  data.tar.gz: fcc9c4607d96b41ecf8f81e44f3b20040cfc07bcb9565736894a54090e7428054faddc9ee79d4ace1e93028aa6b036f2651327fb624e865c5c6dcd6ca767cdd4

data/lib/ezssl.rb

@@ -1,131 +1,104 @@
 require 'openssl'
 require 'socket'
 module EzSSL
-
   class Server
-    
-    attr_reader :read, :length
-
-    def initialize(ip,port,length=2048)
-      @length=length # bit length of private key [readable]
-      @socket=TCPServer.open(ip,port) # the server
-      @pair=OpenSSL::PKey::RSA.new(length) # the server keypair
-      @pubkey=@pair.public_key
-      @read=@pubkey.public_encrypt('hello').length # byte length to be read by the Handle object
+    attr_reader :pubkey
+    @@rsa=OpenSSL::PKey::RSA.new(2048)
+    def initialize(ip,port)
+      @server=TCPServer.new(ip,port)
     end
-
-    # Accepts a client connection, and returns a Handle object for communication
-    # 
-    # @return [Object] The Handle object
     def accept()
-      client=@socket.accept
-      client.puts @pubkey.to_s
-      go=true
-      key=''
-      while go
-        msg=client.gets
-        key+=msg
-        go=false if msg=="-----END PUBLIC KEY-----\n"
-      end
-      return Handle.new(client,key,self)
+      client=@server.accept
+      return Handle.new(client,self)
     end
-
-    # Decrypt a message without direct access to the private key
-    # 
-    # @param msg [String] The encrypted message
-    # @return [String] The decrypted message
-    def decrypt(msg)
-      return @pair.private_decrypt(msg)
+    def rsa_decrypt(msg)
+      return @@rsa.private_decrypt(msg)
+    end
+    def pubkey
+      return @@rsa.public_key.to_s
     end
-    
   end
-
+  
   class Client
-
-    attr_reader :key, :pubkey, :length, :max
-
-    def initialize(ip,port,length=2048)
-      @length=length # bit length of private key
-      @pair=OpenSSL::PKey::RSA.new(length)
-      @pubkey=@pair.public_key # clients public key
+    def initialize(ip,port)
       @socket=TCPSocket.new(ip,port)
-      @read=@pubkey.public_encrypt('hello').length
-
-      # recieve the key frome the server
-      go=true
+      @rsa=OpenSSL::PKey::RSA.new(2048)
+      @cip=OpenSSL::Cipher::AES256.new(:CBC).encrypt()
+      @dec=OpenSSL::Cipher::AES256.new(:CBC).decrypt()
+      #server=>client
       key=''
-      while go
-        msg=@socket.gets
-        key+=msg
-        go=false if msg=="-----END PUBLIC KEY-----\n"
+      line=@socket.gets
+      until line=="\n"
+        key+=line
+        line=@socket.gets
       end
-
-      #give server public key
-      @socket.puts @pubkey.to_s
-      @key=OpenSSL::PKey::RSA.new(key) # the servers public key
-      
-      @max=((self.gets().to_i)/8).floor - 11
-      self.puts @length.to_s
+      @server_rsa=OpenSSL::PKey::RSA.new(key)
+      @socket.puts @rsa.public_key.to_s
+      @socket.puts ""
     end
-
-    # Sends a string (msg) to the server
-    #
-    # @param msg [String] The sting being sent to the server
-    # @raise [ArgumentError] if the message being sent is too large for the OpenSSL::PKey::RSA object
+    
     def puts(msg)
-      raise ArgumentError, 'Message too big' if msg.length>@max
-      @socket.write @key.public_encrypt(msg)
+      key=@cip.random_key()
+      iv=@cip.random_iv()
+      enc=@cip.update(msg)+@cip.final
+      @socket.write(iv)
+      @socket.write(@server_rsa.public_encrypt(key))
+      @socket.puts enc.length
+      @socket.write(enc)
     end
-
-    # Recieves a string from the server
-    # 
-    # @return [String] The message from the server
+    
     def gets()
-      msg=@socket.read(@read)
-      return @pair.private_decrypt(msg)
+      @dec.iv=@socket.read(16)
+      @dec.key=@rsa.private_decrypt(@socket.read(256))
+      len=@socket.gets.to_i
+      msg=@socket.read(len)
+      return @dec.update(msg)+@dec.final
     end
+    
   end
-
+  
   private
-
-  # The object that allows communication from Server to Client.
   class Handle
-    attr_reader :max
-    # the client already has the servers pubkey, and the server has the clients pubkey
-
-    def initialize(client,key,server)
-      # The represented client
+    def initialize(client,server)
       @client=client
-      # The public key of the represented client
-      @key=OpenSSL::PKey::RSA.new(key)
       @server=server
-      @max=256
-      self.puts @server.length.to_s
-      @max=@max=((self.gets().to_i)/8).floor - 11
+      @cip=OpenSSL::Cipher::AES256.new(:CBC).encrypt()
+      @dec=OpenSSL::Cipher::AES256.new(:CBC).decrypt()
+      #swap rsa keys
+      #server=>client
+      client.puts server.pubkey
+      client.puts ""
+      #client=>server
+      key=''
+      line=client.gets
+      until line=="\n"
+        key+=line
+        line=client.gets
+      end
+      #make rsa key
+      @rsa=OpenSSL::PKey::RSA.new(key)
     end
-
-    # Sends a string (msg) to the represented client
-    #  
-    # @param msg [String] The message being sent to the client
-    # @raise [ArgumentError] if the message being sent is too large for the OpenSSL::PKey::RSA object
+    
     def puts(msg)
-      raise ArgumentError, 'Message too big' if msg.length>@max
-      @client.write @key.public_encrypt(msg)
+      key=@cip.random_key()
+      iv=@cip.random_iv()
+      enc=@cip.update(msg)+@cip.final
+      @client.write(iv)
+      @client.write(@rsa.public_encrypt(key))
+      @client.puts enc.length
+      @client.write(enc)
     end
-
-    # Recieves a string from the client
-    # 
-    # @return [String] The message sent from the client
+    
     def gets()
-      msg=@client.read(@server.read)
-      return @server.decrypt(msg)
+      @dec.iv=@client.read(16)
+      @dec.key=@server.rsa_decrypt(@client.read(256))
+      len=@client.gets.to_i
+      msg=@client.read(len)
+      return @dec.update(msg)+@dec.final
     end
-
-    # Closes the client remotely
-    def close
-      @client.close
+    
+    def close()
+      @client.close()
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: EzSSL
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Lucas Reinheart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies: []
 description: OpenSSL is confusing to people new to socket programming, so i aim to
   make the process easier
@@ -39,7 +39,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Easily make secure socket connections