Preparing for 2.0 release

diff --git a/INSTALL b/INSTALL
index 25590009a2bae07bf76acdc6102ec10fc141e735..41e7a04f489cf8df82dae3b0f11aadcb6eb5bb0d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -4,9 +4,35 @@ website and, for example, run tests with benchmarks:
     % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz
     % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz.sig
     % gpg --verify gogost-1.1.tar.xz.sig gogost-1.1.tar.xz
     % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz
     % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz.sig
     % gpg --verify gogost-1.1.tar.xz.sig gogost-1.1.tar.xz

-    % xz -d < gogost-1.1.tar.gz | tar xf -
+    % xz -d < gogost-1.1.tar.xz | tar xf -

     % make -C gogost-1.1 bench
 
     % make -C gogost-1.1 bench
 

+And then you can include its source code in your project for example
+like this:
+
+    % mkdir -p myproj/src
+    % export GOPATH=$PWD/myproj
+    % cd myproj/src
+    % cat > main.go <<EOF
+    package main
+
+    import (
+        "encoding/hex"
+        "fmt"
+
+        "cypherpunks.ru/gogost/gost34112012256"
+    )
+
+    func main() {
+        h := gost34112012256.New()
+        h.Write([]byte("hello world"))
+        fmt.Println(hex.EncodeToString(h.Sum(nil)))
+    }
+    EOF
+    % cp -r ../../gogost-1.1/src/cypherpunks.ru .
+    % go run main.go
+    c600fd9dd049cf8abd2f5b32e840d2cb0e41ea44de1c155dcd88dc84fe58a855
+

 You have to verify downloaded tarballs integrity and authenticity to be
 sure that you retrieved trusted and untampered software. GNU Privacy
 Guard is used for that purpose.
 You have to verify downloaded tarballs integrity and authenticity to be
 sure that you retrieved trusted and untampered software. GNU Privacy
 Guard is used for that purpose.

diff --git a/VERSION b/VERSION
index 9459d4ba2a0d3cc475f89ed03a13a1517c04798e..cd5ac039d67e0bdadb17976e4ac39f0ffe6bb6e4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1
+2.0

diff --git a/makedist.sh b/makedist.sh
index e6f06791c9da2c36a9ef2fdbeedefd949b5fef0e..8647c55dbab6a2b0c81cbff53c1dbdd15b8821d4 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -8,9 +8,20 @@ release=$1
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
 git checkout $release
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
 git checkout $release

-
+git submodule update --init
+
+mkdir -p src/cypherpunks.ru/gogost/vendor
+cat > $tmp/includes <<EOF
+golang.org/x/crypto/AUTHORS
+golang.org/x/crypto/CONTRIBUTORS
+golang.org/x/crypto/LICENSE
+golang.org/x/crypto/PATENTS
+golang.org/x/crypto/README
+golang.org/x/crypto/pbkdf2
+EOF
+tar cfCI - src $tmp/includes | tar xfC - src/cypherpunks.ru/gogost/vendor

 find . -name .git -type d | xargs rm -fr
 find . -name .git -type d | xargs rm -fr

-rm -f www* makedist* TODO
+rm -fr www* makedist* TODO src/golang.org $tmp/includes

 
 cd ..
 tar cvf gogost-"$release".tar gogost-"$release"
 
 cd ..
 tar cvf gogost-"$release".tar gogost-"$release"

diff --git a/www.texi b/www.texi
index f4aec720279a772a42762eb3cc1ff45660808cc7..40e944d021f537b8dac24545194839cf88640bb0 100644 (file)
--- a/www.texi
+++ b/www.texi
@@ -91,10 +91,38 @@ website and, for example, run tests with benchmarks:
 % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz
 % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz.sig
 % gpg --verify gogost-1.1.tar.xz.sig gogost-1.1.tar.xz
 % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz
 % wget http://www.cypherpunks.ru/gogost/gogost-1.1.tar.xz.sig
 % gpg --verify gogost-1.1.tar.xz.sig gogost-1.1.tar.xz

-% xz -d < gogost-1.1.tar.gz | tar xf -
+% xz -d < gogost-1.1.tar.xz | tar xf -

 % make -C gogost-1.1 bench
 @end verbatim
 
 % make -C gogost-1.1 bench
 @end verbatim
 

+And then you can include its source code in your project for example
+like this:
+
+@verbatim
+% mkdir -p myproj/src
+% export GOPATH=$PWD/myproj
+% cd myproj/src
+% cat > main.go <<EOF
+package main
+
+import (
+    "encoding/hex"
+    "fmt"
+
+    "cypherpunks.ru/gogost/gost34112012256"
+)
+
+func main() {
+    h := gost34112012256.New()
+    h.Write([]byte("hello world"))
+    fmt.Println(hex.EncodeToString(h.Sum(nil)))
+}
+EOF
+% cp -r ../../gogost-1.1/src/cypherpunks.ru .
+% go run main.go
+c600fd9dd049cf8abd2f5b32e840d2cb0e41ea44de1c155dcd88dc84fe58a855
+@end verbatim
+

 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Size @tab Tarball @tab SHA256 checksum @tab Streebog-256 checksum
 
 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Size @tab Tarball @tab SHA256 checksum @tab Streebog-256 checksum