Skip to content

Commit

Permalink
refactoring, renaming internally everything from verificatum to vfork…
Browse files Browse the repository at this point in the history
… and adapting fork for agora
  • Loading branch information
Eduardo Robles Elvira committed Apr 30, 2015
1 parent 1ad2879 commit b95013a
Show file tree
Hide file tree
Showing 883 changed files with 4,656 additions and 7,765 deletions.
5 changes: 3 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Authors of Verificatum (in chronological order of initial contribution)
Authors of Vfork (in chronological order of initial contribution)

Douglas Wikstr�m Main author

Eduardo Robles Elvira Contributor
David Ruescas Contributor
1 change: 0 additions & 1 deletion ChangeLog

This file was deleted.

28 changes: 14 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@
# License along with JGMPMEE. If not, see
# <http://www.gnu.org/licenses/>.

SUBDIRS = . gmpmee jgmpmee jecn verificatum
SUBDIRS = . gmpmee jgmpmee jecn vfork

dist_noinst_DATA = .version.m4 checkinstall lazysetup

.PHONY : cleandoc


# We set up variables such that JGMPMEE can find the GMPMEE library,
# and Verificatum can find the JGMPMEE jar-file.
# and Vfork can find the JGMPMEE jar-file.
PWD := $(shell pwd)
export C_INCLUDE_PATH := $(C_INCLUDE_PATH):$(PWD)/gmpmee:$(PWD)/jecn
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PWD)/gmpmee/.libs:$(PWD)/jgmpmee/native/.libs:$(PWD)/jecn/native/.libs
export CLASSPATH := $(PWD)/jgmpmee/jgmpmee.jar:$(PWD)/jecn/jecn.jar:.:$(CLASSPATH):$(PWD)/verificatum/verificatum.jar
export CLASSPATH := $(PWD)/jgmpmee/jgmpmee.jar:$(PWD)/jecn/jecn.jar:.:$(CLASSPATH):$(PWD)/vfork/vfork.jar


# The .verificatum_env file attempts to set all the necessary
# The .vfork_env file attempts to set all the necessary
# environment variables.
all-local: .verificatum_env
.verificatum_env:
$(MAKE) -C verificatum .verificatum_env
cp verificatum/.verificatum_env .
all-local: .vfork_env
.vfork_env:
$(MAKE) -C vfork .vfork_env
cp vfork/.vfork_env .

doc: .doc.stamp
.doc.stamp:
Expand All @@ -50,19 +50,19 @@ doc: .doc.stamp
$(MAKE) -C jecn doc
mkdir -p doc/jecn
cp -R jecn/doc/* doc/jecn
$(MAKE) -C verificatum doc
mkdir -p doc/verificatum
cp -R verificatum/doc/* doc/verificatum
cp -R verificatum/doc/.verificatum_env doc/verificatum
$(MAKE) -C vfork doc
mkdir -p doc/vfork
cp -R vfork/doc/* doc/vfork
cp -R vfork/doc/.vfork_env doc/vfork
@touch .doc.stamp

clean-local:
rm -f .verificatum_env
rm -f .vfork_env
rm -rf doc
rm -f .doc.stamp

cleandoc: clean-local
$(MAKE) -C gmpmee cleandoc
$(MAKE) -C jgmpmee cleandoc
$(MAKE) -C jecn cleandoc
$(MAKE) -C verificatum cleandoc
$(MAKE) -C vfork cleandoc
28 changes: 14 additions & 14 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,11 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = . gmpmee jgmpmee jecn verificatum
SUBDIRS = . gmpmee jgmpmee jecn vfork
dist_noinst_DATA = .version.m4 checkinstall lazysetup

# We set up variables such that JGMPMEE can find the GMPMEE library,
# and Verificatum can find the JGMPMEE jar-file.
# and Vfork can find the JGMPMEE jar-file.
PWD := $(shell pwd)
all: all-recursive

Expand Down Expand Up @@ -683,14 +683,14 @@ uninstall-am:
.PHONY : cleandoc
export C_INCLUDE_PATH := $(C_INCLUDE_PATH):$(PWD)/gmpmee:$(PWD)/jecn
export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PWD)/gmpmee/.libs:$(PWD)/jgmpmee/native/.libs:$(PWD)/jecn/native/.libs
export CLASSPATH := $(PWD)/jgmpmee/jgmpmee.jar:$(PWD)/jecn/jecn.jar:.:$(CLASSPATH):$(PWD)/verificatum/verificatum.jar
export CLASSPATH := $(PWD)/jgmpmee/jgmpmee.jar:$(PWD)/jecn/jecn.jar:.:$(CLASSPATH):$(PWD)/vfork/vfork.jar

# The .verificatum_env file attempts to set all the necessary
# The .vfork_env file attempts to set all the necessary
# environment variables.
all-local: .verificatum_env
.verificatum_env:
$(MAKE) -C verificatum .verificatum_env
cp verificatum/.verificatum_env .
all-local: .vfork_env
.vfork_env:
$(MAKE) -C vfork .vfork_env
cp vfork/.vfork_env .

doc: .doc.stamp
.doc.stamp:
Expand All @@ -703,22 +703,22 @@ doc: .doc.stamp
$(MAKE) -C jecn doc
mkdir -p doc/jecn
cp -R jecn/doc/* doc/jecn
$(MAKE) -C verificatum doc
mkdir -p doc/verificatum
cp -R verificatum/doc/* doc/verificatum
cp -R verificatum/doc/.verificatum_env doc/verificatum
$(MAKE) -C vfork doc
mkdir -p doc/vfork
cp -R vfork/doc/* doc/vfork
cp -R vfork/doc/.vfork_env doc/vfork
@touch .doc.stamp

clean-local:
rm -f .verificatum_env
rm -f .vfork_env
rm -rf doc
rm -f .doc.stamp

cleandoc: clean-local
$(MAKE) -C gmpmee cleandoc
$(MAKE) -C jgmpmee cleandoc
$(MAKE) -C jecn cleandoc
$(MAKE) -C verificatum cleandoc
$(MAKE) -C vfork cleandoc

# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Expand Down
5 changes: 0 additions & 5 deletions NEWS

This file was deleted.

19 changes: 8 additions & 11 deletions README → README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@


VERIFICATUM (FULL)
VFORK (FULL)

This is a meta-package that builds and installs GMPMEE, JGMPMEE, and
Verificatum. Please follow the instructions of verificatum/README, but
Vfork. Please follow the instructions of vfork/README, but
execute the commands in this directory. This will install everything
you need.

If you are lazy and adventurous you may instead try a suitable script
from the .lazysetup subdirectory. These are scripts that attempt to
build and install everything you need. The script should be executed
from the top directory, e.g.:

./lazysetup/ubuntu_10.04

Currently this ONLY WORKS FOR 64-bit platforms due to a bug in libtool
that performs incorrect relinking on 32-bit platforms. If you are on a
32-bit platform, then you should make and install each sub-package
separately and in the order GMPMEE, JGMPMEE, and Verificatum.
separately and in the order GMPMEE, JGMPMEE, and Vfork.

Vfork is a fork of Verificatum. Verificatum AB
(http://verificatum.com) currently maintains a more updated, though
not libre software, version of verificatum. Currently, Agora Voting
maintains Vfork, which is a fork of the LGPL version of verificatum.

##########################################################
##################### WARNING! ###########################
Expand Down
10 changes: 5 additions & 5 deletions checkinstall
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

# Copyright 2008 2009 2010 Douglas Wikstrom

# This file is part of Verificatum.
# This file is part of Vfork.

# Verificatum is free software: you can redistribute it and/or modify
# Vfork is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.

# Verificatum is distributed in the hope that it will be useful, but
# Vfork is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.

# You should have received a copy of the GNU Lesser General Public
# License along with Verificatum. If not, see
# License along with Vfork. If not, see
# <http://www.gnu.org/licenses/>.


cd ./verificatum
cd ./vfork
./checkinstall
28 changes: 14 additions & 14 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for verificatum-full 1.0.7.
# Generated by GNU Autoconf 2.65 for vfork-full 1.0.7.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -549,10 +549,10 @@ MFLAGS=
MAKEFLAGS=

# Identity of this package.
PACKAGE_NAME='verificatum-full'
PACKAGE_TARNAME='verificatum-full'
PACKAGE_NAME='vfork-full'
PACKAGE_TARNAME='vfork-full'
PACKAGE_VERSION='1.0.7'
PACKAGE_STRING='verificatum-full 1.0.7'
PACKAGE_STRING='vfork-full 1.0.7'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -640,7 +640,7 @@ enable_option_checking
ac_precious_vars='build_alias
host_alias
target_alias'
ac_subdirs_all='gmpmee jgmpmee jecn verificatum'
ac_subdirs_all='gmpmee jgmpmee jecn vfork'

# Initialize some variables set by options.
ac_init_help=
Expand Down Expand Up @@ -1181,7 +1181,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures verificatum-full 1.0.7 to adapt to many kinds of systems.
\`configure' configures vfork-full 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1230,7 +1230,7 @@ Fine tuning of the installation directories:
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
[DATAROOTDIR/doc/verificatum-full]
[DATAROOTDIR/doc/vfork-full]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
Expand All @@ -1253,7 +1253,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of verificatum-full 1.0.7:";;
short | recursive ) echo "Configuration of vfork-full 1.0.7:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1320,7 +1320,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
verificatum-full configure 1.0.7
vfork-full configure 1.0.7
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
Expand All @@ -1337,7 +1337,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by verificatum-full $as_me 1.0.7, which was
It was created by vfork-full $as_me 1.0.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2255,7 +2255,7 @@ fi


# Define the identity of the package.
PACKAGE='verificatum-full'
PACKAGE='vfork-full'
VERSION='1.0.7'


Expand Down Expand Up @@ -2383,7 +2383,7 @@ ac_configure_args="$ac_configure_args --enable-jgmpmee --disable-check_gmpmee --



subdirs="$subdirs gmpmee jgmpmee jecn verificatum"
subdirs="$subdirs gmpmee jgmpmee jecn vfork"


ac_config_files="$ac_config_files Makefile"
Expand Down Expand Up @@ -2930,7 +2930,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by verificatum-full $as_me 1.0.7, which was
This file was extended by vfork-full $as_me 1.0.7, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -2983,7 +2983,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
verificatum-full config.status 1.0.7
vfork-full config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.63])
AC_INIT([verificatum-full], [m4_esyscmd([m4 .version.m4])], [[email protected]])
AC_INIT([vfork-full], [m4_esyscmd([m4 .version.m4])], [[email protected]])
AC_CANONICAL_SYSTEM # Must appear before AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([tar-ustar -Wall -Werror -Wno-portability])

# Avoid complaints about jgmpmee not being installed.
ac_configure_args="$ac_configure_args --enable-jgmpmee --disable-check_gmpmee --disable-check_jgmpmee --enable-jecn --disable-check_jecn"

AC_CONFIG_SUBDIRS([gmpmee jgmpmee jecn verificatum])
AC_CONFIG_SUBDIRS([gmpmee jgmpmee jecn vfork])

AC_CONFIG_FILES([Makefile])
AC_OUTPUT
6 changes: 3 additions & 3 deletions gmpmee/.doc/html/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>

<head>
<title>Verificatum</title>
<title>Vfork</title>
<link rel="shortcut icon" href="favicon.ico">
<link rel="stylesheet" href="gmpmee.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
Expand All @@ -25,7 +25,7 @@ <h1><font size="+4">GMP Modular Exponentiation Extension</font></h1>
integer functions. It was written
by <a href="http://www.csc.kth.se/~tege">Torbjörn Granlund</a> and
<a href="AUTHOR_WWW">Douglas Wikström</a> to speed up some
operations in the <a href="http://www.verificatum.com">Verificatum</a>
operations in the <a href="http://www.vfork.com">Vfork</a>
library. GMPMEE is licensed under
the <a href="http://www.gnu.org/copyleft/lesser.html">GNU Lesser
General Public License (LGPL)</a>.
Expand All @@ -39,7 +39,7 @@ <h1><font size="+4">GMP Modular Exponentiation Extension</font></h1>

<p>

<a href="http://www.verificatum.com/download/gmpmee-0.1.5.tar.gz">gmpmee-0.1.5.tar.gz</a>
<a href="http://www.vfork.com/download/gmpmee-0.1.5.tar.gz">gmpmee-0.1.5.tar.gz</a>

<hr>

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions gmpmee/.doc/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>

<head>
<title>Verificatum</title>
<title>Vfork</title>
<link rel="shortcut icon" href="favicon.ico">
<link rel="stylesheet" href="gmpmee.css">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
Expand All @@ -25,7 +25,7 @@ <h1><font size="+4">GMP Modular Exponentiation Extension</font></h1>
integer functions. It was written
by <a href="http://www.csc.kth.se/~tege">Torbjörn Granlund</a> and
<a href="AUTHOR_WWW">Douglas Wikström</a> to speed up some
operations in the <a href="VERIFICATUM_WWW">Verificatum</a>
operations in the <a href="VFORK_WWW">Vfork</a>
library. GMPMEE is licensed under
the <a href="http://www.gnu.org/copyleft/lesser.html">GNU Lesser
General Public License (LGPL)</a>.
Expand Down
File renamed without changes.
Loading

0 comments on commit b95013a

Please sign in to comment.