[Gzz-commits] manuscripts/Sigs article.rst poss.py

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    manuscripts
Changes by:     Benja Fallenstein <address@hidden>      03/05/18 15:16:52

Modified files:
        Sigs           : article.rst poss.py 

Log message:
        fix, add merkleI to poss.py

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Sigs/article.rst.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/manuscripts/Sigs/poss.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: manuscripts/Sigs/article.rst
diff -u manuscripts/Sigs/article.rst:1.91 manuscripts/Sigs/article.rst:1.92
--- manuscripts/Sigs/article.rst:1.91   Sun May 18 14:15:24 2003
+++ manuscripts/Sigs/article.rst        Sun May 18 15:16:52 2003
@@ -325,7 +325,7 @@
        \parbox{\sw}{Lamport\cite{XXX}\\$(h,b)$} 
            & $1$ & $b$ & $bh$ & $2bh$ & $h$ & $2b$ & $0$ &  $b$ \\
        \parbox{\sw}{Merkle I $(h,b)$}
-           & $1$ & $b$ & $h(b+\lceil \log{2} b \rceil)$ & $1$ & $h$ &
+           & $1$ & $b$ & $h(b+\lceil \log{2} b \rceil)$ & $h$ & $h$ &
                $b+\lceil \log{2} b \rceil + 1$ & $0$ &
                $\le b+\lceil \log{2} b \rceil$ \\
        \parbox{\sw}{Merkle-Winternitz\cite{XXX} $(h,b,n)$ }
Index: manuscripts/Sigs/poss.py
diff -u manuscripts/Sigs/poss.py:1.4 manuscripts/Sigs/poss.py:1.5
--- manuscripts/Sigs/poss.py:1.4        Sun May 18 04:06:57 2003
+++ manuscripts/Sigs/poss.py    Sun May 18 15:16:52 2003
@@ -1,4 +1,3 @@
-from __future__ import nested_scopes
 from fractions import fraction
 import math
 from math import log, log10, ceil
@@ -6,6 +5,10 @@
 def lamport(h, b):
     return (1, b, b*h, 2*b*h, h, 2*b, 0, b)
 
+def merkleI(h, b):
+    return (1, b, h*(b+ceil(log2(b))), h, h,
+            b + ceil(log2(b)) + 1, 0, b + ceil(log2(b)))
+
 def merkle_winternitz(h, b, n):
     return (1, b, fraction(b*h+h*n, n), h, h, 
            fraction(2*b*(2L**n-1)+n, n),
@@ -17,6 +20,9 @@
            3*(n+1)*h, h, h,
            9*n+2, 0, 9*n+2)
 
+def times(j, S):
+    return (j*S[0], S[1], S[2], j*S[3], S[4], j*S[5], S[6], S[7])
+
 def merkle_hashtree(n, S):
     return (2L**n * S[0], S[1], 
                S[2] + S[3] + n * S[4],
@@ -57,7 +63,7 @@
 
 schemes = []
 
-if 1:
+if __name__ == '__main__':
     for t in range(1, 40):
        n = ceil(160.0 / t )
        #print "\n N = ",t, " n = ", n