aboutsummaryrefslogtreecommitdiff
path: root/4.1/charon.rb
diff options
context:
space:
mode:
Diffstat (limited to '4.1/charon.rb')
-rwxr-xr-x4.1/charon.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/4.1/charon.rb b/4.1/charon.rb
index ee2a514..a335d50 100755
--- a/4.1/charon.rb
+++ b/4.1/charon.rb
@@ -32,7 +32,7 @@ def ticket(username, ws_address, service)
sk = SecureRandom.hex.upcase
p = [sk, username, ws_address, service, 28800, ts].join(?\0)
s = encrypt(p, Services[service])
- "#{sk}:28800:#{ts}:#{s}"
+ "#{sk},#{ws_address},28800,#{ts},#{s}"
end
def noleak(msg, ul, ws)
@@ -65,7 +65,7 @@ post '/ticket' do
next "Invalid ticket\n" unless Time.now.to_i >= ts
next "Ticket expired\n" unless Time.now.to_i < (ts + ls)
begin
- aun, aws = decrypt(data["authenticator"], sk)
+ aun, aws = decrypt(data["authenticator"], sk).split(?,)
rescue OpenSSL::Cipher::CipherError
next "Invalid session key\n"
end