From: tkwa <kwathomas0@gmail.com>
Date: Tue, 2 Aug 2016 00:14:03 +0000 (-0700)
Subject: Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d9608a8f90ac019ab6054e0c98be35a91948f99c;p=iotcloud.git

Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud

Conflicts:
	doc/iotcloud.tex
---

d9608a8f90ac019ab6054e0c98be35a91948f99c
diff --cc doc/iotcloud.tex
index ab9cf85,450d913..af0a291
--- a/doc/iotcloud.tex
+++ b/doc/iotcloud.tex
@@@ -578,17 -601,24 +578,25 @@@ $\tuple{ck,\tuple{k, v}} \in KV_s \wedg
  \end{algorithmic}
  
  \begin{algorithmic}[1]
- \Function{ReinsertLastSlot}{$sl_{s_{last}},max'_s$}
- 	\State $s_s \gets GetLastS(sl_{s_{last}})$
- 	\State $sv_s \gets GetSV(sl_{s_{last}})$
- 	\State $\tuple{stat_s,SL_s} \gets \Call{PutSlot}{s_s,sv_s,max'_s}$
- 	\State $cr_s \gets \Call{HandleCollision}{\tuple{stat_s,SL_s}}$
- \State \Return{$cr_s$}
++
+ \Function{ReinsertLastSlot}{$MS_s,SK_s,sl_{s_{last}},max'_s,hmac_{p_s}$}
+ \State $s_s \gets MaxLastSeqN(MS_s)$
+ \State $sv_s \gets GetSV(sl_{s_{last}})$
+ \State $Dat_s \gets Decrypt(SK,sv_s)$
+ \State $DE_s \gets GetDatEnt(Dat_s)$
+ \State $hmac_{c_s} \gets Hmac(DE_s,SK_s)$
+ \State $Dat_s \gets CreateDat(s_s,id_{self},hmac_{p_s},DE_p,hmac_{c_s})$
+ \State $hmac_{p_s} \gets hmac_{c_s}$
+ \State $\tuple{stat_s,SL_s} \gets \Call{PutSlot}{s_s,sv_s,max'_s}$   
+ \State $cr_s \gets \Call{HandleCollision}{\tuple{stat_s,SL_s}}$
+ \State \Return{$\tuple{cr_s,hmac_{p_p}}$}
++
  \EndFunction
  \end{algorithmic}
  \note{Shouldn't this function do something pretty sophisticated about seeing what data we actually need to keep from the last slot and not just insert the entire thing?}
  
+ \note{Probably best to just not call this function if $need_s$ is false and not pass in such parameters.  It makes it harder to read.}
  
 -
  \begin{algorithmic}[1]
  \Function{GetDEPairs}{$KV_s,max'_s,need_s,sl_s$}
  \State $DE_{ret} \gets \emptyset$