From 5572001e5eeff705032f77e43e9ae4606aed5edf Mon Sep 17 00:00:00 2001 From: kmacgugan Date: Wed, 11 May 2016 12:10:59 -0700 Subject: [PATCH 1/3] switch to erlang:timestamp() instead of erlang:now() due to deprecation warning --- src/esaml_util.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/esaml_util.erl b/src/esaml_util.erl index ffbe950..e5cb05d 100644 --- a/src/esaml_util.erl +++ b/src/esaml_util.erl @@ -253,7 +253,7 @@ unique_id() -> erlang:system_time() % needs ERTS-7.0 catch error:undef -> - {Mega, Sec, Micro} = erlang:now(), + {Mega, Sec, Micro} = erlang:timestamp(), Mega * 1000000 * 1000000 + Sec * 1000000 + Micro end, lists:flatten(io_lib:format("_~.16b~.16b", [R, T])). From bc771bba157bdccd6d24af91cd6d784d2dc4ea9f Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Thu, 23 Jun 2016 15:22:28 +0200 Subject: [PATCH 2/3] default to sha256 in xmerl_dsig:digest/1 --- src/xmerl_dsig.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmerl_dsig.erl b/src/xmerl_dsig.erl index b756faa..83fad73 100644 --- a/src/xmerl_dsig.erl +++ b/src/xmerl_dsig.erl @@ -136,7 +136,7 @@ sign(ElementIn, PrivateKey = #'RSAPrivateKey'{}, CertBin, SigMethod) when is_bin %% Strips any XML digital signatures and applies any relevant InclusiveNamespaces %% before generating the digest. -spec digest(Element :: #xmlElement{}) -> binary(). -digest(Element) -> digest(Element, sha). +digest(Element) -> digest(Element, sha256). -spec digest(Element :: #xmlElement{}, HashFunction :: sha | sha256) -> binary(). digest(Element, HashFunction) -> From 8ac578fc8aa82b6ed5b712b0de5eaf61a7c533d3 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Thu, 30 Jun 2016 15:10:42 +0200 Subject: [PATCH 3/3] backwards-compat for erlang:timestamp() indebted to lasp-lang: https://github.com/lasp-lang/time_compat/blob/master/src/time_compat.erl#L189 --- src/esaml_util.erl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/esaml_util.erl b/src/esaml_util.erl index e5cb05d..da5b8bc 100644 --- a/src/esaml_util.erl +++ b/src/esaml_util.erl @@ -253,11 +253,18 @@ unique_id() -> erlang:system_time() % needs ERTS-7.0 catch error:undef -> - {Mega, Sec, Micro} = erlang:timestamp(), + {Mega, Sec, Micro} = timestamp(), Mega * 1000000 * 1000000 + Sec * 1000000 + Micro end, lists:flatten(io_lib:format("_~.16b~.16b", [R, T])). +timestamp() -> + try + erlang:timestamp() + catch + error:undef -> erlang:now() + end. + -ifdef(TEST). -include_lib("eunit/include/eunit.hrl").