From 602d063427b5d808478ad558f99e5efe28a2cc6e Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Sat, 25 Oct 2014 02:10:17 +0200
Subject: Stop using jiffy

---
 src/catlfish.erl | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'src/catlfish.erl')

diff --git a/src/catlfish.erl b/src/catlfish.erl
index 73066bb..6cc741d 100644
--- a/src/catlfish.erl
+++ b/src/catlfish.erl
@@ -98,13 +98,11 @@ add_chain(LeafCert, CertChain) ->
         plop:spt(list_to_binary([<<?PROTOCOL_VERSION:8>>,
                                  serialise_signature_type(certificate_timestamp),
                                  serialise(TimestampedEntry)])),
-    binary_to_list(
-      jiffy:encode(
-        {[{sct_version, ?PROTOCOL_VERSION},
-          {id, base64:encode(plop:get_logid())},
-          {timestamp, TimestampedEntry#timestamped_entry.timestamp},
-          {extensions, base64:encode(<<>>)},
-          {signature, base64:encode(plop:serialise(SCT_sig))}]})).
+    {[{sct_version, ?PROTOCOL_VERSION},
+      {id, base64:encode(plop:get_logid())},
+      {timestamp, TimestampedEntry#timestamped_entry.timestamp},
+      {extensions, base64:encode(<<>>)},
+      {signature, base64:encode(plop:serialise(SCT_sig))}]}.
 
 -spec serialise_logentry(integer(), binary(), [binary()]) -> binary().
 serialise_logentry(Timestamp, LeafCert, CertChain) ->
@@ -118,24 +116,21 @@ serialise_logentry(Timestamp, LeafCert, CertChain) ->
 
 -spec entries(non_neg_integer(), non_neg_integer()) -> list().
 entries(Start, End) ->
-    binary_to_list(
-      jiffy:encode({[{entries, x_entries(plop:get(Start, End))}]})).
+    {[{entries, x_entries(plop:get(Start, End))}]}.
 
 -spec entry_and_proof(non_neg_integer(), non_neg_integer()) -> list().
 entry_and_proof(Index, TreeSize) ->
-    binary_to_list(
-      jiffy:encode(
-        case plop:inclusion_and_entry(Index, TreeSize) of
-            {ok, Entry, Path} ->
-                {Timestamp, LeafCertVector, CertChainVector} = unpack_entry(Entry),
-                MTL = build_mtl(Timestamp, LeafCertVector),
-                {[{leaf_input, base64:encode(MTL)},
-                  {extra_data, base64:encode(CertChainVector)},
-                  {audit_path, [base64:encode(X) || X <- Path]}]};
-            {notfound, Msg} ->
-                {[{success, false},
-                  {error_message, list_to_binary(Msg)}]}
-        end)).
+    case plop:inclusion_and_entry(Index, TreeSize) of
+        {ok, Entry, Path} ->
+            {Timestamp, LeafCertVector, CertChainVector} = unpack_entry(Entry),
+            MTL = build_mtl(Timestamp, LeafCertVector),
+            {[{leaf_input, base64:encode(MTL)},
+              {extra_data, base64:encode(CertChainVector)},
+              {audit_path, [base64:encode(X) || X <- Path]}]};
+        {notfound, Msg} ->
+            {[{success, false},
+              {error_message, list_to_binary(Msg)}]}
+    end.
 
 %% Private functions.
 unpack_entry(Entry) ->
-- 
cgit v1.1