diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-28 15:43:40 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-28 15:43:40 +0000 |
| commit | a2f5c52f61a53e3754f011d490febada626461bd (patch) | |
| tree | c5d0173af397f8c546bf7c4a025b6a82856fa542 /src | |
| parent | 96ddaed9bfb720a36f406886067fbe8dee1e9c66 (diff) | |
| parent | d32711d62a8b9097d8d5184b3cee44c82d3d3ebc (diff) | |
| download | rabbitmq-server-git-a2f5c52f61a53e3754f011d490febada626461bd.tar.gz | |
merge bug 21796 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_guid.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl index b789fbd1e0..ea61a679e8 100644 --- a/src/rabbit_guid.erl +++ b/src/rabbit_guid.erl @@ -104,13 +104,8 @@ guid() -> %% generate a readable string representation of a guid. Note that any %% monotonicity of the guid is not preserved in the encoding. string_guid(Prefix) -> - %% we use the (undocumented) ssl_base64 module here because it is - %% present throughout OTP R11 and R12 whereas base64 only becomes - %% available in R11B-4. - %% - %% TODO: once debian stable and EPEL have moved from R11B-2 to - %% R11B-4 or later we should change this to use base64. - Prefix ++ "-" ++ ssl_base64:encode(erlang:md5(term_to_binary(guid()))). + Prefix ++ "-" ++ base64:encode_to_string( + erlang:md5(term_to_binary(guid()))). binstring_guid(Prefix) -> list_to_binary(string_guid(Prefix)). diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index d84c570b57..21764fce6d 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -323,7 +323,7 @@ nodeparts(NodeStr) -> end. cookie_hash() -> - ssl_base64:encode(erlang:md5(atom_to_list(erlang:get_cookie()))). + base64:encode_to_string(erlang:md5(atom_to_list(erlang:get_cookie()))). tcp_name(Prefix, IPAddress, Port) when is_atom(Prefix) andalso is_number(Port) -> |