Merge from tags/0.11.

adegtyarev · Jun 15, 2013 · 6e46f15 · 6e46f15
1 parent 2e8b757
commit 6e46f15
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/Changelog b/Changelog
@@ -10,6 +10,9 @@ Changes with version 0.11                                           22 Feb 2013
 	* Feature: example messages from standard are added in "examples"
 	  directory.
 
+	* Feature: set SUPERCOP environment when configuring to prepare this
+	  implementation to run on SUPERCOP toolkit.
+
 	* Bugfix: variables, structures, functions changed their names from
 	  *GOST3411* to fully-qualified *GOST34112012*
 

diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ rmconfig:
 	rm -f $(CONFIGS)
 
 clean: rmconfig
-	rm -f gost3411-2012 *.core core auto/Makefile
+	rm -f gost3411-2012 *.core core auto/Makefile api.h
 
 dist: clean
 	mkdir -p $(DISTNAME)

diff --git a/README b/README
@@ -201,7 +201,8 @@ Linux   powerpc
 Performance
 -----------
 To measure performance of this implementation SUPERCOP toolkit has been
-used.
+used.  You can set SUPERCOP environment variable to any value and then
+run `make configure' to prepare this implementation to run on SUPERCOP.
 
 Intel(R) Pentium(R) CPU G6950 @ 2.80GHz    x86: 40 cycles per byte ( 70 MB/s)
 Intel(R) Pentium(R) CPU G6950 @ 2.80GHz x86_64: 36 cycles per byte ( 78 MB/s)

diff --git a/configure b/configure
@@ -45,3 +45,10 @@ compile:
 EOF
 
 mv ${AUTO_CONF_H}.t ${AUTO_CONF_H}
+
+if [ ! -z "${SUPERCOP}" ]; then
+    cat >api.h <<EOF
+#define CRYPTO_BYTES 64
+#define CRYPTO_VERSION "`cat VERSION`"
+EOF
+fi