viff

changeset 714:9aebdc00f58f

Merged.
author Mikkel Krøigård <mk@daimi.au.dk>
date Wed, 23 Apr 2008 16:18:25 +0200
parents 1f813a287ec5 c8f0898aff9d
children 55a855aa41e9
files
diffstat 8 files changed, 9 insertions(+), 13 deletions(-) [+]
line diff
     1.1 --- a/.hgsigs	Wed Apr 23 15:58:17 2008 +0200
     1.2 +++ b/.hgsigs	Wed Apr 23 16:18:25 2008 +0200
     1.3 @@ -1,2 +1,3 @@
     1.4  7e47fd0abed9673230a456e2f1b12794f6cf9d23 0 iD8DBQBHc/jr6nfwy35F3TgRAgxWAKDSuNK9UQtG01GqzmLZ5wwVKKlaygCfeA4xgSigRCOi3OOzXMdv4wmEcps=
     1.5  081094c8a3fb6ea46eb4e698e5038f1315b0ec69 0 iD8DBQBH2DMz6nfwy35F3TgRAnJ0AJ0fK1NE1J79kDOGW16Mae4d30AFUgCgzcuVGQn05U42FC+CZ+pmJUSkt9A=
     1.6 +46636debbbe310bd6428fc4e6f3e0d412d991a29 0 iD8DBQBIDtlM6nfwy35F3TgRAv2FAJ9jNfLhwU1yhQ3yVAwa3jEmIkb85ACgmldTcT4VE1x1JuTONGQx0V8Dk2o=
     2.1 --- a/.hgtags	Wed Apr 23 15:58:17 2008 +0200
     2.2 +++ b/.hgtags	Wed Apr 23 16:18:25 2008 +0200
     2.3 @@ -3,3 +3,4 @@
     2.4  63b4a2939abe4ec196a44919ba6306f247550ec0 0.2
     2.5  7e47fd0abed9673230a456e2f1b12794f6cf9d23 0.3
     2.6  081094c8a3fb6ea46eb4e698e5038f1315b0ec69 0.4
     2.7 +46636debbbe310bd6428fc4e6f3e0d412d991a29 0.5rc1
     3.1 --- a/MANIFEST.in	Wed Apr 23 15:58:17 2008 +0200
     3.2 +++ b/MANIFEST.in	Wed Apr 23 16:18:25 2008 +0200
     3.3 @@ -1,5 +1,3 @@
     3.4 -include doc/design-talk/design-talk.pdf
     3.5 -
     3.6  include doc/api/*.html
     3.7  include doc/api/*.gif
     3.8  include doc/api/*.png
     4.1 --- a/NEWS	Wed Apr 23 15:58:17 2008 +0200
     4.2 +++ b/NEWS	Wed Apr 23 16:18:25 2008 +0200
     4.3 @@ -13,8 +13,8 @@
     4.4    http://tracker.viff.dk/
     4.5  
     4.6  
     4.7 -Version 0.5, not yet released
     4.8 ------------------------------
     4.9 +Version 0.5rc1, released on 2008-04-23
    4.10 +--------------------------------------
    4.11  
    4.12  Added preliminary support for preprocessing and an efficient
    4.13  multiplication protocol which is secure against active adversaries.
     5.1 --- a/apps/benchmark.py	Wed Apr 23 15:58:17 2008 +0200
     5.2 +++ b/apps/benchmark.py	Wed Apr 23 16:18:25 2008 +0200
     5.3 @@ -127,6 +127,7 @@
     5.4          self.operation = operation
     5.5  
     5.6          if isinstance(self.rt, ActiveRuntime) and self.operation == operator.mul:
     5.7 +            # TODO: Make this optional and extend it to other operations.
     5.8              print "Starting preprocessing"
     5.9              program_desc = {
    5.10                  ("generate_triples", (Zp,)):
     6.1 --- a/run.py	Wed Apr 23 15:58:17 2008 +0200
     6.2 +++ b/run.py	Wed Apr 23 16:18:25 2008 +0200
     6.3 @@ -104,18 +104,12 @@
     6.4      # Generate API docs in doc/api.
     6.5      epydoc('doc')
     6.6  
     6.7 -    # First PDFLaTeX run...
     6.8 -    execute(["pdflatex", "--interaction", "nonstopmode", "design-talk.tex"],
     6.9 -            work_dir="doc/design-talk")
    6.10 -    # Second run to update the table of contents.
    6.11 -    execute(["pdflatex", "--interaction", "nonstopmode", "design-talk.tex"],
    6.12 -            work_dir="doc/design-talk")
    6.13 -
    6.14      # Retrieve the latest version of install.txt and authors.txt from
    6.15      # the website repository, and ship them as INSTALL and AUTHORS.
    6.16      for filename in ('install.txt', 'authors.txt'):
    6.17          url = 'http://hg.viff.dk/viff.dk/raw-file/tip/%s' % filename
    6.18 -        print "Fetching %s" % url,
    6.19 +        print "Fetching %s..." % url,
    6.20 +        sys.stdout.flush()
    6.21          urlretrieve(url, filename[:-4].upper())
    6.22          print "done."
    6.23  
     7.1 --- a/viff/__init__.py	Wed Apr 23 15:58:17 2008 +0200
     7.2 +++ b/viff/__init__.py	Wed Apr 23 16:18:25 2008 +0200
     7.3 @@ -124,5 +124,5 @@
     7.4  @see: U{http://viff.dk/}
     7.5  """
     7.6  
     7.7 -__version__ = '0.4'
     7.8 +__version__ = '0.5rc1'
     7.9  __license__ = 'GNU GPL'
     8.1 --- a/viff/util.py	Wed Apr 23 15:58:17 2008 +0200
     8.2 +++ b/viff/util.py	Wed Apr 23 16:18:25 2008 +0200
     8.3 @@ -201,7 +201,7 @@
     8.4      If a prime is given as the lower bound, then this prime is
     8.5      returned:
     8.6  
     8.7 -    >> find_prime(37)
     8.8 +    >>> find_prime(37)
     8.9      37L
    8.10  
    8.11      The bound can be a Python expression as a string. This makes it