Merge remote-tracking branch 'cloudant/2825-crypto-deprecations'
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index 612e31b..40c3fdf 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -199,7 +199,7 @@
query_all_docs(Db, Args0, Callback, Acc) ->
Sig = couch_util:with_db(Db, fun(WDb) ->
{ok, Info} = couch_db:get_db_info(WDb),
- couch_index_util:hexsig(couch_util:md5(term_to_binary(Info)))
+ couch_index_util:hexsig(couch_crypto:hash(md5, term_to_binary(Info)))
end),
Args1 = Args0#mrargs{view_type=map},
Args2 = couch_mrview_util:validate_args(Args1),
diff --git a/src/couch_mrview_util.erl b/src/couch_mrview_util.erl
index f41aed6..529e895 100644
--- a/src/couch_mrview_util.erl
+++ b/src/couch_mrview_util.erl
@@ -121,7 +121,7 @@
keyseq_indexed=KeySeqIndexed
},
SigInfo = {Views, Language, DesignOpts, couch_index_util:sort_lib(Lib)},
- {ok, IdxState#mrst{sig=couch_util:md5(term_to_binary(SigInfo))}}.
+ {ok, IdxState#mrst{sig=couch_crypto:hash(md5, term_to_binary(SigInfo))}}.
set_view_type(_Args, _ViewName, []) ->
@@ -167,7 +167,7 @@
keyseq_indexed=KeySeqIndexed
} = State,
Term = view_sig_term(BaseSig, UpdateSeq, PurgeSeq, KeySeqIndexed, SeqIndexed),
- couch_index_util:hexsig(couch_util:md5(term_to_binary(Term)));
+ couch_index_util:hexsig(couch_crypto:hash(md5, term_to_binary(Term)));
view_sig(Db, State, {_Nth, _Lang, View}, Args) ->
view_sig(Db, State, View, Args);
view_sig(_Db, State, View, Args0) ->
@@ -181,7 +181,7 @@
extra=[]
},
Term = view_sig_term(Sig, UpdateSeq, PurgeSeq, KeySeqIndexed, SeqIndexed, Args),
- couch_index_util:hexsig(couch_util:md5(term_to_binary(Term))).
+ couch_index_util:hexsig(couch_crypto:hash(md5, term_to_binary(Term))).
view_sig_term(BaseSig, UpdateSeq, PurgeSeq, false, false) ->
{BaseSig, UpdateSeq, PurgeSeq};
@@ -975,7 +975,7 @@
{ViewInfo, State#mrst.language, State#mrst.design_opts,
couch_index_util:sort_lib(State#mrst.lib)}
end,
- couch_util:md5(term_to_binary(SigData)).
+ couch_crypto:hash(md5, term_to_binary(SigData)).
old_view_format(View) ->
{
