diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-02 11:02:11 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-02 11:02:11 +0000 |
| commit | c43a0073a5241803f2b149fa2ed929175c248376 (patch) | |
| tree | c16b21b2870a9d2499099d50849e7293b8a6f1b3 | |
| parent | fbf0ad4856ebde1e931e1d03af73d5befc648990 (diff) | |
| download | rabbitmq-server-c43a0073a5241803f2b149fa2ed929175c248376.tar.gz | |
Don't add the name MD5, don't base64 encode.
| -rw-r--r-- | src/rabbit_access_control.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index 4d40ae4b..bc0fe463 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -264,20 +264,20 @@ change_password_hash(Username, PasswordHash) -> hash_password(Cleartext) -> Salt = make_salt(), Hash = salted_md5(Salt, Cleartext), - <<"MD5:", Salt/binary, ":", Hash/binary>>. + <<Salt/binary, Hash/binary>>. -check_password(Cleartext, <<"MD5:", Salt:8/binary, ":", Hash/binary>>) -> +check_password(Cleartext, <<Salt:4/binary, Hash/binary>>) -> Hash =:= salted_md5(Salt, Cleartext). make_salt() -> {A1,A2,A3} = now(), random:seed(A1, A2, A3), Salt0 = random:uniform(16#ffffffff), - base64:encode(<<Salt0:32>>). + <<Salt0:32>>. -salted_md5(Salt, Cleartext)-> +salted_md5(Salt, Cleartext) -> Salted = <<Salt/binary, Cleartext/binary>>, - base64:encode(erlang:md5(Salted)). + erlang:md5(Salted). set_admin(Username) -> set_admin(Username, true). |