delete the unused (#323)

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/bench_test.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/bench_test.go
deleted file mode 100644 (file)
index afadd56..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/bench_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package chainkd
-
-import (
-       "log"
-       "testing"
-)
-
-var (
-       benchXprv XPrv
-       benchXpub XPub
-       benchMsg  = []byte("Hello, world!")
-       benchSig  []byte
-)
-
-func init() {
-       var err error
-       benchXprv, err = NewXPrv(nil)
-       if err != nil {
-               log.Fatalln(err)
-       }
-       benchXpub = benchXprv.XPub()
-       benchSig = benchXprv.Sign(benchMsg)
-}
-
-func BenchmarkXPrvChildNonHardened(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               benchXprv.Child(benchMsg, false)
-       }
-}
-
-func BenchmarkXPrvChildHardened(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               benchXprv.Child(benchMsg, true)
-       }
-}
-
-func BenchmarkXPubChild(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               benchXpub.Child(benchMsg)
-       }
-}
-
-func BenchmarkXPrvSign(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               benchXprv.Sign(benchMsg)
-       }
-}
-
-func BenchmarkXPubVerify(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               benchXpub.Verify(benchMsg, benchSig)
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd.go
deleted file mode 100644 (file)
index 3629fec..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package chainkd
-
-import (
-       "crypto/hmac"
-       "crypto/rand"
-       "crypto/sha512"
-       "io"
-
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/ecmath"
-)
-
-type (
-       //XPrv external private key
-       XPrv [64]byte
-       //XPub external public key
-       XPub [64]byte
-)
-
-// NewXPrv takes a source of random bytes and produces a new XPrv.
-// If r is nil, crypto/rand.Reader is used.
-func NewXPrv(r io.Reader) (xprv XPrv, err error) {
-       if r == nil {
-               r = rand.Reader
-       }
-       var entropy [64]byte
-       _, err = io.ReadFull(r, entropy[:])
-       if err != nil {
-               return xprv, err
-       }
-       return RootXPrv(entropy[:]), nil
-}
-
-// RootXPrv takes a seed binary string and produces a new xprv.
-func RootXPrv(seed []byte) (xprv XPrv) {
-       h := hmac.New(sha512.New, []byte{'R', 'o', 'o', 't'})
-       h.Write(seed)
-       h.Sum(xprv[:0])
-       pruneRootScalar(xprv[:32])
-       return
-}
-
-// XPub derives an extended public key from a given xprv.
-func (xprv XPrv) XPub() (xpub XPub) {
-       var scalar ecmath.Scalar
-       copy(scalar[:], xprv[:32])
-
-       var P ecmath.Point
-       P.ScMulBase(&scalar)
-       buf := P.Encode()
-
-       copy(xpub[:32], buf[:])
-       copy(xpub[32:], xprv[32:])
-
-       return
-}
-
-// Child derives a child xprv based on `selector` string and `hardened` flag.
-// If `hardened` is false, child xpub can be derived independently
-// from the parent xpub without using the parent xprv.
-// If `hardened` is true, child key can only be derived from the parent xprv.
-func (xprv XPrv) Child(sel []byte, hardened bool) XPrv {
-       if hardened {
-               return xprv.hardenedChild(sel)
-       }
-       return xprv.nonhardenedChild(sel)
-}
-
-func (xprv XPrv) hardenedChild(sel []byte) (res XPrv) {
-       h := hmac.New(sha512.New, xprv[32:])
-       h.Write([]byte{'H'})
-       h.Write(xprv[:32])
-       h.Write(sel)
-       h.Sum(res[:0])
-       pruneRootScalar(res[:32])
-       return
-}
-
-func (xprv XPrv) nonhardenedChild(sel []byte) (res XPrv) {
-       xpub := xprv.XPub()
-
-       h := hmac.New(sha512.New, xpub[32:])
-       h.Write([]byte{'N'})
-       h.Write(xpub[:32])
-       h.Write(sel)
-       h.Sum(res[:0])
-
-       pruneIntermediateScalar(res[:32])
-
-       // Unrolled the following loop:
-       // var carry int
-       // carry = 0
-       // for i := 0; i < 32; i++ {
-       //         sum := int(xprv[i]) + int(res[i]) + carry
-       //         res[i] = byte(sum & 0xff)
-       //         carry = (sum >> 8)
-       // }
-
-       sum := int(0)
-
-       sum = int(xprv[0]) + int(res[0]) + (sum >> 8)
-       res[0] = byte(sum & 0xff)
-       sum = int(xprv[1]) + int(res[1]) + (sum >> 8)
-       res[1] = byte(sum & 0xff)
-       sum = int(xprv[2]) + int(res[2]) + (sum >> 8)
-       res[2] = byte(sum & 0xff)
-       sum = int(xprv[3]) + int(res[3]) + (sum >> 8)
-       res[3] = byte(sum & 0xff)
-       sum = int(xprv[4]) + int(res[4]) + (sum >> 8)
-       res[4] = byte(sum & 0xff)
-       sum = int(xprv[5]) + int(res[5]) + (sum >> 8)
-       res[5] = byte(sum & 0xff)
-       sum = int(xprv[6]) + int(res[6]) + (sum >> 8)
-       res[6] = byte(sum & 0xff)
-       sum = int(xprv[7]) + int(res[7]) + (sum >> 8)
-       res[7] = byte(sum & 0xff)
-       sum = int(xprv[8]) + int(res[8]) + (sum >> 8)
-       res[8] = byte(sum & 0xff)
-       sum = int(xprv[9]) + int(res[9]) + (sum >> 8)
-       res[9] = byte(sum & 0xff)
-       sum = int(xprv[10]) + int(res[10]) + (sum >> 8)
-       res[10] = byte(sum & 0xff)
-       sum = int(xprv[11]) + int(res[11]) + (sum >> 8)
-       res[11] = byte(sum & 0xff)
-       sum = int(xprv[12]) + int(res[12]) + (sum >> 8)
-       res[12] = byte(sum & 0xff)
-       sum = int(xprv[13]) + int(res[13]) + (sum >> 8)
-       res[13] = byte(sum & 0xff)
-       sum = int(xprv[14]) + int(res[14]) + (sum >> 8)
-       res[14] = byte(sum & 0xff)
-       sum = int(xprv[15]) + int(res[15]) + (sum >> 8)
-       res[15] = byte(sum & 0xff)
-       sum = int(xprv[16]) + int(res[16]) + (sum >> 8)
-       res[16] = byte(sum & 0xff)
-       sum = int(xprv[17]) + int(res[17]) + (sum >> 8)
-       res[17] = byte(sum & 0xff)
-       sum = int(xprv[18]) + int(res[18]) + (sum >> 8)
-       res[18] = byte(sum & 0xff)
-       sum = int(xprv[19]) + int(res[19]) + (sum >> 8)
-       res[19] = byte(sum & 0xff)
-       sum = int(xprv[20]) + int(res[20]) + (sum >> 8)
-       res[20] = byte(sum & 0xff)
-       sum = int(xprv[21]) + int(res[21]) + (sum >> 8)
-       res[21] = byte(sum & 0xff)
-       sum = int(xprv[22]) + int(res[22]) + (sum >> 8)
-       res[22] = byte(sum & 0xff)
-       sum = int(xprv[23]) + int(res[23]) + (sum >> 8)
-       res[23] = byte(sum & 0xff)
-       sum = int(xprv[24]) + int(res[24]) + (sum >> 8)
-       res[24] = byte(sum & 0xff)
-       sum = int(xprv[25]) + int(res[25]) + (sum >> 8)
-       res[25] = byte(sum & 0xff)
-       sum = int(xprv[26]) + int(res[26]) + (sum >> 8)
-       res[26] = byte(sum & 0xff)
-       sum = int(xprv[27]) + int(res[27]) + (sum >> 8)
-       res[27] = byte(sum & 0xff)
-       sum = int(xprv[28]) + int(res[28]) + (sum >> 8)
-       res[28] = byte(sum & 0xff)
-       sum = int(xprv[29]) + int(res[29]) + (sum >> 8)
-       res[29] = byte(sum & 0xff)
-       sum = int(xprv[30]) + int(res[30]) + (sum >> 8)
-       res[30] = byte(sum & 0xff)
-       sum = int(xprv[31]) + int(res[31]) + (sum >> 8)
-       res[31] = byte(sum & 0xff)
-
-       if (sum >> 8) != 0 {
-               panic("sum does not fit in 256-bit int")
-       }
-       return
-}
-
-// Child derives a child xpub based on `selector` string.
-// The corresponding child xprv can be derived from the parent xprv
-// using non-hardened derivation: `parentxprv.Child(sel, false)`.
-func (xpub XPub) Child(sel []byte) (res XPub) {
-       h := hmac.New(sha512.New, xpub[32:])
-       h.Write([]byte{'N'})
-       h.Write(xpub[:32])
-       h.Write(sel)
-       h.Sum(res[:0])
-
-       pruneIntermediateScalar(res[:32])
-
-       var (
-               f ecmath.Scalar
-               F ecmath.Point
-       )
-       copy(f[:], res[:32])
-       F.ScMulBase(&f)
-
-       var (
-               pubkey [32]byte
-               P      ecmath.Point
-       )
-       copy(pubkey[:], xpub[:32])
-       _, ok := P.Decode(pubkey)
-       if !ok {
-               panic("XPub should have been validated on initialization")
-       }
-
-       P.Add(&P, &F)
-       pubkey = P.Encode()
-       copy(res[:32], pubkey[:])
-
-       return
-}
-
-// Derive generates a child xprv by recursively deriving
-// non-hardened child xprvs over the list of selectors:
-// `Derive([a,b,c,...]) == Child(a).Child(b).Child(c)...`
-func (xprv XPrv) Derive(path [][]byte) XPrv {
-       res := xprv
-       for _, p := range path {
-               res = res.Child(p, false)
-       }
-       return res
-}
-
-// Derive generates a child xpub by recursively deriving
-// non-hardened child xpubs over the list of selectors:
-// `Derive([a,b,c,...]) == Child(a).Child(b).Child(c)...`
-func (xpub XPub) Derive(path [][]byte) XPub {
-       res := xpub
-       for _, p := range path {
-               res = res.Child(p)
-       }
-       return res
-}
-
-// Sign creates an EdDSA signature using expanded private key
-// derived from the xprv.
-func (xprv XPrv) Sign(msg []byte) []byte {
-       return Ed25519InnerSign(xprv.ExpandedPrivateKey(), msg)
-}
-
-// Verify checks an EdDSA signature using public key
-// extracted from the first 32 bytes of the xpub.
-func (xpub XPub) Verify(msg []byte, sig []byte) bool {
-       return ed25519.Verify(xpub.PublicKey(), msg, sig)
-}
-
-// ExpandedPrivateKey generates a 64-byte key where
-// the first half is the scalar copied from xprv,
-// and the second half is the `prefix` is generated via PRF
-// from the xprv.
-func (xprv XPrv) ExpandedPrivateKey() ExpandedPrivateKey {
-       var res [64]byte
-       h := hmac.New(sha512.New, []byte{'E', 'x', 'p', 'a', 'n', 'd'})
-       h.Write(xprv[:])
-       h.Sum(res[:0])
-       copy(res[:32], xprv[:32])
-       return res[:]
-}
-
-// PublicKey extracts the ed25519 public key from an xpub.
-func (xpub XPub) PublicKey() ed25519.PublicKey {
-       return ed25519.PublicKey(xpub[:32])
-}
-
-// s must be >= 32 bytes long and gets rewritten in place.
-// This is NOT the same pruning as in Ed25519: it additionally clears the third
-// highest bit to ensure subkeys do not overflow the second highest bit.
-func pruneRootScalar(s []byte) {
-       s[0] &= 248
-       s[31] &= 31 // clear top 3 bits
-       s[31] |= 64 // set second highest bit
-}
-
-// Clears lowest 3 bits and highest 23 bits of `f`.
-func pruneIntermediateScalar(f []byte) {
-       f[0] &= 248 // clear bottom 3 bits
-       f[29] &= 1  // clear 7 high bits
-       f[30] = 0   // clear 8 bits
-       f[31] = 0   // clear 8 bits
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd_test.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd_test.go
deleted file mode 100644 (file)
index da3a002..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/chainkd_test.go
+++ /dev/null
@@ -1,279 +0,0 @@
-package chainkd
-
-import (
-       "bytes"
-       "encoding/hex"
-       "fmt"
-       "reflect"
-       "testing"
-)
-
-func TestVectors1(t *testing.T) {
-       root := RootXPrv([]byte{0x01, 0x02, 0x03})
-
-       verifyTestVector(t, "Root(010203).xprv", root.hex(),
-               "50f8c532ce6f088de65c2c1fbc27b491509373fab356eba300dfa7cc587b07483bc9e0d93228549c6888d3f68ad664b92c38f5ea8ca07181c1410949c02d3146")
-       verifyTestVector(t, "Root(010203).xpub", root.XPub().hex(),
-               "e11f321ffef364d01c2df2389e61091b15dab2e8eee87cb4c053fa65ed2812993bc9e0d93228549c6888d3f68ad664b92c38f5ea8ca07181c1410949c02d3146")
-
-       verifyTestVector(t, "Root(010203)/010203(H).xprv", root.Child([]byte{0x01, 0x02, 0x03}, true).hex(),
-               "6023c8e7633a9353a59bd930ea6dc397e400b1088b86b4a15d8de8567554df5574274bc1a0bd93b4494cb68e45c5ec5aefc1eed4d0c3bfd53b0b4e679ce52028")
-       verifyTestVector(t, "Root(010203)/010203(H).xpub", root.Child([]byte{0x01, 0x02, 0x03}, true).XPub().hex(),
-               "eabebab4184c63f8df07efe31fb588a0ae222318087458b4936bf0b0feab015074274bc1a0bd93b4494cb68e45c5ec5aefc1eed4d0c3bfd53b0b4e679ce52028")
-
-       verifyTestVector(t, "Root(010203)/010203(N).xprv", root.Child([]byte{0x01, 0x02, 0x03}, false).hex(),
-               "705afd25a0e242b7333105d77cbb0ec15e667154916bbed5084c355dba7b0748b0faca523928f42e685ee6deb0cb3d41a09617783c87e9a161a04f2207ad4d2f")
-       verifyTestVector(t, "Root(010203)/010203(N).xpub", root.Child([]byte{0x01, 0x02, 0x03}, false).XPub().hex(),
-               "c0bbd87142e7bf90abfbb3d0cccc210c6d7eb3f912c35f205302c86ae9ef6eefb0faca523928f42e685ee6deb0cb3d41a09617783c87e9a161a04f2207ad4d2f")
-       verifyTestVector(t, "Root(010203)/010203(N).xpub", root.XPub().Child([]byte{0x01, 0x02, 0x03}).hex(),
-               "c0bbd87142e7bf90abfbb3d0cccc210c6d7eb3f912c35f205302c86ae9ef6eefb0faca523928f42e685ee6deb0cb3d41a09617783c87e9a161a04f2207ad4d2f")
-
-       verifyTestVector(t, "Root(010203)/010203(H)/“”(N).xprv", root.Child([]byte{0x01, 0x02, 0x03}, true).Child([]byte{}, false).hex(),
-               "7023f9877813348ca8e67b29d551baf98a43cfb76cdff538f3ff97074a55df5560e3aa7fb600f61a84317a981dc9d1f7e8df2e8a3f8b544a21d2404e0b4e480a")
-       verifyTestVector(t, "Root(010203)/010203(H)/“”(N).xpub", root.Child([]byte{0x01, 0x02, 0x03}, true).Child([]byte{}, false).XPub().hex(),
-               "4e44c9ab8a45b9d1c3daab5c09d73b01209220ea704808f04feaa3614c7c7ba760e3aa7fb600f61a84317a981dc9d1f7e8df2e8a3f8b544a21d2404e0b4e480a")
-       verifyTestVector(t, "Root(010203)/010203(H)/“”(N).xpub", root.Child([]byte{0x01, 0x02, 0x03}, true).XPub().Child([]byte{}).hex(),
-               "4e44c9ab8a45b9d1c3daab5c09d73b01209220ea704808f04feaa3614c7c7ba760e3aa7fb600f61a84317a981dc9d1f7e8df2e8a3f8b544a21d2404e0b4e480a")
-
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(H).xprv", root.Child([]byte{0x01, 0x02, 0x03}, false).Child([]byte{}, true).hex(),
-               "90b60b007e866dacc4b1f844089a805ffd78a295f5b0544034116ace354c58523410b1e6a3c557ca90c322f6ff4b5e547242965eaed8c34767765f0e05ed0e4f")
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(H).xpub", root.Child([]byte{0x01, 0x02, 0x03}, false).Child([]byte{}, true).XPub().hex(),
-               "ca97ec34ef30aa08ebd19b9848b11ebadf9c0ad3a0be6b11d33d9558573aca633410b1e6a3c557ca90c322f6ff4b5e547242965eaed8c34767765f0e05ed0e4f")
-
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xprv", root.Child([]byte{0x01, 0x02, 0x03}, false).Child([]byte{}, false).hex(),
-               "d81ba3ab554a7d09bfd8bda5089363399b7f4b19d4f1806ca0c35feabf7b074856648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xpub", root.Child([]byte{0x01, 0x02, 0x03}, false).Child([]byte{}, false).XPub().hex(),
-               "28279bcb06aee9e5c0302f4e1db879ac7f5444ec07266a736dd571c21961427b56648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xpub", root.XPub().Child([]byte{0x01, 0x02, 0x03}).Child([]byte{}).hex(),
-               "28279bcb06aee9e5c0302f4e1db879ac7f5444ec07266a736dd571c21961427b56648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xprv", root.Derive([][]byte{[]byte{0x01, 0x02, 0x03}, []byte{}}).hex(),
-               "d81ba3ab554a7d09bfd8bda5089363399b7f4b19d4f1806ca0c35feabf7b074856648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xprv", root.Derive([][]byte{[]byte{0x01, 0x02, 0x03}, []byte{}}).XPub().hex(),
-               "28279bcb06aee9e5c0302f4e1db879ac7f5444ec07266a736dd571c21961427b56648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-       verifyTestVector(t, "Root(010203)/010203(N)/“”(N).xpub", root.XPub().Derive([][]byte{[]byte{0x01, 0x02, 0x03}, []byte{}}).hex(),
-               "28279bcb06aee9e5c0302f4e1db879ac7f5444ec07266a736dd571c21961427b56648f55e21bec3aa5df0bce0236aea88a4cc5c395c896df63676f095154bb7b")
-}
-
-func TestVectors2(t *testing.T) {
-       seed, _ := hex.DecodeString("fffcf9f6f3f0edeae7e4e1dedbd8d5d2cfccc9c6c3c0bdbab7b4b1aeaba8a5a29f9c999693908d8a8784817e7b7875726f6c696663605d5a5754514e4b484542")
-       root := RootXPrv(seed)
-
-       verifyTestVector(t, "Root(fffcf9...).xprv", root.hex(),
-               "0031615bdf7906a19360f08029354d12eaaedc9046806aefd672e3b93b024e495a95ba63cf47903eb742cd1843a5252118f24c0c496e9213bd42de70f649a798")
-       verifyTestVector(t, "Root(fffcf9...).xpub", root.XPub().hex(),
-               "f153ef65bbfaec3c8fd4fceb0510529048094093cf7c14970013282973e117545a95ba63cf47903eb742cd1843a5252118f24c0c496e9213bd42de70f649a798")
-
-       verifyTestVector(t, "Root(fffcf9...)/0(N).xprv", root.Child([]byte{0x00}, false).hex(),
-               "883e65e6e86499bdd170c14d67e62359dd020dd63056a75ff75983a682024e49e8cc52d8e74c5dfd75b0b326c8c97ca7397b7f954ad0b655b8848bfac666f09f")
-       verifyTestVector(t, "Root(fffcf9...)/0(N).xpub", root.Child([]byte{0x00}, false).XPub().hex(),
-               "f48b7e641d119b8ddeaf97aca104ee6e6a780ab550d40534005443550ef7e7d8e8cc52d8e74c5dfd75b0b326c8c97ca7397b7f954ad0b655b8848bfac666f09f")
-       verifyTestVector(t, "Root(fffcf9...)/0(N).xpub", root.XPub().Child([]byte{0x00}).hex(),
-               "f48b7e641d119b8ddeaf97aca104ee6e6a780ab550d40534005443550ef7e7d8e8cc52d8e74c5dfd75b0b326c8c97ca7397b7f954ad0b655b8848bfac666f09f")
-
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H).xprv", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).hex(),
-               "5048fa4498bf65e2b10d26e6c99cc43556ecfebf8b9fddf8bd2150ba29d63154044ef557a3aa4cb6ae8b61e87cb977a929bc4a170e4faafc2661231f5f3f78e8")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).XPub().hex(),
-               "a8555c5ee5054ad03c6c6661968d66768fa081103bf576ea63a26c00ca7eab69044ef557a3aa4cb6ae8b61e87cb977a929bc4a170e4faafc2661231f5f3f78e8")
-
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N).xprv", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).hex(),
-               "480f6aa25f7c9f4a569896f06614303a697f00ee8d240c6277605d44e0d63154174c386ad6ae01e54acd7bb422243c6055058f4231e250050134283a76de8eff")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).XPub().hex(),
-               "7385ab0b06eacc226c8035bab1ff9bc6972c7700d1caede26fe2b4d57b208bd0174c386ad6ae01e54acd7bb422243c6055058f4231e250050134283a76de8eff")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).XPub().Child([]byte{0x01}).hex(),
-               "7385ab0b06eacc226c8035bab1ff9bc6972c7700d1caede26fe2b4d57b208bd0174c386ad6ae01e54acd7bb422243c6055058f4231e250050134283a76de8eff")
-
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N)/2147483646(H).xprv", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).Child([]byte{0xfe, 0xff, 0xff, 0x7f}, true).hex(),
-               "386014c6dfeb8dadf62f0e5acacfbf7965d5746c8b9011df155a31df7be0fb59986c923d979d89310acd82171dbaa7b73b20b2033ac6819d7f309212ff3fbabd")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N)/2147483646(H).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).Child([]byte{0xfe, 0xff, 0xff, 0x7f}, true).XPub().hex(),
-               "9f66aa8019427a825dd72a13ce982454d99f221c8d4874db59f52c2945cbcabd986c923d979d89310acd82171dbaa7b73b20b2033ac6819d7f309212ff3fbabd")
-
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N)/2147483646(H)/2(N).xprv", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).Child([]byte{0xfe, 0xff, 0xff, 0x7f}, true).Child([]byte{0x02}, false).hex(),
-               "08c3772f5c0eee42f40d00f4faff9e4c84e5db3c4e7f28ecb446945a1de1fb59ef9d0a352f3252ea673e8b6bd31ac97218e019e845bdc545c268cd52f7af3f5d")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N)/2147483646(H)/2(N).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).Child([]byte{0xfe, 0xff, 0xff, 0x7f}, true).Child([]byte{0x02}, false).XPub().hex(),
-               "67388f59a7b62644c3c6148575770e56969d77244530263bc9659b8563d7ff81ef9d0a352f3252ea673e8b6bd31ac97218e019e845bdc545c268cd52f7af3f5d")
-       verifyTestVector(t, "Root(fffcf9...)/0(N)/2147483647(H)/1(N)/2147483646(H)/2(N).xpub", root.Child([]byte{0x00}, false).Child([]byte{0xff, 0xff, 0xff, 0x7f}, true).Child([]byte{0x01}, false).Child([]byte{0xfe, 0xff, 0xff, 0x7f}, true).XPub().Child([]byte{0x02}).hex(),
-               "67388f59a7b62644c3c6148575770e56969d77244530263bc9659b8563d7ff81ef9d0a352f3252ea673e8b6bd31ac97218e019e845bdc545c268cd52f7af3f5d")
-}
-
-func TestExpandedPrivateKey(t *testing.T) {
-       root := RootXPrv([]byte{0xca, 0xfe})
-       verifyTestVector(t, "Root(cafe).xprv", root.hex(),
-               "a0cde08fd2ea06e16dd5d21e64ca0609fa1d719b79fed4245a5b8ada0242464cebbc2b9e1e989aca72d9766efd9b63ebcfc968027ef27cb786babb7897f9248a")
-       verifyTestVector(t, "Root(cafe).xprv.expandedkey", root.ExpandedPrivateKey().hex(),
-               "a0cde08fd2ea06e16dd5d21e64ca0609fa1d719b79fed4245a5b8ada0242464c1437c8234e21e43eb9c79df0ce370dc82d4c7a952ef317e716b0762146bb61a0")
-
-       child := root.Child([]byte{0xbe, 0xef}, false)
-       verifyTestVector(t, "Root(cafe)/beef.xprv", child.hex(),
-               "684df1aa25e0425c48c76392f42abc87a359ef2a2328ad31e53318128242464cf85916f4261b03f71afa64ad4bc2be4f335f15e433e815b45bbd15fcc7d1a864")
-       verifyTestVector(t, "Root(cafe)/beef.xprv.expandedkey", child.ExpandedPrivateKey().hex(),
-               "684df1aa25e0425c48c76392f42abc87a359ef2a2328ad31e53318128242464c0abdda57709eff7e9c60e0d4199065a6941122566c0a30ffa3ce0449d0582278")
-}
-
-func TestChildKeys(t *testing.T) {
-       rootXPrv, err := NewXPrv(nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-       rootXPub := rootXPrv.XPub()
-
-       msg := []byte("In the face of ignorance and resistance I wrote financial systems into existence")
-
-       sig := rootXPrv.Sign(msg)
-       doverify(t, rootXPub, msg, sig, "root xpub", "root xprv")
-
-       sel := []byte{1, 2, 3}
-       dprv := rootXPrv.Child(sel, false)
-       dpub := rootXPub.Child(sel)
-
-       sig = dprv.Sign(msg)
-       doverify(t, dpub, msg, sig, "derived xpub", "derived xprv")
-
-       dpub = dprv.XPub()
-       doverify(t, dpub, msg, sig, "xpub from derived xprv", "derived xprv")
-
-       dprv = dprv.Child(sel, false)
-       sig = dprv.Sign(msg)
-       dpub = dpub.Child(sel)
-       doverify(t, dpub, msg, sig, "double-derived xpub", "double-derived xprv")
-
-       for i := byte(0); i < 10; i++ {
-               sel := []byte{i}
-
-               // Non-hardened children
-               dprv := rootXPrv.Child(sel, false)
-               if reflect.DeepEqual(dprv, rootXPrv) {
-                       t.Errorf("derived private key %d is the same as the root", i)
-               }
-               dpub1 := rootXPub.Child(sel)
-               if reflect.DeepEqual(dpub1, rootXPub) {
-                       t.Errorf("derived public key %d is the same as the root", i)
-               }
-               sig := dprv.Sign(msg)
-               doverify(t, dpub1, msg, sig, fmt.Sprintf("derived pubkey (%d)", i), "derived xprv")
-
-               for j := byte(0); j < 10; j++ {
-                       sel2 := []byte{j}
-                       ddprv := dprv.Child(sel2, false)
-                       if reflect.DeepEqual(ddprv, dprv) {
-                               t.Errorf("rootXPrv.Child(%d).Child(%d) is the same as its parent", i, j)
-                       }
-                       ddpub1 := dpub1.Child(sel2)
-                       if reflect.DeepEqual(ddpub1, dpub1) {
-                               t.Errorf("rootXPub.Child(%d).Child(%d) is the same as its parent", i, j)
-                       }
-                       sig = ddprv.Sign(msg)
-                       doverify(t, ddpub1, msg, sig, fmt.Sprintf("double-derived pubkey (%d, %d)", i, j), "double-derived xprv")
-               }
-
-               // Hardened children
-               hdprv := rootXPrv.Child(sel, true)
-               if reflect.DeepEqual(hdprv, rootXPrv) {
-                       t.Errorf("derived hardened privkey %d is the same as the root", i)
-               }
-               if reflect.DeepEqual(hdprv, dprv) {
-                       t.Errorf("derived hardened privkey %d is the same as the unhardened derived privkey", i)
-               }
-               hdpub := hdprv.XPub()
-               if reflect.DeepEqual(hdpub, dpub1) {
-                       t.Errorf("pubkey of hardened child %d is the same as pubkey of non-hardened child", i)
-               }
-               sig = hdprv.Sign(msg)
-               doverify(t, hdpub, msg, sig, fmt.Sprintf("pubkey of hardened child %d", i), "derived xprv")
-       }
-}
-
-func doverify(t *testing.T, xpub XPub, msg, sig []byte, xpubdesc, xprvdesc string) {
-       if !xpub.Verify(msg, sig) {
-               t.Errorf("%s cannot verify signature from %s", xpubdesc, xprvdesc)
-       }
-
-       for i := 0; i < 32; i++ {
-               for mask := byte(1); mask != 0; mask <<= 1 {
-                       xpub[i] ^= mask
-                       if xpub.Verify(msg, sig) {
-                               t.Fatalf("altered %s should not verify signature from %s", xpubdesc, xprvdesc)
-                       }
-                       xpub[i] ^= mask
-               }
-       }
-
-       // permute only 1/7th of the bits to make tests run faster
-       for i := 0; i < len(msg); i += 7 {
-               for mask := byte(1); mask != 0; mask <<= 1 {
-                       msg[i] ^= mask
-                       if xpub.Verify(msg, sig) {
-                               t.Fatalf("%s should not verify signature from %s against altered message", xpubdesc, xprvdesc)
-                       }
-                       msg[i] ^= mask
-               }
-       }
-
-       for i := 0; i < len(sig); i++ {
-               for mask := byte(1); mask != 0; mask <<= 1 {
-                       sig[i] ^= mask
-                       if xpub.Verify(msg, sig) {
-                               t.Fatalf("%s should not verify altered signature from %s", xpubdesc, xprvdesc)
-                       }
-                       sig[i] ^= mask
-               }
-       }
-}
-
-func verifyTestVector(t *testing.T, message string, got []byte, want string) {
-       if !bytes.Equal(got, []byte(want)) {
-               t.Errorf("ChainKD Test Vector: %s:\n    got  = %s\n    want = %s", message, got, want)
-       }
-}
-
-func (xpub XPub) hex() []byte {
-       s, _ := xpub.MarshalText()
-       return s
-}
-
-func (xprv XPrv) hex() []byte {
-       s, _ := xprv.MarshalText()
-       return s
-}
-
-func (key ExpandedPrivateKey) hex() []byte {
-       hexBytes := make([]byte, hex.EncodedLen(len(key[:])))
-       hex.Encode(hexBytes, key[:])
-       return hexBytes
-}
-
-func TestBits(t *testing.T) {
-       for i := 0; i < 256; i++ {
-               root := RootXPrv([]byte{byte(i)})
-
-               rootbytes := root.Bytes()
-               if rootbytes[0]&7 != 0 {
-                       t.Errorf("ChainKD root key must have low 3 bits set to '000'")
-               }
-               if (rootbytes[31] >> 5) != 2 {
-                       t.Errorf("ChainKD root key must have high 3 bits set to '010'")
-               }
-
-               xprv := root
-               for d := 0; d < 1000; d++ { // at least after 1000 levels necessary bits are survived
-                       xprv = xprv.Child([]byte("child"), false)
-                       xprvbytes := xprv.Bytes()
-
-                       if xprvbytes[0]&7 != 0 {
-                               t.Errorf("ChainKD non-hardened child key must have low 3 bits set to '000'")
-                       }
-                       if xprvbytes[31]>>6 != 1 {
-                               t.Errorf("ChainKD non-hardened child key must have high 2 bits set to '10' (LE)")
-                       }
-
-                       hchild := xprv.Child([]byte("hardened child"), true)
-                       hchildbytes := hchild.Bytes()
-                       if hchildbytes[0]&7 != 0 {
-                               t.Errorf("ChainKD hardened key must have low 3 bits set to '000'")
-                       }
-                       if (hchildbytes[31] >> 5) != 2 {
-                               t.Errorf("ChainKD hardened key must have high 3 bits set to '010'")
-                       }
-               }
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key.go
deleted file mode 100644 (file)
index fbc5db1..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Package chainkd This is an extension to ed25519.Sign that is compatible with NaCl `crypto_sign`
-// function taking 64-byte expanded private key (where the left part is a pre-multiplied
-// scalar and the right part is "prefix" used for generating a nonce).
-//
-// Invariants:
-// 1) Expanded(PrivateKey).Sign() == PrivateKey.Sign()
-// 2) InnerSign(Expanded(PrivateKey)) == Sign(PrivateKey)
-package chainkd
-
-import (
-       "crypto"
-       "crypto/sha512"
-       "errors"
-       "io"
-       "strconv"
-
-       "github.com/bytom/crypto/ed25519"
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
-)
-
-const (
-       // ExpandedPrivateKeySize is the size, in bytes, of a "secret key" as defined in NaCl.
-       ExpandedPrivateKeySize = 64
-)
-
-// ExpandedPrivateKey is the type of NaCl secret keys. It implements crypto.Signer.
-type ExpandedPrivateKey []byte
-
-// Public returns the PublicKey corresponding to secret key.
-func (priv ExpandedPrivateKey) Public() crypto.PublicKey {
-       var A edwards25519.ExtendedGroupElement
-       var scalar [32]byte
-       copy(scalar[:], priv[:32])
-       edwards25519.GeScalarMultBase(&A, &scalar)
-       var publicKeyBytes [32]byte
-       A.ToBytes(&publicKeyBytes)
-       return ed25519.PublicKey(publicKeyBytes[:])
-}
-
-func expandEd25519PrivateKey(priv ed25519.PrivateKey) ExpandedPrivateKey {
-       digest := sha512.Sum512(priv[:32])
-       digest[0] &= 248
-       digest[31] &= 127
-       digest[31] |= 64
-       return ExpandedPrivateKey(digest[:])
-}
-
-// Sign signs the given message with expanded private key.
-// Ed25519 performs two passes over messages to be signed and therefore cannot
-// handle pre-hashed messages. Thus opts.HashFunc() must return zero to
-// indicate the message hasn't been hashed. This can be achieved by passing
-// crypto.Hash(0) as the value for opts.
-func (priv ExpandedPrivateKey) Sign(rand io.Reader, message []byte, opts crypto.SignerOpts) (signature []byte, err error) {
-       if opts.HashFunc() != crypto.Hash(0) {
-               return nil, errors.New("ed25519: cannot sign hashed message")
-       }
-
-       return Ed25519InnerSign(priv, message), nil
-}
-
-// Ed25519InnerSign signs the message with expanded private key and returns a signature.
-// It will panic if len(privateKey) is not ExpandedPrivateKeySize.
-func Ed25519InnerSign(privateKey ExpandedPrivateKey, message []byte) []byte {
-       if l := len(privateKey); l != ExpandedPrivateKeySize {
-               panic("ed25519: bad private key length: " + strconv.Itoa(l))
-       }
-
-       var messageDigest, hramDigest [64]byte
-
-       h := sha512.New()
-       h.Write(privateKey[32:])
-       h.Write(message)
-       h.Sum(messageDigest[:0])
-
-       var messageDigestReduced [32]byte
-       edwards25519.ScReduce(&messageDigestReduced, &messageDigest)
-       var R edwards25519.ExtendedGroupElement
-       edwards25519.GeScalarMultBase(&R, &messageDigestReduced)
-
-       var encodedR [32]byte
-       R.ToBytes(&encodedR)
-
-       publicKey := privateKey.Public().(ed25519.PublicKey)
-       h.Reset()
-       h.Write(encodedR[:])
-       h.Write(publicKey[:])
-       h.Write(message)
-       h.Sum(hramDigest[:0])
-       var hramDigestReduced [32]byte
-       edwards25519.ScReduce(&hramDigestReduced, &hramDigest)
-
-       var sk [32]byte
-       copy(sk[:], privateKey[:32])
-       var s [32]byte
-       edwards25519.ScMulAdd(&s, &hramDigestReduced, &sk, &messageDigestReduced)
-
-       signature := make([]byte, ed25519.SignatureSize)
-       copy(signature[:], encodedR[:])
-       copy(signature[32:], s[:])
-
-       return signature
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key_test.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key_test.go
deleted file mode 100644 (file)
index 355ce1f..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/expanded_key_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package chainkd
-
-import (
-       "bytes"
-       "crypto"
-       "testing"
-
-       "github.com/bytom/crypto/ed25519"
-)
-
-// Testing basic InnerSign+Verify and the invariants:
-// 1) Expand(PrivateKey).Sign() == PrivateKey.Sign()
-// 2) InnerSign(Expand(PrivateKey)) == Sign(PrivateKey)
-
-type zeroReader struct{}
-
-func (zeroReader) Read(buf []byte) (int, error) {
-       for i := range buf {
-               buf[i] = 0
-       }
-       return len(buf), nil
-}
-
-func TestInnerSignVerify(t *testing.T) {
-       var zero zeroReader
-       public, private, _ := ed25519.GenerateKey(zero)
-       expprivate := expandEd25519PrivateKey(private)
-
-       message := []byte("test message")
-       sig := Ed25519InnerSign(expprivate, message)
-       if !ed25519.Verify(public, message, sig) {
-               t.Errorf("valid signature rejected")
-       }
-
-       wrongMessage := []byte("wrong message")
-       if ed25519.Verify(public, wrongMessage, sig) {
-               t.Errorf("signature of different message accepted")
-       }
-}
-
-func TestExpandedKeySignerInterfaceInvariant(t *testing.T) {
-       var zero zeroReader
-       public, private, _ := ed25519.GenerateKey(zero)
-       expprivate := expandEd25519PrivateKey(private)
-
-       signer1 := crypto.Signer(private)
-       signer2 := crypto.Signer(expprivate)
-
-       publicInterface1 := signer1.Public()
-       publicInterface2 := signer2.Public()
-       public1, ok := publicInterface1.(ed25519.PublicKey)
-       if !ok {
-               t.Fatalf("expected PublicKey from Public() but got %T", publicInterface1)
-       }
-       public2, ok := publicInterface2.(ed25519.PublicKey)
-       if !ok {
-               t.Fatalf("expected PublicKey from Public() but got %T", publicInterface2)
-       }
-
-       if !bytes.Equal(public, public1) {
-               t.Errorf("public keys do not match: original:%x vs Public():%x", public, public1)
-       }
-       if !bytes.Equal(public, public2) {
-               t.Errorf("public keys do not match: original:%x vs Public():%x", public, public2)
-       }
-
-       message := []byte("message")
-       var noHash crypto.Hash
-       signature1, err := signer1.Sign(zero, message, noHash)
-       if err != nil {
-               t.Fatalf("error from Sign(): %s", err)
-       }
-       signature2, err := signer2.Sign(zero, message, noHash)
-       if err != nil {
-               t.Fatalf("error from Sign(): %s", err)
-       }
-       if !bytes.Equal(signature1[:], signature2[:]) {
-               t.Errorf(".Sign() should return identical signatures for Signer(privkey) and Signer(Expand(privkey))")
-       }
-       if !ed25519.Verify(public, message, signature1) {
-               t.Errorf("Verify failed on signature from Sign()")
-       }
-}
-
-func TestInnerSignInvariant(t *testing.T) {
-       var zero zeroReader
-       _, private, _ := ed25519.GenerateKey(zero)
-       expprivate := expandEd25519PrivateKey(private)
-
-       message := []byte("test message")
-       sig1 := ed25519.Sign(private, message)
-       sig2 := Ed25519InnerSign(expprivate, message)
-
-       if !bytes.Equal(sig1[:], sig2[:]) {
-               t.Errorf("InnerSign(Expand(privkey)) must return the same as Sign(privkey)")
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize.go
deleted file mode 100644 (file)
index 81b435a..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package chainkd
-
-import (
-       "encoding/hex"
-       "errors"
-)
-
-const (
-       extendedPublicKeySize  = 64
-       extendedPrivateKeySize = 64
-)
-
-var (
-       ErrBadKeyLen = errors.New("bad key length")
-       ErrBadKeyStr = errors.New("bad key string")
-)
-
-func (xpub XPub) MarshalText() ([]byte, error) {
-       hexBytes := make([]byte, hex.EncodedLen(len(xpub.Bytes())))
-       hex.Encode(hexBytes, xpub.Bytes())
-       return hexBytes, nil
-}
-
-func (xpub XPub) Bytes() []byte {
-       return xpub[:]
-}
-
-func (xprv XPrv) MarshalText() ([]byte, error) {
-       hexBytes := make([]byte, hex.EncodedLen(len(xprv.Bytes())))
-       hex.Encode(hexBytes, xprv.Bytes())
-       return hexBytes, nil
-}
-
-func (xprv XPrv) Bytes() []byte {
-       return xprv[:]
-}
-
-func (xpub *XPub) UnmarshalText(inp []byte) error {
-       if len(inp) != 2*extendedPublicKeySize {
-               return ErrBadKeyStr
-       }
-       _, err := hex.Decode(xpub[:], inp)
-       return err
-}
-
-func (xpub XPub) String() string {
-       return hex.EncodeToString(xpub.Bytes())
-}
-
-func (xprv *XPrv) UnmarshalText(inp []byte) error {
-       if len(inp) != 2*extendedPrivateKeySize {
-               return ErrBadKeyStr
-       }
-       _, err := hex.Decode(xprv[:], inp)
-       return err
-}
-
-func (xprv XPrv) String() string {
-       return hex.EncodeToString(xprv.Bytes())
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize_test.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize_test.go
deleted file mode 100644 (file)
index 142549d..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/serialize_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package chainkd
-
-import (
-       "bytes"
-       "encoding/hex"
-       "encoding/json"
-       "reflect"
-       "testing"
-)
-
-func TestMarshalingFuncs(t *testing.T) {
-       xprv, err := NewXPrv(nil)
-       if err != nil {
-               t.Fatal(err)
-       }
-
-       want := make([]byte, hex.EncodedLen(len(xprv.Bytes())))
-       hex.Encode(want, xprv.Bytes())
-
-       got, err := json.Marshal(xprv)
-       if err != nil {
-               t.Fatal(err)
-       }
-       // First and last bytes are "
-       if !reflect.DeepEqual(want, got[1:len(got)-1]) {
-               t.Errorf("marshaling error: want = %+v, got = %+v", want, got)
-       }
-
-       secXprv := new(XPrv)
-       err = json.Unmarshal(got, &secXprv)
-       if err != nil {
-               t.Fatal(err)
-       }
-       if !bytes.Equal(xprv[:], secXprv[:]) {
-               t.Errorf("unmarshaling error: want = %+v, got = %+v", xprv, secXprv)
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/chainkd/util.go b/vendor/github.com/bytom/crypto/ed25519/chainkd/util.go
deleted file mode 100644 (file)
index 194b20e..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/chainkd/util.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package chainkd
-
-import (
-       "io"
-
-       "github.com/bytom/crypto/ed25519"
-)
-
-// Utility functions
-
-func NewXKeys(r io.Reader) (xprv XPrv, xpub XPub, err error) {
-       xprv, err = NewXPrv(r)
-       if err != nil {
-               return
-       }
-       return xprv, xprv.XPub(), nil
-}
-
-func XPubKeys(xpubs []XPub) []ed25519.PublicKey {
-       res := make([]ed25519.PublicKey, 0, len(xpubs))
-       for _, xpub := range xpubs {
-               res = append(res, xpub.PublicKey())
-       }
-       return res
-}
-
-func DeriveXPubs(xpubs []XPub, path [][]byte) []XPub {
-       res := make([]XPub, 0, len(xpubs))
-       for _, xpub := range xpubs {
-               d := xpub.Derive(path)
-               res = append(res, d)
-       }
-       return res
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/ecmath/point.go b/vendor/github.com/bytom/crypto/ed25519/ecmath/point.go
deleted file mode 100644 (file)
index 9ec0d75..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/ecmath/point.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package ecmath
-
-import (
-       "crypto/subtle"
-
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
-)
-
-// Point is a point on the ed25519 curve.
-type Point edwards25519.ExtendedGroupElement
-
-// ZeroPoint is the zero point on the ed25519 curve (not the zero value of Point).
-var ZeroPoint Point
-
-// Add adds the points in x and y, storing the result in z and
-// returning that. Any or all of x, y, and z may be the same pointers.
-func (z *Point) Add(x, y *Point) *Point {
-       var y2 edwards25519.CachedGroupElement
-       (*edwards25519.ExtendedGroupElement)(y).ToCached(&y2)
-
-       var z2 edwards25519.CompletedGroupElement
-       edwards25519.GeAdd(&z2, (*edwards25519.ExtendedGroupElement)(x), &y2)
-
-       z2.ToExtended((*edwards25519.ExtendedGroupElement)(z))
-       return z
-}
-
-// Sub subtracts y from x, storing the result in z and
-// returning that. Any or all of x, y, and z may be the same pointers.
-func (z *Point) Sub(x, y *Point) *Point {
-       var y2 edwards25519.CachedGroupElement
-       (*edwards25519.ExtendedGroupElement)(y).ToCached(&y2)
-
-       var z2 edwards25519.CompletedGroupElement
-       edwards25519.GeSub(&z2, (*edwards25519.ExtendedGroupElement)(x), &y2)
-
-       z2.ToExtended((*edwards25519.ExtendedGroupElement)(z))
-       return z
-}
-
-// ScMul multiplies the EC point x by the scalar y, placing the result
-// in z and returning that. X and z may be the same pointer.
-func (z *Point) ScMul(x *Point, y *Scalar) *Point {
-       return z.ScMulAdd(x, y, &Zero)
-}
-
-// ScMulBase multiplies the ed25519 base point by x and places the
-// result in z, returning that.
-func (z *Point) ScMulBase(x *Scalar) *Point {
-       edwards25519.GeScalarMultBase((*edwards25519.ExtendedGroupElement)(z), (*[32]byte)(x))
-       return z
-}
-
-// ScMulAdd computes xa+yB, where B is the ed25519 base point, and
-// places the result in z, returning that.
-func (z *Point) ScMulAdd(a *Point, x, y *Scalar) *Point {
-       // TODO: replace with constant-time implementation to avoid
-       // sidechannel attacks
-
-       var p edwards25519.ProjectiveGroupElement
-       edwards25519.GeDoubleScalarMultVartime(&p, (*[32]byte)(x), (*edwards25519.ExtendedGroupElement)(a), (*[32]byte)(y))
-
-       var buf [32]byte
-       p.ToBytes(&buf)
-       // TODO(bobg): double-check that it's OK to ignore the return value
-       // from ExtendedGroupElement.FromBytes here. (It's a bool indicating
-       // that its input represented a legal value.)
-       (*edwards25519.ExtendedGroupElement)(z).FromBytes(&buf)
-       return z
-}
-
-func (z *Point) Encode() [32]byte {
-       var e [32]byte
-       (*edwards25519.ExtendedGroupElement)(z).ToBytes(&e)
-       return e
-}
-
-func (z *Point) Decode(e [32]byte) (*Point, bool) {
-       ok := (*edwards25519.ExtendedGroupElement)(z).FromBytes(&e)
-       return z, ok
-}
-
-func (z *Point) ConstTimeEqual(x *Point) bool {
-       xe := x.Encode()
-       ze := z.Encode()
-       return subtle.ConstantTimeCompare(xe[:], ze[:]) == 1
-}
-
-func init() {
-       (*edwards25519.ExtendedGroupElement)(&ZeroPoint).Zero()
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/ecmath/point_test.go b/vendor/github.com/bytom/crypto/ed25519/ecmath/point_test.go
deleted file mode 100644 (file)
index 4de539a..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/ecmath/point_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package ecmath
-
-import "testing"
-
-// base is the ed25519 base point
-var base Point
-
-func init() {
-       base.ScMulBase(&One)
-}
-
-func TestBasePointArith(t *testing.T) {
-       var base1 Point
-       base1.ScMul(&base, &One)
-       if !base.ConstTimeEqual(&base1) {
-               ebase := base.Encode()
-               ebase1 := base1.Encode()
-               t.Errorf("base [%x] != 1*base [%x]", ebase[:], ebase1[:])
-       }
-
-       Two := One
-       Two.Add(&Two, &One)
-
-       base2a := base
-       base2a.Add(&base2a, &base)
-
-       base2b := base
-       base2b.ScMul(&base2b, &Two)
-
-       if !base2a.ConstTimeEqual(&base2b) {
-               ebase2a := base2a.Encode()
-               ebase2b := base2b.Encode()
-               t.Errorf("base+base [%x] != 2*base [%x] (1)", ebase2a[:], ebase2b[:])
-       }
-
-       var base2c Point
-       base2c.ScMulBase(&Two)
-
-       if !base2a.ConstTimeEqual(&base2c) {
-               ebase2a := base2a.Encode()
-               ebase2c := base2c.Encode()
-               t.Errorf("base+base [%x] != 2*base [%x] (2)", ebase2a[:], ebase2c[:])
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/ed25519/ecmath/scalar.go b/vendor/github.com/bytom/crypto/ed25519/ecmath/scalar.go
deleted file mode 100644 (file)
index 651f2ca..0000000
--- a/vendor/github.com/bytom/crypto/ed25519/ecmath/scalar.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package ecmath
-
-import (
-       "crypto/subtle"
-
-       "github.com/bytom/crypto/ed25519/internal/edwards25519"
-)
-
-// Scalar is a 256-bit little-endian scalar.
-type Scalar [32]byte
-
-var (
-       // Zero is the number 0.
-       Zero Scalar
-
-       // One is the number 1.
-       One = Scalar{1}
-
-       // NegOne is the number -1 mod L
-       NegOne = Scalar{
-               0xec, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
-               0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-       }
-
-       // L is the subgroup order:
-       // 2^252 + 27742317777372353535851937790883648493
-       L = Scalar{
-               0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
-               0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
-       }
-)
-
-// Add computes x+y (mod L) and places the result in z, returning
-// that. Any or all of x, y, and z may be the same pointer.
-func (z *Scalar) Add(x, y *Scalar) *Scalar {
-       return z.MulAdd(x, &One, y)
-}
-
-// Sub computes x-y (mod L) and places the result in z, returning
-// that. Any or all of x, y, and z may be the same pointer.
-func (z *Scalar) Sub(x, y *Scalar) *Scalar {
-       return z.MulAdd(y, &NegOne, x)
-}
-
-// Neg negates x (mod L) and places the result in z, returning that. X
-// and z may be the same pointer.
-func (z *Scalar) Neg(x *Scalar) *Scalar {
-       return z.MulAdd(x, &NegOne, &Zero)
-}
-
-// MulAdd computes ab+c (mod L) and places the result in z, returning
-// that. Any or all of the pointers may be the same.
-func (z *Scalar) MulAdd(a, b, c *Scalar) *Scalar {
-       edwards25519.ScMulAdd((*[32]byte)(z), (*[32]byte)(a), (*[32]byte)(b), (*[32]byte)(c))
-       return z
-}
-
-func (z *Scalar) Equal(x *Scalar) bool {
-       return subtle.ConstantTimeCompare(x[:], z[:]) == 1
-}
-
-// Prune performs the pruning operation in-place.
-func (z *Scalar) Prune() {
-       z[0] &= 248
-       z[31] &= 127
-       z[31] |= 64
-}
-
-// Reduce takes a 512-bit scalar and reduces it mod L, placing the
-// result in z and returning that.
-func (z *Scalar) Reduce(x *[64]byte) *Scalar {
-       edwards25519.ScReduce((*[32]byte)(z), x)
-       return z
-}

diff --git a/vendor/github.com/bytom/crypto/randentropy/rand_entropy.go b/vendor/github.com/bytom/crypto/randentropy/rand_entropy.go
deleted file mode 100644 (file)
index 71ce1cd..0000000
--- a/vendor/github.com/bytom/crypto/randentropy/rand_entropy.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package randentropy
-
-import (
-       crand "crypto/rand"
-       "io"
-)
-
-var Reader io.Reader = &randEntropy{}
-
-type randEntropy struct {
-}
-
-func (*randEntropy) Read(bytes []byte) (n int, err error) {
-       readBytes := GetEntropyCSPRNG(len(bytes))
-       copy(bytes, readBytes)
-       return len(bytes), nil
-}
-
-func GetEntropyCSPRNG(n int) []byte {
-       mainBuff := make([]byte, n)
-       _, err := io.ReadFull(crand.Reader, mainBuff)
-       if err != nil {
-               panic("reading from crypto/rand failed: " + err.Error())
-       }
-       return mainBuff
-}

diff --git a/vendor/github.com/bytom/crypto/scrypt/example_test.go b/vendor/github.com/bytom/crypto/scrypt/example_test.go
deleted file mode 100644 (file)
index 6736479..0000000
--- a/vendor/github.com/bytom/crypto/scrypt/example_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package scrypt_test
-
-import (
-       "encoding/base64"
-       "fmt"
-       "log"
-
-       "golang.org/x/crypto/scrypt"
-)
-
-func Example() {
-       // DO NOT use this salt value; generate your own random salt. 8 bytes is
-       // a good length.
-       salt := []byte{0xc8, 0x28, 0xf2, 0x58, 0xa7, 0x6a, 0xad, 0x7b}
-
-       dk, err := scrypt.Key([]byte("some password"), salt, 1<<15, 8, 1, 32)
-       if err != nil {
-               log.Fatal(err)
-       }
-       fmt.Println(base64.StdEncoding.EncodeToString(dk))
-       // Output: lGnMz8io0AUkfzn6Pls1qX20Vs7PGN6sbYQ2TQgY12M=
-}

diff --git a/vendor/github.com/bytom/crypto/scrypt/scrypt.go b/vendor/github.com/bytom/crypto/scrypt/scrypt.go
deleted file mode 100644 (file)
index 0f14e56..0000000
--- a/vendor/github.com/bytom/crypto/scrypt/scrypt.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Package scrypt implements the scrypt key derivation function as defined in
-// Colin Percival's paper "Stronger Key Derivation via Sequential Memory-Hard
-// Functions" (https://www.tarsnap.com/scrypt/scrypt.pdf).
-
-// import "golang.org/x/crypto/scrypt"
-package scrypt
-
-import (
-       "crypto/sha256"
-       "errors"
-
-       "golang.org/x/crypto/pbkdf2"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-// blockCopy copies n numbers from src into dst.
-func blockCopy(dst, src []uint32, n int) {
-       copy(dst, src[:n])
-}
-
-// blockXOR XORs numbers from dst with n numbers from src.
-func blockXOR(dst, src []uint32, n int) {
-       for i, v := range src[:n] {
-               dst[i] ^= v
-       }
-}
-
-// salsaXOR applies Salsa20/8 to the XOR of 16 numbers from tmp and in,
-// and puts the result into both both tmp and out.
-func salsaXOR(tmp *[16]uint32, in, out []uint32) {
-       w0 := tmp[0] ^ in[0]
-       w1 := tmp[1] ^ in[1]
-       w2 := tmp[2] ^ in[2]
-       w3 := tmp[3] ^ in[3]
-       w4 := tmp[4] ^ in[4]
-       w5 := tmp[5] ^ in[5]
-       w6 := tmp[6] ^ in[6]
-       w7 := tmp[7] ^ in[7]
-       w8 := tmp[8] ^ in[8]
-       w9 := tmp[9] ^ in[9]
-       w10 := tmp[10] ^ in[10]
-       w11 := tmp[11] ^ in[11]
-       w12 := tmp[12] ^ in[12]
-       w13 := tmp[13] ^ in[13]
-       w14 := tmp[14] ^ in[14]
-       w15 := tmp[15] ^ in[15]
-
-       x0, x1, x2, x3, x4, x5, x6, x7, x8 := w0, w1, w2, w3, w4, w5, w6, w7, w8
-       x9, x10, x11, x12, x13, x14, x15 := w9, w10, w11, w12, w13, w14, w15
-
-       for i := 0; i < 8; i += 2 {
-               u := x0 + x12
-               x4 ^= u<<7 | u>>(32-7)
-               u = x4 + x0
-               x8 ^= u<<9 | u>>(32-9)
-               u = x8 + x4
-               x12 ^= u<<13 | u>>(32-13)
-               u = x12 + x8
-               x0 ^= u<<18 | u>>(32-18)
-
-               u = x5 + x1
-               x9 ^= u<<7 | u>>(32-7)
-               u = x9 + x5
-               x13 ^= u<<9 | u>>(32-9)
-               u = x13 + x9
-               x1 ^= u<<13 | u>>(32-13)
-               u = x1 + x13
-               x5 ^= u<<18 | u>>(32-18)
-
-               u = x10 + x6
-               x14 ^= u<<7 | u>>(32-7)
-               u = x14 + x10
-               x2 ^= u<<9 | u>>(32-9)
-               u = x2 + x14
-               x6 ^= u<<13 | u>>(32-13)
-               u = x6 + x2
-               x10 ^= u<<18 | u>>(32-18)
-
-               u = x15 + x11
-               x3 ^= u<<7 | u>>(32-7)
-               u = x3 + x15
-               x7 ^= u<<9 | u>>(32-9)
-               u = x7 + x3
-               x11 ^= u<<13 | u>>(32-13)
-               u = x11 + x7
-               x15 ^= u<<18 | u>>(32-18)
-
-               u = x0 + x3
-               x1 ^= u<<7 | u>>(32-7)
-               u = x1 + x0
-               x2 ^= u<<9 | u>>(32-9)
-               u = x2 + x1
-               x3 ^= u<<13 | u>>(32-13)
-               u = x3 + x2
-               x0 ^= u<<18 | u>>(32-18)
-
-               u = x5 + x4
-               x6 ^= u<<7 | u>>(32-7)
-               u = x6 + x5
-               x7 ^= u<<9 | u>>(32-9)
-               u = x7 + x6
-               x4 ^= u<<13 | u>>(32-13)
-               u = x4 + x7
-               x5 ^= u<<18 | u>>(32-18)
-
-               u = x10 + x9
-               x11 ^= u<<7 | u>>(32-7)
-               u = x11 + x10
-               x8 ^= u<<9 | u>>(32-9)
-               u = x8 + x11
-               x9 ^= u<<13 | u>>(32-13)
-               u = x9 + x8
-               x10 ^= u<<18 | u>>(32-18)
-
-               u = x15 + x14
-               x12 ^= u<<7 | u>>(32-7)
-               u = x12 + x15
-               x13 ^= u<<9 | u>>(32-9)
-               u = x13 + x12
-               x14 ^= u<<13 | u>>(32-13)
-               u = x14 + x13
-               x15 ^= u<<18 | u>>(32-18)
-       }
-       x0 += w0
-       x1 += w1
-       x2 += w2
-       x3 += w3
-       x4 += w4
-       x5 += w5
-       x6 += w6
-       x7 += w7
-       x8 += w8
-       x9 += w9
-       x10 += w10
-       x11 += w11
-       x12 += w12
-       x13 += w13
-       x14 += w14
-       x15 += w15
-
-       out[0], tmp[0] = x0, x0
-       out[1], tmp[1] = x1, x1
-       out[2], tmp[2] = x2, x2
-       out[3], tmp[3] = x3, x3
-       out[4], tmp[4] = x4, x4
-       out[5], tmp[5] = x5, x5
-       out[6], tmp[6] = x6, x6
-       out[7], tmp[7] = x7, x7
-       out[8], tmp[8] = x8, x8
-       out[9], tmp[9] = x9, x9
-       out[10], tmp[10] = x10, x10
-       out[11], tmp[11] = x11, x11
-       out[12], tmp[12] = x12, x12
-       out[13], tmp[13] = x13, x13
-       out[14], tmp[14] = x14, x14
-       out[15], tmp[15] = x15, x15
-}
-
-func blockMix(tmp *[16]uint32, in, out []uint32, r int) {
-       blockCopy(tmp[:], in[(2*r-1)*16:], 16)
-       for i := 0; i < 2*r; i += 2 {
-               salsaXOR(tmp, in[i*16:], out[i*8:])
-               salsaXOR(tmp, in[i*16+16:], out[i*8+r*16:])
-       }
-}
-
-func integer(b []uint32, r int) uint64 {
-       j := (2*r - 1) * 16
-       return uint64(b[j]) | uint64(b[j+1])<<32
-}
-
-func smix(b []byte, r, N int, v, xy []uint32) {
-       var tmp [16]uint32
-       x := xy
-       y := xy[32*r:]
-
-       j := 0
-       for i := 0; i < 32*r; i++ {
-               x[i] = uint32(b[j]) | uint32(b[j+1])<<8 | uint32(b[j+2])<<16 | uint32(b[j+3])<<24
-               j += 4
-       }
-       for i := 0; i < N; i += 2 {
-               blockCopy(v[i*(32*r):], x, 32*r)
-               blockMix(&tmp, x, y, r)
-
-               blockCopy(v[(i+1)*(32*r):], y, 32*r)
-               blockMix(&tmp, y, x, r)
-       }
-       for i := 0; i < N; i += 2 {
-               j := int(integer(x, r) & uint64(N-1))
-               blockXOR(x, v[j*(32*r):], 32*r)
-               blockMix(&tmp, x, y, r)
-
-               j = int(integer(y, r) & uint64(N-1))
-               blockXOR(y, v[j*(32*r):], 32*r)
-               blockMix(&tmp, y, x, r)
-       }
-       j = 0
-       for _, v := range x[:32*r] {
-               b[j+0] = byte(v >> 0)
-               b[j+1] = byte(v >> 8)
-               b[j+2] = byte(v >> 16)
-               b[j+3] = byte(v >> 24)
-               j += 4
-       }
-}
-
-// Key derives a key from the password, salt, and cost parameters, returning
-// a byte slice of length keyLen that can be used as cryptographic key.
-//
-// N is a CPU/memory cost parameter, which must be a power of two greater than 1.
-// r and p must satisfy r * p < 2³⁰. If the parameters do not satisfy the
-// limits, the function returns a nil byte slice and an error.
-//
-// For example, you can get a derived key for e.g. AES-256 (which needs a
-// 32-byte key) by doing:
-//
-//      dk, err := scrypt.Key([]byte("some password"), salt, 16384, 8, 1, 32)
-//
-// The recommended parameters for interactive logins as of 2017 are N=32768, r=8
-// and p=1. The parameters N, r, and p should be increased as memory latency and
-// CPU parallelism increases; consider setting N to the highest power of 2 you
-// can derive within 100 milliseconds. Remember to get a good random salt.
-func Key(password, salt []byte, N, r, p, keyLen int) ([]byte, error) {
-       if N <= 1 || N&(N-1) != 0 {
-               return nil, errors.New("scrypt: N must be > 1 and a power of 2")
-       }
-       if uint64(r)*uint64(p) >= 1<<30 || r > maxInt/128/p || r > maxInt/256 || N > maxInt/128/r {
-               return nil, errors.New("scrypt: parameters are too large")
-       }
-
-       xy := make([]uint32, 64*r)
-       v := make([]uint32, 32*N*r)
-       b := pbkdf2.Key(password, salt, 1, p*128*r, sha256.New)
-
-       for i := 0; i < p; i++ {
-               smix(b[i*128*r:], r, N, v, xy)
-       }
-
-       return pbkdf2.Key(password, b, 1, keyLen, sha256.New), nil
-}

diff --git a/vendor/github.com/bytom/crypto/scrypt/scrypt_test.go b/vendor/github.com/bytom/crypto/scrypt/scrypt_test.go
deleted file mode 100644 (file)
index 766ed8d..0000000
--- a/vendor/github.com/bytom/crypto/scrypt/scrypt_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package scrypt
-
-import (
-       "bytes"
-       "testing"
-)
-
-type testVector struct {
-       password string
-       salt     string
-       N, r, p  int
-       output   []byte
-}
-
-var good = []testVector{
-       {
-               "password",
-               "salt",
-               2, 10, 10,
-               []byte{
-                       0x48, 0x2c, 0x85, 0x8e, 0x22, 0x90, 0x55, 0xe6, 0x2f,
-                       0x41, 0xe0, 0xec, 0x81, 0x9a, 0x5e, 0xe1, 0x8b, 0xdb,
-                       0x87, 0x25, 0x1a, 0x53, 0x4f, 0x75, 0xac, 0xd9, 0x5a,
-                       0xc5, 0xe5, 0xa, 0xa1, 0x5f,
-               },
-       },
-       {
-               "password",
-               "salt",
-               16, 100, 100,
-               []byte{
-                       0x88, 0xbd, 0x5e, 0xdb, 0x52, 0xd1, 0xdd, 0x0, 0x18,
-                       0x87, 0x72, 0xad, 0x36, 0x17, 0x12, 0x90, 0x22, 0x4e,
-                       0x74, 0x82, 0x95, 0x25, 0xb1, 0x8d, 0x73, 0x23, 0xa5,
-                       0x7f, 0x91, 0x96, 0x3c, 0x37,
-               },
-       },
-       {
-               "this is a long \000 password",
-               "and this is a long \000 salt",
-               16384, 8, 1,
-               []byte{
-                       0xc3, 0xf1, 0x82, 0xee, 0x2d, 0xec, 0x84, 0x6e, 0x70,
-                       0xa6, 0x94, 0x2f, 0xb5, 0x29, 0x98, 0x5a, 0x3a, 0x09,
-                       0x76, 0x5e, 0xf0, 0x4c, 0x61, 0x29, 0x23, 0xb1, 0x7f,
-                       0x18, 0x55, 0x5a, 0x37, 0x07, 0x6d, 0xeb, 0x2b, 0x98,
-                       0x30, 0xd6, 0x9d, 0xe5, 0x49, 0x26, 0x51, 0xe4, 0x50,
-                       0x6a, 0xe5, 0x77, 0x6d, 0x96, 0xd4, 0x0f, 0x67, 0xaa,
-                       0xee, 0x37, 0xe1, 0x77, 0x7b, 0x8a, 0xd5, 0xc3, 0x11,
-                       0x14, 0x32, 0xbb, 0x3b, 0x6f, 0x7e, 0x12, 0x64, 0x40,
-                       0x18, 0x79, 0xe6, 0x41, 0xae,
-               },
-       },
-       {
-               "p",
-               "s",
-               2, 1, 1,
-               []byte{
-                       0x48, 0xb0, 0xd2, 0xa8, 0xa3, 0x27, 0x26, 0x11, 0x98,
-                       0x4c, 0x50, 0xeb, 0xd6, 0x30, 0xaf, 0x52,
-               },
-       },
-
-       {
-               "",
-               "",
-               16, 1, 1,
-               []byte{
-                       0x77, 0xd6, 0x57, 0x62, 0x38, 0x65, 0x7b, 0x20, 0x3b,
-                       0x19, 0xca, 0x42, 0xc1, 0x8a, 0x04, 0x97, 0xf1, 0x6b,
-                       0x48, 0x44, 0xe3, 0x07, 0x4a, 0xe8, 0xdf, 0xdf, 0xfa,
-                       0x3f, 0xed, 0xe2, 0x14, 0x42, 0xfc, 0xd0, 0x06, 0x9d,
-                       0xed, 0x09, 0x48, 0xf8, 0x32, 0x6a, 0x75, 0x3a, 0x0f,
-                       0xc8, 0x1f, 0x17, 0xe8, 0xd3, 0xe0, 0xfb, 0x2e, 0x0d,
-                       0x36, 0x28, 0xcf, 0x35, 0xe2, 0x0c, 0x38, 0xd1, 0x89,
-                       0x06,
-               },
-       },
-       {
-               "password",
-               "NaCl",
-               1024, 8, 16,
-               []byte{
-                       0xfd, 0xba, 0xbe, 0x1c, 0x9d, 0x34, 0x72, 0x00, 0x78,
-                       0x56, 0xe7, 0x19, 0x0d, 0x01, 0xe9, 0xfe, 0x7c, 0x6a,
-                       0xd7, 0xcb, 0xc8, 0x23, 0x78, 0x30, 0xe7, 0x73, 0x76,
-                       0x63, 0x4b, 0x37, 0x31, 0x62, 0x2e, 0xaf, 0x30, 0xd9,
-                       0x2e, 0x22, 0xa3, 0x88, 0x6f, 0xf1, 0x09, 0x27, 0x9d,
-                       0x98, 0x30, 0xda, 0xc7, 0x27, 0xaf, 0xb9, 0x4a, 0x83,
-                       0xee, 0x6d, 0x83, 0x60, 0xcb, 0xdf, 0xa2, 0xcc, 0x06,
-                       0x40,
-               },
-       },
-       {
-               "pleaseletmein", "SodiumChloride",
-               16384, 8, 1,
-               []byte{
-                       0x70, 0x23, 0xbd, 0xcb, 0x3a, 0xfd, 0x73, 0x48, 0x46,
-                       0x1c, 0x06, 0xcd, 0x81, 0xfd, 0x38, 0xeb, 0xfd, 0xa8,
-                       0xfb, 0xba, 0x90, 0x4f, 0x8e, 0x3e, 0xa9, 0xb5, 0x43,
-                       0xf6, 0x54, 0x5d, 0xa1, 0xf2, 0xd5, 0x43, 0x29, 0x55,
-                       0x61, 0x3f, 0x0f, 0xcf, 0x62, 0xd4, 0x97, 0x05, 0x24,
-                       0x2a, 0x9a, 0xf9, 0xe6, 0x1e, 0x85, 0xdc, 0x0d, 0x65,
-                       0x1e, 0x40, 0xdf, 0xcf, 0x01, 0x7b, 0x45, 0x57, 0x58,
-                       0x87,
-               },
-       },
-       /*
-               // Disabled: needs 1 GiB RAM and takes too long for a simple test.
-               {
-                       "pleaseletmein", "SodiumChloride",
-                       1048576, 8, 1,
-                       []byte{
-                               0x21, 0x01, 0xcb, 0x9b, 0x6a, 0x51, 0x1a, 0xae, 0xad,
-                               0xdb, 0xbe, 0x09, 0xcf, 0x70, 0xf8, 0x81, 0xec, 0x56,
-                               0x8d, 0x57, 0x4a, 0x2f, 0xfd, 0x4d, 0xab, 0xe5, 0xee,
-                               0x98, 0x20, 0xad, 0xaa, 0x47, 0x8e, 0x56, 0xfd, 0x8f,
-                               0x4b, 0xa5, 0xd0, 0x9f, 0xfa, 0x1c, 0x6d, 0x92, 0x7c,
-                               0x40, 0xf4, 0xc3, 0x37, 0x30, 0x40, 0x49, 0xe8, 0xa9,
-                               0x52, 0xfb, 0xcb, 0xf4, 0x5c, 0x6f, 0xa7, 0x7a, 0x41,
-                               0xa4,
-                       },
-               },
-       */
-}
-
-var bad = []testVector{
-       {"p", "s", 0, 1, 1, nil},                    // N == 0
-       {"p", "s", 1, 1, 1, nil},                    // N == 1
-       {"p", "s", 7, 8, 1, nil},                    // N is not power of 2
-       {"p", "s", 16, maxInt / 2, maxInt / 2, nil}, // p * r too large
-}
-
-func TestKey(t *testing.T) {
-       for i, v := range good {
-               k, err := Key([]byte(v.password), []byte(v.salt), v.N, v.r, v.p, len(v.output))
-               if err != nil {
-                       t.Errorf("%d: got unexpected error: %s", i, err)
-               }
-               if !bytes.Equal(k, v.output) {
-                       t.Errorf("%d: expected %x, got %x", i, v.output, k)
-               }
-       }
-       for i, v := range bad {
-               _, err := Key([]byte(v.password), []byte(v.salt), v.N, v.r, v.p, 32)
-               if err == nil {
-                       t.Errorf("%d: expected error, got nil", i)
-               }
-       }
-}
-
-var sink []byte
-
-func BenchmarkKey(b *testing.B) {
-       for i := 0; i < b.N; i++ {
-               sink, _ = Key([]byte("password"), []byte("salt"), 1<<15, 8, 1, 64)
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/scrypt/smix.go b/vendor/github.com/bytom/crypto/scrypt/smix.go
deleted file mode 100644 (file)
index 5376d89..0000000
--- a/vendor/github.com/bytom/crypto/scrypt/smix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package scrypt
-
-// Smix create tensority cache
-// Some value is fixed: r = 1, N = 1024.
-func Smix(b []byte, v []uint32) {
-       xy := make([]uint32, 64)
-       smix(b, 1, 1024, v, xy)
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/cert_pool.go b/vendor/github.com/bytom/crypto/sm2/cert_pool.go
deleted file mode 100644 (file)
index 0a29b46..0000000
--- a/vendor/github.com/bytom/crypto/sm2/cert_pool.go
+++ /dev/null
@@ -1,214 +0,0 @@
-package sm2
-
-import (
-       "encoding/pem"
-       "errors"
-       "io/ioutil"
-       "os"
-       "runtime"
-       "sync"
-)
-
-// Possible certificate files; stop after finding one.
-var certFiles = []string{
-       "/etc/ssl/certs/ca-certificates.crt",                // Debian/Ubuntu/Gentoo etc.
-       "/etc/pki/tls/certs/ca-bundle.crt",                  // Fedora/RHEL 6
-       "/etc/ssl/ca-bundle.pem",                            // OpenSUSE
-       "/etc/pki/tls/cacert.pem",                           // OpenELEC
-       "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem", // CentOS/RHEL 7
-}
-
-// CertPool is a set of certificates.
-type CertPool struct {
-       bySubjectKeyId map[string][]int
-       byName         map[string][]int
-       certs          []*Certificate
-}
-
-// NewCertPool returns a new, empty CertPool.
-func NewCertPool() *CertPool {
-       return &CertPool{
-               bySubjectKeyId: make(map[string][]int),
-               byName:         make(map[string][]int),
-       }
-}
-
-// Possible directories with certificate files; stop after successfully
-// reading at least one file from a directory.
-var certDirectories = []string{
-       "/etc/ssl/certs",               // SLES10/SLES11, https://golang.org/issue/12139
-       "/system/etc/security/cacerts", // Android
-}
-
-var (
-       once           sync.Once
-       systemRoots    *CertPool
-       systemRootsErr error
-)
-
-func systemRootsPool() *CertPool {
-       once.Do(initSystemRoots)
-       return systemRoots
-}
-
-func initSystemRoots() {
-       systemRoots, systemRootsErr = loadSystemRoots()
-}
-
-func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) {
-       return nil, nil
-}
-
-func loadSystemRoots() (*CertPool, error) {
-       roots := NewCertPool()
-       var firstErr error
-       for _, file := range certFiles {
-               data, err := ioutil.ReadFile(file)
-               if err == nil {
-                       roots.AppendCertsFromPEM(data)
-                       return roots, nil
-               }
-               if firstErr == nil && !os.IsNotExist(err) {
-                       firstErr = err
-               }
-       }
-
-       for _, directory := range certDirectories {
-               fis, err := ioutil.ReadDir(directory)
-               if err != nil {
-                       if firstErr == nil && !os.IsNotExist(err) {
-                               firstErr = err
-                       }
-                       continue
-               }
-               rootsAdded := false
-               for _, fi := range fis {
-                       data, err := ioutil.ReadFile(directory + "/" + fi.Name())
-                       if err == nil && roots.AppendCertsFromPEM(data) {
-                               rootsAdded = true
-                       }
-               }
-               if rootsAdded {
-                       return roots, nil
-               }
-       }
-
-       return nil, firstErr
-}
-
-// SystemCertPool returns a copy of the system cert pool.
-//
-// Any mutations to the returned pool are not written to disk and do
-// not affect any other pool.
-func SystemCertPool() (*CertPool, error) {
-       if runtime.GOOS == "windows" {
-               // Issue 16736, 18609:
-               return nil, errors.New("crypto/x509: system root pool is not available on Windows")
-       }
-
-       return loadSystemRoots()
-}
-
-// findVerifiedParents attempts to find certificates in s which have signed the
-// given certificate. If any candidates were rejected then errCert will be set
-// to one of them, arbitrarily, and err will contain the reason that it was
-// rejected.
-func (s *CertPool) findVerifiedParents(cert *Certificate) (parents []int, errCert *Certificate, err error) {
-       if s == nil {
-               return
-       }
-       var candidates []int
-
-       if len(cert.AuthorityKeyId) > 0 {
-               candidates = s.bySubjectKeyId[string(cert.AuthorityKeyId)]
-       }
-       if len(candidates) == 0 {
-               candidates = s.byName[string(cert.RawIssuer)]
-       }
-
-       for _, c := range candidates {
-               if err = cert.CheckSignatureFrom(s.certs[c]); err == nil {
-                       parents = append(parents, c)
-               } else {
-                       errCert = s.certs[c]
-               }
-       }
-
-       return
-}
-
-func (s *CertPool) contains(cert *Certificate) bool {
-       if s == nil {
-               return false
-       }
-
-       candidates := s.byName[string(cert.RawSubject)]
-       for _, c := range candidates {
-               if s.certs[c].Equal(cert) {
-                       return true
-               }
-       }
-
-       return false
-}
-
-// AddCert adds a certificate to a pool.
-func (s *CertPool) AddCert(cert *Certificate) {
-       if cert == nil {
-               panic("adding nil Certificate to CertPool")
-       }
-
-       // Check that the certificate isn't being added twice.
-       if s.contains(cert) {
-               return
-       }
-
-       n := len(s.certs)
-       s.certs = append(s.certs, cert)
-
-       if len(cert.SubjectKeyId) > 0 {
-               keyId := string(cert.SubjectKeyId)
-               s.bySubjectKeyId[keyId] = append(s.bySubjectKeyId[keyId], n)
-       }
-       name := string(cert.RawSubject)
-       s.byName[name] = append(s.byName[name], n)
-}
-
-// AppendCertsFromPEM attempts to parse a series of PEM encoded certificates.
-// It appends any certificates found to s and reports whether any certificates
-// were successfully parsed.
-//
-// On many Linux systems, /etc/ssl/cert.pem will contain the system wide set
-// of root CAs in a format suitable for this function.
-func (s *CertPool) AppendCertsFromPEM(pemCerts []byte) (ok bool) {
-       for len(pemCerts) > 0 {
-               var block *pem.Block
-               block, pemCerts = pem.Decode(pemCerts)
-               if block == nil {
-                       break
-               }
-               if block.Type != "CERTIFICATE" || len(block.Headers) != 0 {
-                       continue
-               }
-
-               cert, err := ParseCertificate(block.Bytes)
-               if err != nil {
-                       continue
-               }
-
-               s.AddCert(cert)
-               ok = true
-       }
-
-       return
-}
-
-// Subjects returns a list of the DER-encoded subjects of
-// all of the certificates in the pool.
-func (s *CertPool) Subjects() [][]byte {
-       res := make([][]byte, len(s.certs))
-       for i, c := range s.certs {
-               res[i] = c.RawSubject
-       }
-       return res
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/p256.go b/vendor/github.com/bytom/crypto/sm2/p256.go
deleted file mode 100644 (file)
index 090e105..0000000
--- a/vendor/github.com/bytom/crypto/sm2/p256.go
+++ /dev/null
@@ -1,1041 +0,0 @@
-package sm2
-
-import (
-       "crypto/elliptic"
-       "math/big"
-       "sync"
-)
-
-/** 学习标准库p256的优化方法实现sm2的快速版本
- * 标准库的p256的代码实现有些晦涩难懂，当然sm2的同样如此，有兴趣的大家可以研究研究，最后神兽压阵。。。
- *
- * ━━━━━━animal━━━━━━
- * 　　　┏┓　　　┏┓
- * 　　┏┛┻━━━┛┻┓
- * 　　┃　　　　　　　┃
- * 　　┃　　　━　　　┃
- * 　　┃　┳┛　┗┳　┃
- * 　　┃　　　　　　　┃
- * 　　┃　　　┻　　　┃
- * 　　┃　　　　　　　┃
- * 　　┗━┓　　　┏━┛
- * 　　　┃　　　┃
- *　　 　┃　　　┃
- *　　　 ┃　　　┗━━━┓
- *        　┃　　　　　┣┓
- *   　　┃　　　　　┏┛
- *　　 　┗┓┓┏━┳┓┏┛
- *　　　　┃┫┫ ┃┫┫
- *　　　　┗┻┛ ┗┻┛
- *
- * ━━━━━Kawaii ━━━━━━
- */
-
-type sm2P256Curve struct {
-       RInverse *big.Int
-       *elliptic.CurveParams
-       a, b, gx, gy sm2P256FieldElement
-}
-
-var initonce sync.Once
-var sm2P256 sm2P256Curve
-
-type sm2P256FieldElement [9]uint32
-type sm2P256LargeFieldElement [17]uint64
-
-const (
-       bottom28Bits = 0xFFFFFFF
-       bottom29Bits = 0x1FFFFFFF
-)
-
-func initP256Sm2() {
-       sm2P256.CurveParams = &elliptic.CurveParams{Name: "SM2-P-256"} // sm2
-       A, _ := new(big.Int).SetString("FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFC", 16)
-       //SM2椭        椭 圆 曲 线 公 钥 密 码 算 法 推 荐 曲 线 参 数
-       sm2P256.P, _ = new(big.Int).SetString("FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFFFFFFFF", 16)
-       sm2P256.N, _ = new(big.Int).SetString("FFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFF7203DF6B21C6052B53BBF40939D54123", 16)
-       sm2P256.B, _ = new(big.Int).SetString("28E9FA9E9D9F5E344D5A9E4BCF6509A7F39789F515AB8F92DDBCBD414D940E93", 16)
-       sm2P256.Gx, _ = new(big.Int).SetString("32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7", 16)
-       sm2P256.Gy, _ = new(big.Int).SetString("BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0", 16)
-       sm2P256.RInverse, _ = new(big.Int).SetString("7ffffffd80000002fffffffe000000017ffffffe800000037ffffffc80000002", 16)
-       sm2P256.BitSize = 256
-       sm2P256FromBig(&sm2P256.a, A)
-       sm2P256FromBig(&sm2P256.gx, sm2P256.Gx)
-       sm2P256FromBig(&sm2P256.gy, sm2P256.Gy)
-       sm2P256FromBig(&sm2P256.b, sm2P256.B)
-}
-
-func P256Sm2() elliptic.Curve {
-       initonce.Do(initP256Sm2)
-       return sm2P256
-}
-
-func (curve sm2P256Curve) Params() *elliptic.CurveParams {
-       return sm2P256.CurveParams
-}
-
-// y^2 = x^3 + ax + b
-func (curve sm2P256Curve) IsOnCurve(X, Y *big.Int) bool {
-       var a, x, y, y2, x3 sm2P256FieldElement
-
-       sm2P256FromBig(&x, X)
-       sm2P256FromBig(&y, Y)
-
-       sm2P256Square(&x3, &x)       // x3 = x ^ 2
-       sm2P256Mul(&x3, &x3, &x)     // x3 = x ^ 2 * x
-       sm2P256Mul(&a, &curve.a, &x) // a = a * x
-       sm2P256Add(&x3, &x3, &a)
-       sm2P256Add(&x3, &x3, &curve.b)
-
-       sm2P256Square(&y2, &y) // y2 = y ^ 2
-       return sm2P256ToBig(&x3).Cmp(sm2P256ToBig(&y2)) == 0
-}
-
-func zForAffine(x, y *big.Int) *big.Int {
-       z := new(big.Int)
-       if x.Sign() != 0 || y.Sign() != 0 {
-               z.SetInt64(1)
-       }
-       return z
-}
-
-func (curve sm2P256Curve) Add(x1, y1, x2, y2 *big.Int) (*big.Int, *big.Int) {
-       var X1, Y1, Z1, X2, Y2, Z2, X3, Y3, Z3 sm2P256FieldElement
-
-       z1 := zForAffine(x1, y1)
-       z2 := zForAffine(x2, y2)
-       sm2P256FromBig(&X1, x1)
-       sm2P256FromBig(&Y1, y1)
-       sm2P256FromBig(&Z1, z1)
-       sm2P256FromBig(&X2, x2)
-       sm2P256FromBig(&Y2, y2)
-       sm2P256FromBig(&Z2, z2)
-       sm2P256PointAdd(&X1, &Y1, &Z1, &X2, &Y2, &Z2, &X3, &Y3, &Z3)
-       return sm2P256ToAffine(&X3, &Y3, &Z3)
-}
-
-func (curve sm2P256Curve) Double(x1, y1 *big.Int) (*big.Int, *big.Int) {
-       var X1, Y1, Z1 sm2P256FieldElement
-
-       z1 := zForAffine(x1, y1)
-       sm2P256FromBig(&X1, x1)
-       sm2P256FromBig(&Y1, y1)
-       sm2P256FromBig(&Z1, z1)
-       sm2P256PointDouble(&X1, &Y1, &Z1, &X1, &Y1, &Z1)
-       return sm2P256ToAffine(&X1, &Y1, &Z1)
-}
-
-func (curve sm2P256Curve) ScalarMult(x1, y1 *big.Int, k []byte) (*big.Int, *big.Int) {
-       var scalarReversed [32]byte
-       var X, Y, Z, X1, Y1 sm2P256FieldElement
-
-       sm2P256FromBig(&X1, x1)
-       sm2P256FromBig(&Y1, y1)
-       sm2P256GetScalar(&scalarReversed, k)
-       sm2P256ScalarMult(&X, &Y, &Z, &X1, &Y1, &scalarReversed)
-       return sm2P256ToAffine(&X, &Y, &Z)
-}
-
-func (curve sm2P256Curve) ScalarBaseMult(k []byte) (*big.Int, *big.Int) {
-       var scalarReversed [32]byte
-       var X, Y, Z sm2P256FieldElement
-
-       sm2P256GetScalar(&scalarReversed, k)
-       sm2P256ScalarBaseMult(&X, &Y, &Z, &scalarReversed)
-       return sm2P256ToAffine(&X, &Y, &Z)
-}
-
-var sm2P256Precomputed = [9 * 2 * 15 * 2]uint32{
-       0x830053d, 0x328990f, 0x6c04fe1, 0xc0f72e5, 0x1e19f3c, 0x666b093, 0x175a87b, 0xec38276, 0x222cf4b,
-       0x185a1bba, 0x354e593, 0x1295fac1, 0xf2bc469, 0x47c60fa, 0xc19b8a9, 0xf63533e, 0x903ae6b, 0xc79acba,
-       0x15b061a4, 0x33e020b, 0xdffb34b, 0xfcf2c8, 0x16582e08, 0x262f203, 0xfb34381, 0xa55452, 0x604f0ff,
-       0x41f1f90, 0xd64ced2, 0xee377bf, 0x75f05f0, 0x189467ae, 0xe2244e, 0x1e7700e8, 0x3fbc464, 0x9612d2e,
-       0x1341b3b8, 0xee84e23, 0x1edfa5b4, 0x14e6030, 0x19e87be9, 0x92f533c, 0x1665d96c, 0x226653e, 0xa238d3e,
-       0xf5c62c, 0x95bb7a, 0x1f0e5a41, 0x28789c3, 0x1f251d23, 0x8726609, 0xe918910, 0x8096848, 0xf63d028,
-       0x152296a1, 0x9f561a8, 0x14d376fb, 0x898788a, 0x61a95fb, 0xa59466d, 0x159a003d, 0x1ad1698, 0x93cca08,
-       0x1b314662, 0x706e006, 0x11ce1e30, 0x97b710, 0x172fbc0d, 0x8f50158, 0x11c7ffe7, 0xd182cce, 0xc6ad9e8,
-       0x12ea31b2, 0xc4e4f38, 0x175b0d96, 0xec06337, 0x75a9c12, 0xb001fdf, 0x93e82f5, 0x34607de, 0xb8035ed,
-       0x17f97924, 0x75cf9e6, 0xdceaedd, 0x2529924, 0x1a10c5ff, 0xb1a54dc, 0x19464d8, 0x2d1997, 0xde6a110,
-       0x1e276ee5, 0x95c510c, 0x1aca7c7a, 0xfe48aca, 0x121ad4d9, 0xe4132c6, 0x8239b9d, 0x40ea9cd, 0x816c7b,
-       0x632d7a4, 0xa679813, 0x5911fcf, 0x82b0f7c, 0x57b0ad5, 0xbef65, 0xd541365, 0x7f9921f, 0xc62e7a,
-       0x3f4b32d, 0x58e50e1, 0x6427aed, 0xdcdda67, 0xe8c2d3e, 0x6aa54a4, 0x18df4c35, 0x49a6a8e, 0x3cd3d0c,
-       0xd7adf2, 0xcbca97, 0x1bda5f2d, 0x3258579, 0x606b1e6, 0x6fc1b5b, 0x1ac27317, 0x503ca16, 0xa677435,
-       0x57bc73, 0x3992a42, 0xbab987b, 0xfab25eb, 0x128912a4, 0x90a1dc4, 0x1402d591, 0x9ffbcfc, 0xaa48856,
-       0x7a7c2dc, 0xcefd08a, 0x1b29bda6, 0xa785641, 0x16462d8c, 0x76241b7, 0x79b6c3b, 0x204ae18, 0xf41212b,
-       0x1f567a4d, 0xd6ce6db, 0xedf1784, 0x111df34, 0x85d7955, 0x55fc189, 0x1b7ae265, 0xf9281ac, 0xded7740,
-       0xf19468b, 0x83763bb, 0x8ff7234, 0x3da7df8, 0x9590ac3, 0xdc96f2a, 0x16e44896, 0x7931009, 0x99d5acc,
-       0x10f7b842, 0xaef5e84, 0xc0310d7, 0xdebac2c, 0x2a7b137, 0x4342344, 0x19633649, 0x3a10624, 0x4b4cb56,
-       0x1d809c59, 0xac007f, 0x1f0f4bcd, 0xa1ab06e, 0xc5042cf, 0x82c0c77, 0x76c7563, 0x22c30f3, 0x3bf1568,
-       0x7a895be, 0xfcca554, 0x12e90e4c, 0x7b4ab5f, 0x13aeb76b, 0x5887e2c, 0x1d7fe1e3, 0x908c8e3, 0x95800ee,
-       0xb36bd54, 0xf08905d, 0x4e73ae8, 0xf5a7e48, 0xa67cb0, 0x50e1067, 0x1b944a0a, 0xf29c83a, 0xb23cfb9,
-       0xbe1db1, 0x54de6e8, 0xd4707f2, 0x8ebcc2d, 0x2c77056, 0x1568ce4, 0x15fcc849, 0x4069712, 0xe2ed85f,
-       0x2c5ff09, 0x42a6929, 0x628e7ea, 0xbd5b355, 0xaf0bd79, 0xaa03699, 0xdb99816, 0x4379cef, 0x81d57b,
-       0x11237f01, 0xe2a820b, 0xfd53b95, 0x6beb5ee, 0x1aeb790c, 0xe470d53, 0x2c2cfee, 0x1c1d8d8, 0xa520fc4,
-       0x1518e034, 0xa584dd4, 0x29e572b, 0xd4594fc, 0x141a8f6f, 0x8dfccf3, 0x5d20ba3, 0x2eb60c3, 0x9f16eb0,
-       0x11cec356, 0xf039f84, 0x1b0990c1, 0xc91e526, 0x10b65bae, 0xf0616e8, 0x173fa3ff, 0xec8ccf9, 0xbe32790,
-       0x11da3e79, 0xe2f35c7, 0x908875c, 0xdacf7bd, 0x538c165, 0x8d1487f, 0x7c31aed, 0x21af228, 0x7e1689d,
-       0xdfc23ca, 0x24f15dc, 0x25ef3c4, 0x35248cd, 0x99a0f43, 0xa4b6ecc, 0xd066b3, 0x2481152, 0x37a7688,
-       0x15a444b6, 0xb62300c, 0x4b841b, 0xa655e79, 0xd53226d, 0xbeb348a, 0x127f3c2, 0xb989247, 0x71a277d,
-       0x19e9dfcb, 0xb8f92d0, 0xe2d226c, 0x390a8b0, 0x183cc462, 0x7bd8167, 0x1f32a552, 0x5e02db4, 0xa146ee9,
-       0x1a003957, 0x1c95f61, 0x1eeec155, 0x26f811f, 0xf9596ba, 0x3082bfb, 0x96df083, 0x3e3a289, 0x7e2d8be,
-       0x157a63e0, 0x99b8941, 0x1da7d345, 0xcc6cd0, 0x10beed9a, 0x48e83c0, 0x13aa2e25, 0x7cad710, 0x4029988,
-       0x13dfa9dd, 0xb94f884, 0x1f4adfef, 0xb88543, 0x16f5f8dc, 0xa6a67f4, 0x14e274e2, 0x5e56cf4, 0x2f24ef,
-       0x1e9ef967, 0xfe09bad, 0xfe079b3, 0xcc0ae9e, 0xb3edf6d, 0x3e961bc, 0x130d7831, 0x31043d6, 0xba986f9,
-       0x1d28055, 0x65240ca, 0x4971fa3, 0x81b17f8, 0x11ec34a5, 0x8366ddc, 0x1471809, 0xfa5f1c6, 0xc911e15,
-       0x8849491, 0xcf4c2e2, 0x14471b91, 0x39f75be, 0x445c21e, 0xf1585e9, 0x72cc11f, 0x4c79f0c, 0xe5522e1,
-       0x1874c1ee, 0x4444211, 0x7914884, 0x3d1b133, 0x25ba3c, 0x4194f65, 0x1c0457ef, 0xac4899d, 0xe1fa66c,
-       0x130a7918, 0x9b8d312, 0x4b1c5c8, 0x61ccac3, 0x18c8aa6f, 0xe93cb0a, 0xdccb12c, 0xde10825, 0x969737d,
-       0xf58c0c3, 0x7cee6a9, 0xc2c329a, 0xc7f9ed9, 0x107b3981, 0x696a40e, 0x152847ff, 0x4d88754, 0xb141f47,
-       0x5a16ffe, 0x3a7870a, 0x18667659, 0x3b72b03, 0xb1c9435, 0x9285394, 0xa00005a, 0x37506c, 0x2edc0bb,
-       0x19afe392, 0xeb39cac, 0x177ef286, 0xdf87197, 0x19f844ed, 0x31fe8, 0x15f9bfd, 0x80dbec, 0x342e96e,
-       0x497aced, 0xe88e909, 0x1f5fa9ba, 0x530a6ee, 0x1ef4e3f1, 0x69ffd12, 0x583006d, 0x2ecc9b1, 0x362db70,
-       0x18c7bdc5, 0xf4bb3c5, 0x1c90b957, 0xf067c09, 0x9768f2b, 0xf73566a, 0x1939a900, 0x198c38a, 0x202a2a1,
-       0x4bbf5a6, 0x4e265bc, 0x1f44b6e7, 0x185ca49, 0xa39e81b, 0x24aff5b, 0x4acc9c2, 0x638bdd3, 0xb65b2a8,
-       0x6def8be, 0xb94537a, 0x10b81dee, 0xe00ec55, 0x2f2cdf7, 0xc20622d, 0x2d20f36, 0xe03c8c9, 0x898ea76,
-       0x8e3921b, 0x8905bff, 0x1e94b6c8, 0xee7ad86, 0x154797f2, 0xa620863, 0x3fbd0d9, 0x1f3caab, 0x30c24bd,
-       0x19d3892f, 0x59c17a2, 0x1ab4b0ae, 0xf8714ee, 0x90c4098, 0xa9c800d, 0x1910236b, 0xea808d3, 0x9ae2f31,
-       0x1a15ad64, 0xa48c8d1, 0x184635a4, 0xb725ef1, 0x11921dcc, 0x3f866df, 0x16c27568, 0xbdf580a, 0xb08f55c,
-       0x186ee1c, 0xb1627fa, 0x34e82f6, 0x933837e, 0xf311be5, 0xfedb03b, 0x167f72cd, 0xa5469c0, 0x9c82531,
-       0xb92a24b, 0x14fdc8b, 0x141980d1, 0xbdc3a49, 0x7e02bb1, 0xaf4e6dd, 0x106d99e1, 0xd4616fc, 0x93c2717,
-       0x1c0a0507, 0xc6d5fed, 0x9a03d8b, 0xa1d22b0, 0x127853e3, 0xc4ac6b8, 0x1a048cf7, 0x9afb72c, 0x65d485d,
-       0x72d5998, 0xe9fa744, 0xe49e82c, 0x253cf80, 0x5f777ce, 0xa3799a5, 0x17270cbb, 0xc1d1ef0, 0xdf74977,
-       0x114cb859, 0xfa8e037, 0xb8f3fe5, 0xc734cc6, 0x70d3d61, 0xeadac62, 0x12093dd0, 0x9add67d, 0x87200d6,
-       0x175bcbb, 0xb29b49f, 0x1806b79c, 0x12fb61f, 0x170b3a10, 0x3aaf1cf, 0xa224085, 0x79d26af, 0x97759e2,
-       0x92e19f1, 0xb32714d, 0x1f00d9f1, 0xc728619, 0x9e6f627, 0xe745e24, 0x18ea4ace, 0xfc60a41, 0x125f5b2,
-       0xc3cf512, 0x39ed486, 0xf4d15fa, 0xf9167fd, 0x1c1f5dd5, 0xc21a53e, 0x1897930, 0x957a112, 0x21059a0,
-       0x1f9e3ddc, 0xa4dfced, 0x8427f6f, 0x726fbe7, 0x1ea658f8, 0x2fdcd4c, 0x17e9b66f, 0xb2e7c2e, 0x39923bf,
-       0x1bae104, 0x3973ce5, 0xc6f264c, 0x3511b84, 0x124195d7, 0x11996bd, 0x20be23d, 0xdc437c4, 0x4b4f16b,
-       0x11902a0, 0x6c29cc9, 0x1d5ffbe6, 0xdb0b4c7, 0x10144c14, 0x2f2b719, 0x301189, 0x2343336, 0xa0bf2ac,
-}
-
-func sm2P256GetScalar(b *[32]byte, a []byte) {
-       var scalarBytes []byte
-
-       n := new(big.Int).SetBytes(a)
-       if n.Cmp(sm2P256.N) >= 0 {
-               n.Mod(n, sm2P256.N)
-               scalarBytes = n.Bytes()
-       } else {
-               scalarBytes = a
-       }
-       for i, v := range scalarBytes {
-               b[len(scalarBytes)-(1+i)] = v
-       }
-}
-
-func sm2P256PointAddMixed(xOut, yOut, zOut, x1, y1, z1, x2, y2 *sm2P256FieldElement) {
-       var z1z1, z1z1z1, s2, u2, h, i, j, r, rr, v, tmp sm2P256FieldElement
-
-       sm2P256Square(&z1z1, z1)
-       sm2P256Add(&tmp, z1, z1)
-
-       sm2P256Mul(&u2, x2, &z1z1)
-       sm2P256Mul(&z1z1z1, z1, &z1z1)
-       sm2P256Mul(&s2, y2, &z1z1z1)
-       sm2P256Sub(&h, &u2, x1)
-       sm2P256Add(&i, &h, &h)
-       sm2P256Square(&i, &i)
-       sm2P256Mul(&j, &h, &i)
-       sm2P256Sub(&r, &s2, y1)
-       sm2P256Add(&r, &r, &r)
-       sm2P256Mul(&v, x1, &i)
-
-       sm2P256Mul(zOut, &tmp, &h)
-       sm2P256Square(&rr, &r)
-       sm2P256Sub(xOut, &rr, &j)
-       sm2P256Sub(xOut, xOut, &v)
-       sm2P256Sub(xOut, xOut, &v)
-
-       sm2P256Sub(&tmp, &v, xOut)
-       sm2P256Mul(yOut, &tmp, &r)
-       sm2P256Mul(&tmp, y1, &j)
-       sm2P256Sub(yOut, yOut, &tmp)
-       sm2P256Sub(yOut, yOut, &tmp)
-}
-
-// sm2P256CopyConditional sets out=in if mask = 0xffffffff in constant time.
-//
-// On entry: mask is either 0 or 0xffffffff.
-func sm2P256CopyConditional(out, in *sm2P256FieldElement, mask uint32) {
-       for i := 0; i < 9; i++ {
-               tmp := mask & (in[i] ^ out[i])
-               out[i] ^= tmp
-       }
-}
-
-// sm2P256SelectAffinePoint sets {out_x,out_y} to the index'th entry of table.
-// On entry: index < 16, table[0] must be zero.
-func sm2P256SelectAffinePoint(xOut, yOut *sm2P256FieldElement, table []uint32, index uint32) {
-       for i := range xOut {
-               xOut[i] = 0
-       }
-       for i := range yOut {
-               yOut[i] = 0
-       }
-
-       for i := uint32(1); i < 16; i++ {
-               mask := i ^ index
-               mask |= mask >> 2
-               mask |= mask >> 1
-               mask &= 1
-               mask--
-               for j := range xOut {
-                       xOut[j] |= table[0] & mask
-                       table = table[1:]
-               }
-               for j := range yOut {
-                       yOut[j] |= table[0] & mask
-                       table = table[1:]
-               }
-       }
-}
-
-// sm2P256SelectJacobianPoint sets {out_x,out_y,out_z} to the index'th entry of
-// table.
-// On entry: index < 16, table[0] must be zero.
-func sm2P256SelectJacobianPoint(xOut, yOut, zOut *sm2P256FieldElement, table *[16][3]sm2P256FieldElement, index uint32) {
-       for i := range xOut {
-               xOut[i] = 0
-       }
-       for i := range yOut {
-               yOut[i] = 0
-       }
-       for i := range zOut {
-               zOut[i] = 0
-       }
-
-       // The implicit value at index 0 is all zero. We don't need to perform that
-       // iteration of the loop because we already set out_* to zero.
-       for i := uint32(1); i < 16; i++ {
-               mask := i ^ index
-               mask |= mask >> 2
-               mask |= mask >> 1
-               mask &= 1
-               mask--
-               for j := range xOut {
-                       xOut[j] |= table[i][0][j] & mask
-               }
-               for j := range yOut {
-                       yOut[j] |= table[i][1][j] & mask
-               }
-               for j := range zOut {
-                       zOut[j] |= table[i][2][j] & mask
-               }
-       }
-}
-
-// sm2P256GetBit returns the bit'th bit of scalar.
-func sm2P256GetBit(scalar *[32]uint8, bit uint) uint32 {
-       return uint32(((scalar[bit>>3]) >> (bit & 7)) & 1)
-}
-
-// sm2P256ScalarBaseMult sets {xOut,yOut,zOut} = scalar*G where scalar is a
-// little-endian number. Note that the value of scalar must be less than the
-// order of the group.
-func sm2P256ScalarBaseMult(xOut, yOut, zOut *sm2P256FieldElement, scalar *[32]uint8) {
-       nIsInfinityMask := ^uint32(0)
-       var px, py, tx, ty, tz sm2P256FieldElement
-       var pIsNoninfiniteMask, mask, tableOffset uint32
-
-       for i := range xOut {
-               xOut[i] = 0
-       }
-       for i := range yOut {
-               yOut[i] = 0
-       }
-       for i := range zOut {
-               zOut[i] = 0
-       }
-
-       // The loop adds bits at positions 0, 64, 128 and 192, followed by
-       // positions 32,96,160 and 224 and does this 32 times.
-       for i := uint(0); i < 32; i++ {
-               if i != 0 {
-                       sm2P256PointDouble(xOut, yOut, zOut, xOut, yOut, zOut)
-               }
-               tableOffset = 0
-               for j := uint(0); j <= 32; j += 32 {
-                       bit0 := sm2P256GetBit(scalar, 31-i+j)
-                       bit1 := sm2P256GetBit(scalar, 95-i+j)
-                       bit2 := sm2P256GetBit(scalar, 159-i+j)
-                       bit3 := sm2P256GetBit(scalar, 223-i+j)
-                       index := bit0 | (bit1 << 1) | (bit2 << 2) | (bit3 << 3)
-
-                       sm2P256SelectAffinePoint(&px, &py, sm2P256Precomputed[tableOffset:], index)
-                       tableOffset += 30 * 9
-
-                       // Since scalar is less than the order of the group, we know that
-                       // {xOut,yOut,zOut} != {px,py,1}, unless both are zero, which we handle
-                       // below.
-                       sm2P256PointAddMixed(&tx, &ty, &tz, xOut, yOut, zOut, &px, &py)
-                       // The result of pointAddMixed is incorrect if {xOut,yOut,zOut} is zero
-                       // (a.k.a.  the point at infinity). We handle that situation by
-                       // copying the point from the table.
-                       sm2P256CopyConditional(xOut, &px, nIsInfinityMask)
-                       sm2P256CopyConditional(yOut, &py, nIsInfinityMask)
-                       sm2P256CopyConditional(zOut, &sm2P256Factor[1], nIsInfinityMask)
-
-                       // Equally, the result is also wrong if the point from the table is
-                       // zero, which happens when the index is zero. We handle that by
-                       // only copying from {tx,ty,tz} to {xOut,yOut,zOut} if index != 0.
-                       pIsNoninfiniteMask = nonZeroToAllOnes(index)
-                       mask = pIsNoninfiniteMask & ^nIsInfinityMask
-                       sm2P256CopyConditional(xOut, &tx, mask)
-                       sm2P256CopyConditional(yOut, &ty, mask)
-                       sm2P256CopyConditional(zOut, &tz, mask)
-                       // If p was not zero, then n is now non-zero.
-                       nIsInfinityMask &^= pIsNoninfiniteMask
-               }
-       }
-}
-
-func sm2P256ScalarMult(xOut, yOut, zOut, x, y *sm2P256FieldElement, scalar *[32]uint8) {
-       var precomp [16][3]sm2P256FieldElement
-       var px, py, pz, tx, ty, tz sm2P256FieldElement
-       var nIsInfinityMask, index, pIsNoninfiniteMask, mask uint32
-
-       // We precompute 0,1,2,... times {x,y}.
-       precomp[1][0] = *x
-       precomp[1][1] = *y
-       precomp[1][2] = sm2P256Factor[1]
-
-       for i := 2; i < 16; i += 2 {
-               sm2P256PointDouble(&precomp[i][0], &precomp[i][1], &precomp[i][2], &precomp[i/2][0], &precomp[i/2][1], &precomp[i/2][2])
-               sm2P256PointAddMixed(&precomp[i+1][0], &precomp[i+1][1], &precomp[i+1][2], &precomp[i][0], &precomp[i][1], &precomp[i][2], x, y)
-       }
-
-       for i := range xOut {
-               xOut[i] = 0
-       }
-       for i := range yOut {
-               yOut[i] = 0
-       }
-       for i := range zOut {
-               zOut[i] = 0
-       }
-       nIsInfinityMask = ^uint32(0)
-
-       // We add in a window of four bits each iteration and do this 64 times.
-       for i := 0; i < 64; i++ {
-               if i != 0 {
-                       sm2P256PointDouble(xOut, yOut, zOut, xOut, yOut, zOut)
-                       sm2P256PointDouble(xOut, yOut, zOut, xOut, yOut, zOut)
-                       sm2P256PointDouble(xOut, yOut, zOut, xOut, yOut, zOut)
-                       sm2P256PointDouble(xOut, yOut, zOut, xOut, yOut, zOut)
-               }
-
-               index = uint32(scalar[31-i/2])
-               if (i & 1) == 1 {
-                       index &= 15
-               } else {
-                       index >>= 4
-               }
-
-               // See the comments in scalarBaseMult about handling infinities.
-               sm2P256SelectJacobianPoint(&px, &py, &pz, &precomp, index)
-               sm2P256PointAdd(xOut, yOut, zOut, &px, &py, &pz, &tx, &ty, &tz)
-               sm2P256CopyConditional(xOut, &px, nIsInfinityMask)
-               sm2P256CopyConditional(yOut, &py, nIsInfinityMask)
-               sm2P256CopyConditional(zOut, &pz, nIsInfinityMask)
-
-               pIsNoninfiniteMask = nonZeroToAllOnes(index)
-               mask = pIsNoninfiniteMask & ^nIsInfinityMask
-               sm2P256CopyConditional(xOut, &tx, mask)
-               sm2P256CopyConditional(yOut, &ty, mask)
-               sm2P256CopyConditional(zOut, &tz, mask)
-               nIsInfinityMask &^= pIsNoninfiniteMask
-       }
-}
-
-func sm2P256PointToAffine(xOut, yOut, x, y, z *sm2P256FieldElement) {
-       var zInv, zInvSq sm2P256FieldElement
-
-       zz := sm2P256ToBig(z)
-       zz.ModInverse(zz, sm2P256.P)
-       sm2P256FromBig(&zInv, zz)
-
-       sm2P256Square(&zInvSq, &zInv)
-       sm2P256Mul(xOut, x, &zInvSq)
-       sm2P256Mul(&zInv, &zInv, &zInvSq)
-       sm2P256Mul(yOut, y, &zInv)
-}
-
-func sm2P256ToAffine(x, y, z *sm2P256FieldElement) (xOut, yOut *big.Int) {
-       var xx, yy sm2P256FieldElement
-
-       sm2P256PointToAffine(&xx, &yy, x, y, z)
-       return sm2P256ToBig(&xx), sm2P256ToBig(&yy)
-}
-
-var sm2P256Factor = []sm2P256FieldElement{
-       sm2P256FieldElement{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},
-       sm2P256FieldElement{0x2, 0x0, 0x1FFFFF00, 0x7FF, 0x0, 0x0, 0x0, 0x2000000, 0x0},
-       sm2P256FieldElement{0x4, 0x0, 0x1FFFFE00, 0xFFF, 0x0, 0x0, 0x0, 0x4000000, 0x0},
-       sm2P256FieldElement{0x6, 0x0, 0x1FFFFD00, 0x17FF, 0x0, 0x0, 0x0, 0x6000000, 0x0},
-       sm2P256FieldElement{0x8, 0x0, 0x1FFFFC00, 0x1FFF, 0x0, 0x0, 0x0, 0x8000000, 0x0},
-       sm2P256FieldElement{0xA, 0x0, 0x1FFFFB00, 0x27FF, 0x0, 0x0, 0x0, 0xA000000, 0x0},
-       sm2P256FieldElement{0xC, 0x0, 0x1FFFFA00, 0x2FFF, 0x0, 0x0, 0x0, 0xC000000, 0x0},
-       sm2P256FieldElement{0xE, 0x0, 0x1FFFF900, 0x37FF, 0x0, 0x0, 0x0, 0xE000000, 0x0},
-       sm2P256FieldElement{0x10, 0x0, 0x1FFFF800, 0x3FFF, 0x0, 0x0, 0x0, 0x0, 0x01},
-}
-
-func sm2P256Scalar(b *sm2P256FieldElement, a int) {
-       sm2P256Mul(b, b, &sm2P256Factor[a])
-}
-
-// (x3, y3, z3) = (x1, y1, z1) + (x2, y2, z2)
-func sm2P256PointAdd(x1, y1, z1, x2, y2, z2, x3, y3, z3 *sm2P256FieldElement) {
-       var u1, u2, z22, z12, z23, z13, s1, s2, h, h2, r, r2, tm sm2P256FieldElement
-
-       if sm2P256ToBig(z1).Sign() == 0 {
-               sm2P256Dup(x3, x2)
-               sm2P256Dup(y3, y2)
-               sm2P256Dup(z3, z2)
-               return
-       }
-
-       if sm2P256ToBig(z2).Sign() == 0 {
-               sm2P256Dup(x3, x1)
-               sm2P256Dup(y3, y1)
-               sm2P256Dup(z3, z1)
-               return
-       }
-
-       sm2P256Square(&z12, z1) // z12 = z1 ^ 2
-       sm2P256Square(&z22, z2) // z22 = z2 ^ 2
-
-       sm2P256Mul(&z13, &z12, z1) // z13 = z1 ^ 3
-       sm2P256Mul(&z23, &z22, z2) // z23 = z2 ^ 3
-
-       sm2P256Mul(&u1, x1, &z22) // u1 = x1 * z2 ^ 2
-       sm2P256Mul(&u2, x2, &z12) // u2 = x2 * z1 ^ 2
-
-       sm2P256Mul(&s1, y1, &z23) // s1 = y1 * z2 ^ 3
-       sm2P256Mul(&s2, y2, &z13) // s2 = y2 * z1 ^ 3
-
-       if sm2P256ToBig(&u1).Cmp(sm2P256ToBig(&u2)) == 0 &&
-               sm2P256ToBig(&s1).Cmp(sm2P256ToBig(&s2)) == 0 {
-               sm2P256PointDouble(x1, y1, z1, x1, y1, z1)
-       }
-
-       sm2P256Sub(&h, &u2, &u1) // h = u2 - u1
-       sm2P256Sub(&r, &s2, &s1) // r = s2 - s1
-
-       sm2P256Square(&r2, &r) // r2 = r ^ 2
-       sm2P256Square(&h2, &h) // h2 = h ^ 2
-
-       sm2P256Mul(&tm, &h2, &h) // tm = h ^ 3
-       sm2P256Sub(x3, &r2, &tm)
-       sm2P256Mul(&tm, &u1, &h2)
-       sm2P256Scalar(&tm, 2)   // tm = 2 * (u1 * h ^ 2)
-       sm2P256Sub(x3, x3, &tm) // x3 = r ^ 2 - h ^ 3 - 2 * u1 * h ^ 2
-
-       sm2P256Mul(&tm, &u1, &h2) // tm = u1 * h ^ 2
-       sm2P256Sub(&tm, &tm, x3)  // tm = u1 * h ^ 2 - x3
-       sm2P256Mul(y3, &r, &tm)
-       sm2P256Mul(&tm, &h2, &h)  // tm = h ^ 3
-       sm2P256Mul(&tm, &tm, &s1) // tm = s1 * h ^ 3
-       sm2P256Sub(y3, y3, &tm)   // y3 = r * (u1 * h ^ 2 - x3) - s1 * h ^ 3
-
-       sm2P256Mul(z3, z1, z2)
-       sm2P256Mul(z3, z3, &h) // z3 = z1 * z3 * h
-}
-
-func sm2P256PointDouble(x3, y3, z3, x, y, z *sm2P256FieldElement) {
-       var s, m, m2, x2, y2, z2, z4, y4, az4 sm2P256FieldElement
-
-       sm2P256Square(&x2, x) // x2 = x ^ 2
-       sm2P256Square(&y2, y) // y2 = y ^ 2
-       sm2P256Square(&z2, z) // z2 = z ^ 2
-
-       sm2P256Square(&z4, z)   // z4 = z ^ 2
-       sm2P256Mul(&z4, &z4, z) // z4 = z ^ 3
-       sm2P256Mul(&z4, &z4, z) // z4 = z ^ 4
-
-       sm2P256Square(&y4, y)   // y4 = y ^ 2
-       sm2P256Mul(&y4, &y4, y) // y4 = y ^ 3
-       sm2P256Mul(&y4, &y4, y) // y4 = y ^ 4
-       sm2P256Scalar(&y4, 8)   // y4 = 8 * y ^ 4
-
-       sm2P256Mul(&s, x, &y2)
-       sm2P256Scalar(&s, 4) // s = 4 * x * y ^ 2
-
-       sm2P256Dup(&m, &x2)
-       sm2P256Scalar(&m, 3)
-       sm2P256Mul(&az4, &sm2P256.a, &z4)
-       sm2P256Add(&m, &m, &az4) // m = 3 * x ^ 2 + a * z ^ 4
-
-       sm2P256Square(&m2, &m) // m2 = m ^ 2
-
-       sm2P256Add(z3, y, z)
-       sm2P256Square(z3, z3)
-       sm2P256Sub(z3, z3, &z2)
-       sm2P256Sub(z3, z3, &y2) // z' = (y + z) ^2 - z ^ 2 - y ^ 2
-
-       sm2P256Sub(x3, &m2, &s)
-       sm2P256Sub(x3, x3, &s) // x' = m2 - 2 * s
-
-       sm2P256Sub(y3, &s, x3)
-       sm2P256Mul(y3, y3, &m)
-       sm2P256Sub(y3, y3, &y4) // y' = m * (s - x') - 8 * y ^ 4
-}
-
-// p256Zero31 is 0 mod p.
-var sm2P256Zero31 = sm2P256FieldElement{0x7FFFFFF8, 0x3FFFFFFC, 0x800003FC, 0x3FFFDFFC, 0x7FFFFFFC, 0x3FFFFFFC, 0x7FFFFFFC, 0x37FFFFFC, 0x7FFFFFFC}
-
-// c = a + b
-func sm2P256Add(c, a, b *sm2P256FieldElement) {
-       carry := uint32(0)
-       for i := 0; ; i++ {
-               c[i] = a[i] + b[i]
-               c[i] += carry
-               carry = c[i] >> 29
-               c[i] &= bottom29Bits
-               i++
-               if i == 9 {
-                       break
-               }
-               c[i] = a[i] + b[i]
-               c[i] += carry
-               carry = c[i] >> 28
-               c[i] &= bottom28Bits
-       }
-       sm2P256ReduceCarry(c, carry)
-}
-
-// c = a - b
-func sm2P256Sub(c, a, b *sm2P256FieldElement) {
-       var carry uint32
-
-       for i := 0; ; i++ {
-               c[i] = a[i] - b[i]
-               c[i] += sm2P256Zero31[i]
-               c[i] += carry
-               carry = c[i] >> 29
-               c[i] &= bottom29Bits
-               i++
-               if i == 9 {
-                       break
-               }
-               c[i] = a[i] - b[i]
-               c[i] += sm2P256Zero31[i]
-               c[i] += carry
-               carry = c[i] >> 28
-               c[i] &= bottom28Bits
-       }
-       sm2P256ReduceCarry(c, carry)
-}
-
-// c = a * b
-func sm2P256Mul(c, a, b *sm2P256FieldElement) {
-       var tmp sm2P256LargeFieldElement
-
-       tmp[0] = uint64(a[0]) * uint64(b[0])
-       tmp[1] = uint64(a[0])*(uint64(b[1])<<0) +
-               uint64(a[1])*(uint64(b[0])<<0)
-       tmp[2] = uint64(a[0])*(uint64(b[2])<<0) +
-               uint64(a[1])*(uint64(b[1])<<1) +
-               uint64(a[2])*(uint64(b[0])<<0)
-       tmp[3] = uint64(a[0])*(uint64(b[3])<<0) +
-               uint64(a[1])*(uint64(b[2])<<0) +
-               uint64(a[2])*(uint64(b[1])<<0) +
-               uint64(a[3])*(uint64(b[0])<<0)
-       tmp[4] = uint64(a[0])*(uint64(b[4])<<0) +
-               uint64(a[1])*(uint64(b[3])<<1) +
-               uint64(a[2])*(uint64(b[2])<<0) +
-               uint64(a[3])*(uint64(b[1])<<1) +
-               uint64(a[4])*(uint64(b[0])<<0)
-       tmp[5] = uint64(a[0])*(uint64(b[5])<<0) +
-               uint64(a[1])*(uint64(b[4])<<0) +
-               uint64(a[2])*(uint64(b[3])<<0) +
-               uint64(a[3])*(uint64(b[2])<<0) +
-               uint64(a[4])*(uint64(b[1])<<0) +
-               uint64(a[5])*(uint64(b[0])<<0)
-       tmp[6] = uint64(a[0])*(uint64(b[6])<<0) +
-               uint64(a[1])*(uint64(b[5])<<1) +
-               uint64(a[2])*(uint64(b[4])<<0) +
-               uint64(a[3])*(uint64(b[3])<<1) +
-               uint64(a[4])*(uint64(b[2])<<0) +
-               uint64(a[5])*(uint64(b[1])<<1) +
-               uint64(a[6])*(uint64(b[0])<<0)
-       tmp[7] = uint64(a[0])*(uint64(b[7])<<0) +
-               uint64(a[1])*(uint64(b[6])<<0) +
-               uint64(a[2])*(uint64(b[5])<<0) +
-               uint64(a[3])*(uint64(b[4])<<0) +
-               uint64(a[4])*(uint64(b[3])<<0) +
-               uint64(a[5])*(uint64(b[2])<<0) +
-               uint64(a[6])*(uint64(b[1])<<0) +
-               uint64(a[7])*(uint64(b[0])<<0)
-       // tmp[8] has the greatest value but doesn't overflow. See logic in
-       // p256Square.
-       tmp[8] = uint64(a[0])*(uint64(b[8])<<0) +
-               uint64(a[1])*(uint64(b[7])<<1) +
-               uint64(a[2])*(uint64(b[6])<<0) +
-               uint64(a[3])*(uint64(b[5])<<1) +
-               uint64(a[4])*(uint64(b[4])<<0) +
-               uint64(a[5])*(uint64(b[3])<<1) +
-               uint64(a[6])*(uint64(b[2])<<0) +
-               uint64(a[7])*(uint64(b[1])<<1) +
-               uint64(a[8])*(uint64(b[0])<<0)
-       tmp[9] = uint64(a[1])*(uint64(b[8])<<0) +
-               uint64(a[2])*(uint64(b[7])<<0) +
-               uint64(a[3])*(uint64(b[6])<<0) +
-               uint64(a[4])*(uint64(b[5])<<0) +
-               uint64(a[5])*(uint64(b[4])<<0) +
-               uint64(a[6])*(uint64(b[3])<<0) +
-               uint64(a[7])*(uint64(b[2])<<0) +
-               uint64(a[8])*(uint64(b[1])<<0)
-       tmp[10] = uint64(a[2])*(uint64(b[8])<<0) +
-               uint64(a[3])*(uint64(b[7])<<1) +
-               uint64(a[4])*(uint64(b[6])<<0) +
-               uint64(a[5])*(uint64(b[5])<<1) +
-               uint64(a[6])*(uint64(b[4])<<0) +
-               uint64(a[7])*(uint64(b[3])<<1) +
-               uint64(a[8])*(uint64(b[2])<<0)
-       tmp[11] = uint64(a[3])*(uint64(b[8])<<0) +
-               uint64(a[4])*(uint64(b[7])<<0) +
-               uint64(a[5])*(uint64(b[6])<<0) +
-               uint64(a[6])*(uint64(b[5])<<0) +
-               uint64(a[7])*(uint64(b[4])<<0) +
-               uint64(a[8])*(uint64(b[3])<<0)
-       tmp[12] = uint64(a[4])*(uint64(b[8])<<0) +
-               uint64(a[5])*(uint64(b[7])<<1) +
-               uint64(a[6])*(uint64(b[6])<<0) +
-               uint64(a[7])*(uint64(b[5])<<1) +
-               uint64(a[8])*(uint64(b[4])<<0)
-       tmp[13] = uint64(a[5])*(uint64(b[8])<<0) +
-               uint64(a[6])*(uint64(b[7])<<0) +
-               uint64(a[7])*(uint64(b[6])<<0) +
-               uint64(a[8])*(uint64(b[5])<<0)
-       tmp[14] = uint64(a[6])*(uint64(b[8])<<0) +
-               uint64(a[7])*(uint64(b[7])<<1) +
-               uint64(a[8])*(uint64(b[6])<<0)
-       tmp[15] = uint64(a[7])*(uint64(b[8])<<0) +
-               uint64(a[8])*(uint64(b[7])<<0)
-       tmp[16] = uint64(a[8]) * (uint64(b[8]) << 0)
-       sm2P256ReduceDegree(c, &tmp)
-}
-
-// b = a * a
-func sm2P256Square(b, a *sm2P256FieldElement) {
-       var tmp sm2P256LargeFieldElement
-
-       tmp[0] = uint64(a[0]) * uint64(a[0])
-       tmp[1] = uint64(a[0]) * (uint64(a[1]) << 1)
-       tmp[2] = uint64(a[0])*(uint64(a[2])<<1) +
-               uint64(a[1])*(uint64(a[1])<<1)
-       tmp[3] = uint64(a[0])*(uint64(a[3])<<1) +
-               uint64(a[1])*(uint64(a[2])<<1)
-       tmp[4] = uint64(a[0])*(uint64(a[4])<<1) +
-               uint64(a[1])*(uint64(a[3])<<2) +
-               uint64(a[2])*uint64(a[2])
-       tmp[5] = uint64(a[0])*(uint64(a[5])<<1) +
-               uint64(a[1])*(uint64(a[4])<<1) +
-               uint64(a[2])*(uint64(a[3])<<1)
-       tmp[6] = uint64(a[0])*(uint64(a[6])<<1) +
-               uint64(a[1])*(uint64(a[5])<<2) +
-               uint64(a[2])*(uint64(a[4])<<1) +
-               uint64(a[3])*(uint64(a[3])<<1)
-       tmp[7] = uint64(a[0])*(uint64(a[7])<<1) +
-               uint64(a[1])*(uint64(a[6])<<1) +
-               uint64(a[2])*(uint64(a[5])<<1) +
-               uint64(a[3])*(uint64(a[4])<<1)
-       // tmp[8] has the greatest value of 2**61 + 2**60 + 2**61 + 2**60 + 2**60,
-       // which is < 2**64 as required.
-       tmp[8] = uint64(a[0])*(uint64(a[8])<<1) +
-               uint64(a[1])*(uint64(a[7])<<2) +
-               uint64(a[2])*(uint64(a[6])<<1) +
-               uint64(a[3])*(uint64(a[5])<<2) +
-               uint64(a[4])*uint64(a[4])
-       tmp[9] = uint64(a[1])*(uint64(a[8])<<1) +
-               uint64(a[2])*(uint64(a[7])<<1) +
-               uint64(a[3])*(uint64(a[6])<<1) +
-               uint64(a[4])*(uint64(a[5])<<1)
-       tmp[10] = uint64(a[2])*(uint64(a[8])<<1) +
-               uint64(a[3])*(uint64(a[7])<<2) +
-               uint64(a[4])*(uint64(a[6])<<1) +
-               uint64(a[5])*(uint64(a[5])<<1)
-       tmp[11] = uint64(a[3])*(uint64(a[8])<<1) +
-               uint64(a[4])*(uint64(a[7])<<1) +
-               uint64(a[5])*(uint64(a[6])<<1)
-       tmp[12] = uint64(a[4])*(uint64(a[8])<<1) +
-               uint64(a[5])*(uint64(a[7])<<2) +
-               uint64(a[6])*uint64(a[6])
-       tmp[13] = uint64(a[5])*(uint64(a[8])<<1) +
-               uint64(a[6])*(uint64(a[7])<<1)
-       tmp[14] = uint64(a[6])*(uint64(a[8])<<1) +
-               uint64(a[7])*(uint64(a[7])<<1)
-       tmp[15] = uint64(a[7]) * (uint64(a[8]) << 1)
-       tmp[16] = uint64(a[8]) * uint64(a[8])
-       sm2P256ReduceDegree(b, &tmp)
-}
-
-// nonZeroToAllOnes returns:
-//   0xffffffff for 0 < x <= 2**31
-//   0 for x == 0 or x > 2**31.
-func nonZeroToAllOnes(x uint32) uint32 {
-       return ((x - 1) >> 31) - 1
-}
-
-var sm2P256Carry = [8 * 9]uint32{
-       0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-       0x2, 0x0, 0x1FFFFF00, 0x7FF, 0x0, 0x0, 0x0, 0x2000000, 0x0,
-       0x4, 0x0, 0x1FFFFE00, 0xFFF, 0x0, 0x0, 0x0, 0x4000000, 0x0,
-       0x6, 0x0, 0x1FFFFD00, 0x17FF, 0x0, 0x0, 0x0, 0x6000000, 0x0,
-       0x8, 0x0, 0x1FFFFC00, 0x1FFF, 0x0, 0x0, 0x0, 0x8000000, 0x0,
-       0xA, 0x0, 0x1FFFFB00, 0x27FF, 0x0, 0x0, 0x0, 0xA000000, 0x0,
-       0xC, 0x0, 0x1FFFFA00, 0x2FFF, 0x0, 0x0, 0x0, 0xC000000, 0x0,
-       0xE, 0x0, 0x1FFFF900, 0x37FF, 0x0, 0x0, 0x0, 0xE000000, 0x0,
-}
-
-// carry < 2 ^ 3
-func sm2P256ReduceCarry(a *sm2P256FieldElement, carry uint32) {
-       a[0] += sm2P256Carry[carry*9+0]
-       a[2] += sm2P256Carry[carry*9+2]
-       a[3] += sm2P256Carry[carry*9+3]
-       a[7] += sm2P256Carry[carry*9+7]
-}
-
-// 这代码真是丑比了，我也是对自己醉了。。。
-// 你最好别改这个代码，不然你会死的很惨。。
-func sm2P256ReduceDegree(a *sm2P256FieldElement, b *sm2P256LargeFieldElement) {
-       var tmp [18]uint32
-       var carry, x, xMask uint32
-
-       // tmp
-       // 0  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  |  9 | 10 ...
-       // 29 | 28 | 29 | 28 | 29 | 28 | 29 | 28 | 29 | 28 | 29 ...
-       tmp[0] = uint32(b[0]) & bottom29Bits
-       tmp[1] = uint32(b[0]) >> 29
-       tmp[1] |= (uint32(b[0]>>32) << 3) & bottom28Bits
-       tmp[1] += uint32(b[1]) & bottom28Bits
-       carry = tmp[1] >> 28
-       tmp[1] &= bottom28Bits
-       for i := 2; i < 17; i++ {
-               tmp[i] = (uint32(b[i-2] >> 32)) >> 25
-               tmp[i] += (uint32(b[i-1])) >> 28
-               tmp[i] += (uint32(b[i-1]>>32) << 4) & bottom29Bits
-               tmp[i] += uint32(b[i]) & bottom29Bits
-               tmp[i] += carry
-               carry = tmp[i] >> 29
-               tmp[i] &= bottom29Bits
-
-               i++
-               if i == 17 {
-                       break
-               }
-               tmp[i] = uint32(b[i-2]>>32) >> 25
-               tmp[i] += uint32(b[i-1]) >> 29
-               tmp[i] += ((uint32(b[i-1] >> 32)) << 3) & bottom28Bits
-               tmp[i] += uint32(b[i]) & bottom28Bits
-               tmp[i] += carry
-               carry = tmp[i] >> 28
-               tmp[i] &= bottom28Bits
-       }
-       tmp[17] = uint32(b[15]>>32) >> 25
-       tmp[17] += uint32(b[16]) >> 29
-       tmp[17] += uint32(b[16]>>32) << 3
-       tmp[17] += carry
-
-       for i := 0; ; i += 2 {
-
-               tmp[i+1] += tmp[i] >> 29
-               x = tmp[i] & bottom29Bits
-               tmp[i] = 0
-               if x > 0 {
-                       set4 := uint32(0)
-                       set7 := uint32(0)
-                       xMask = nonZeroToAllOnes(x)
-                       tmp[i+2] += (x << 7) & bottom29Bits
-                       tmp[i+3] += x >> 22
-                       if tmp[i+3] < 0x10000000 {
-                               set4 = 1
-                               tmp[i+3] += 0x10000000 & xMask
-                               tmp[i+3] -= (x << 10) & bottom28Bits
-                       } else {
-                               tmp[i+3] -= (x << 10) & bottom28Bits
-                       }
-                       if tmp[i+4] < 0x20000000 {
-                               tmp[i+4] += 0x20000000 & xMask
-                               tmp[i+4] -= set4 // 借位
-                               tmp[i+4] -= x >> 18
-                               if tmp[i+5] < 0x10000000 {
-                                       tmp[i+5] += 0x10000000 & xMask
-                                       tmp[i+5] -= 1 // 借位
-                                       if tmp[i+6] < 0x20000000 {
-                                               set7 = 1
-                                               tmp[i+6] += 0x20000000 & xMask
-                                               tmp[i+6] -= 1 // 借位
-                                       } else {
-                                               tmp[i+6] -= 1 // 借位
-                                       }
-                               } else {
-                                       tmp[i+5] -= 1
-                               }
-                       } else {
-                               tmp[i+4] -= set4 // 借位
-                               tmp[i+4] -= x >> 18
-                       }
-                       if tmp[i+7] < 0x10000000 {
-                               tmp[i+7] += 0x10000000 & xMask
-                               tmp[i+7] -= set7
-                               tmp[i+7] -= (x << 24) & bottom28Bits
-                               tmp[i+8] += (x << 28) & bottom29Bits
-                               if tmp[i+8] < 0x20000000 {
-                                       tmp[i+8] += 0x20000000 & xMask
-                                       tmp[i+8] -= 1
-                                       tmp[i+8] -= x >> 4
-                                       tmp[i+9] += ((x >> 1) - 1) & xMask
-                               } else {
-                                       tmp[i+8] -= 1
-                                       tmp[i+8] -= x >> 4
-                                       tmp[i+9] += (x >> 1) & xMask
-                               }
-                       } else {
-                               tmp[i+7] -= set7 // 借位
-                               tmp[i+7] -= (x << 24) & bottom28Bits
-                               tmp[i+8] += (x << 28) & bottom29Bits
-                               if tmp[i+8] < 0x20000000 {
-                                       tmp[i+8] += 0x20000000 & xMask
-                                       tmp[i+8] -= x >> 4
-                                       tmp[i+9] += ((x >> 1) - 1) & xMask
-                               } else {
-                                       tmp[i+8] -= x >> 4
-                                       tmp[i+9] += (x >> 1) & xMask
-                               }
-                       }
-
-               }
-
-               if i+1 == 9 {
-                       break
-               }
-
-               tmp[i+2] += tmp[i+1] >> 28
-               x = tmp[i+1] & bottom28Bits
-               tmp[i+1] = 0
-               if x > 0 {
-                       set5 := uint32(0)
-                       set8 := uint32(0)
-                       set9 := uint32(0)
-                       xMask = nonZeroToAllOnes(x)
-                       tmp[i+3] += (x << 7) & bottom28Bits
-                       tmp[i+4] += x >> 21
-                       if tmp[i+4] < 0x20000000 {
-                               set5 = 1
-                               tmp[i+4] += 0x20000000 & xMask
-                               tmp[i+4] -= (x << 11) & bottom29Bits
-                       } else {
-                               tmp[i+4] -= (x << 11) & bottom29Bits
-                       }
-                       if tmp[i+5] < 0x10000000 {
-                               tmp[i+5] += 0x10000000 & xMask
-                               tmp[i+5] -= set5 // 借位
-                               tmp[i+5] -= x >> 18
-                               if tmp[i+6] < 0x20000000 {
-                                       tmp[i+6] += 0x20000000 & xMask
-                                       tmp[i+6] -= 1 // 借位
-                                       if tmp[i+7] < 0x10000000 {
-                                               set8 = 1
-                                               tmp[i+7] += 0x10000000 & xMask
-                                               tmp[i+7] -= 1 // 借位
-                                       } else {
-                                               tmp[i+7] -= 1 // 借位
-                                       }
-                               } else {
-                                       tmp[i+6] -= 1 // 借位
-                               }
-                       } else {
-                               tmp[i+5] -= set5 // 借位
-                               tmp[i+5] -= x >> 18
-                       }
-                       if tmp[i+8] < 0x20000000 {
-                               set9 = 1
-                               tmp[i+8] += 0x20000000 & xMask
-                               tmp[i+8] -= set8
-                               tmp[i+8] -= (x << 25) & bottom29Bits
-                       } else {
-                               tmp[i+8] -= set8
-                               tmp[i+8] -= (x << 25) & bottom29Bits
-                       }
-                       if tmp[i+9] < 0x10000000 {
-                               tmp[i+9] += 0x10000000 & xMask
-                               tmp[i+9] -= set9 // 借位
-                               tmp[i+9] -= x >> 4
-                               tmp[i+10] += (x - 1) & xMask
-                       } else {
-                               tmp[i+9] -= set9 // 借位
-                               tmp[i+9] -= x >> 4
-                               tmp[i+10] += x & xMask
-                       }
-               }
-       }
-
-       carry = uint32(0)
-       for i := 0; i < 8; i++ {
-               a[i] = tmp[i+9]
-               a[i] += carry
-               a[i] += (tmp[i+10] << 28) & bottom29Bits
-               carry = a[i] >> 29
-               a[i] &= bottom29Bits
-
-               i++
-               a[i] = tmp[i+9] >> 1
-               a[i] += carry
-               carry = a[i] >> 28
-               a[i] &= bottom28Bits
-       }
-       a[8] = tmp[17]
-       a[8] += carry
-       carry = a[8] >> 29
-       a[8] &= bottom29Bits
-       sm2P256ReduceCarry(a, carry)
-}
-
-// b = a
-func sm2P256Dup(b, a *sm2P256FieldElement) {
-       *b = *a
-}
-
-// X = a * R mod P
-func sm2P256FromBig(X *sm2P256FieldElement, a *big.Int) {
-       x := new(big.Int).Lsh(a, 257)
-       x.Mod(x, sm2P256.P)
-       for i := 0; i < 9; i++ {
-               if bits := x.Bits(); len(bits) > 0 {
-                       X[i] = uint32(bits[0]) & bottom29Bits
-               } else {
-                       X[i] = 0
-               }
-               x.Rsh(x, 29)
-               i++
-               if i == 9 {
-                       break
-               }
-               if bits := x.Bits(); len(bits) > 0 {
-                       X[i] = uint32(bits[0]) & bottom28Bits
-               } else {
-                       X[i] = 0
-               }
-               x.Rsh(x, 28)
-       }
-}
-
-// X = r * R mod P
-// r = X * R' mod P
-func sm2P256ToBig(X *sm2P256FieldElement) *big.Int {
-       r, tm := new(big.Int), new(big.Int)
-       r.SetInt64(int64(X[8]))
-       for i := 7; i >= 0; i-- {
-               if (i & 1) == 0 {
-                       r.Lsh(r, 29)
-               } else {
-                       r.Lsh(r, 28)
-               }
-               tm.SetInt64(int64(X[i]))
-               r.Add(r, tm)
-       }
-       r.Mul(r, sm2P256.RInverse)
-       r.Mod(r, sm2P256.P)
-       return r
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/pkcs1.go b/vendor/github.com/bytom/crypto/sm2/pkcs1.go
deleted file mode 100644 (file)
index e1cc478..0000000
--- a/vendor/github.com/bytom/crypto/sm2/pkcs1.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package sm2
-
-import (
-       "crypto/rsa"
-       "encoding/asn1"
-       "errors"
-       "math/big"
-)
-
-// pkcs1PrivateKey is a structure which mirrors the PKCS#1 ASN.1 for an RSA private key.
-type pkcs1PrivateKey struct {
-       Version int
-       N       *big.Int
-       E       int
-       D       *big.Int
-       P       *big.Int
-       Q       *big.Int
-       // We ignore these values, if present, because rsa will calculate them.
-       Dp   *big.Int `asn1:"optional"`
-       Dq   *big.Int `asn1:"optional"`
-       Qinv *big.Int `asn1:"optional"`
-
-       AdditionalPrimes []pkcs1AdditionalRSAPrime `asn1:"optional,omitempty"`
-}
-
-type pkcs1AdditionalRSAPrime struct {
-       Prime *big.Int
-
-       // We ignore these values because rsa will calculate them.
-       Exp   *big.Int
-       Coeff *big.Int
-}
-
-// ParsePKCS1PrivateKey returns an RSA private key from its ASN.1 PKCS#1 DER encoded form.
-func ParsePKCS1PrivateKey(der []byte) (*rsa.PrivateKey, error) {
-       var priv pkcs1PrivateKey
-       rest, err := asn1.Unmarshal(der, &priv)
-       if len(rest) > 0 {
-               return nil, asn1.SyntaxError{Msg: "trailing data"}
-       }
-       if err != nil {
-               return nil, err
-       }
-
-       if priv.Version > 1 {
-               return nil, errors.New("x509: unsupported private key version")
-       }
-
-       if priv.N.Sign() <= 0 || priv.D.Sign() <= 0 || priv.P.Sign() <= 0 || priv.Q.Sign() <= 0 {
-               return nil, errors.New("x509: private key contains zero or negative value")
-       }
-
-       key := new(rsa.PrivateKey)
-       key.PublicKey = rsa.PublicKey{
-               E: priv.E,
-               N: priv.N,
-       }
-
-       key.D = priv.D
-       key.Primes = make([]*big.Int, 2+len(priv.AdditionalPrimes))
-       key.Primes[0] = priv.P
-       key.Primes[1] = priv.Q
-       for i, a := range priv.AdditionalPrimes {
-               if a.Prime.Sign() <= 0 {
-                       return nil, errors.New("x509: private key contains zero or negative prime")
-               }
-               key.Primes[i+2] = a.Prime
-               // We ignore the other two values because rsa will calculate
-               // them as needed.
-       }
-
-       err = key.Validate()
-       if err != nil {
-               return nil, err
-       }
-       key.Precompute()
-
-       return key, nil
-}
-
-// MarshalPKCS1PrivateKey converts a private key to ASN.1 DER encoded form.
-func MarshalPKCS1PrivateKey(key *rsa.PrivateKey) []byte {
-       key.Precompute()
-
-       version := 0
-       if len(key.Primes) > 2 {
-               version = 1
-       }
-
-       priv := pkcs1PrivateKey{
-               Version: version,
-               N:       key.N,
-               E:       key.PublicKey.E,
-               D:       key.D,
-               P:       key.Primes[0],
-               Q:       key.Primes[1],
-               Dp:      key.Precomputed.Dp,
-               Dq:      key.Precomputed.Dq,
-               Qinv:    key.Precomputed.Qinv,
-       }
-
-       priv.AdditionalPrimes = make([]pkcs1AdditionalRSAPrime, len(key.Precomputed.CRTValues))
-       for i, values := range key.Precomputed.CRTValues {
-               priv.AdditionalPrimes[i].Prime = key.Primes[2+i]
-               priv.AdditionalPrimes[i].Exp = values.Exp
-               priv.AdditionalPrimes[i].Coeff = values.Coeff
-       }
-
-       b, _ := asn1.Marshal(priv)
-       return b
-}
-
-// rsaPublicKey reflects the ASN.1 structure of a PKCS#1 public key.
-type rsaPublicKey struct {
-       N *big.Int
-       E int
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/pkcs8.go b/vendor/github.com/bytom/crypto/sm2/pkcs8.go
deleted file mode 100644 (file)
index 22342af..0000000
--- a/vendor/github.com/bytom/crypto/sm2/pkcs8.go
+++ /dev/null
@@ -1,473 +0,0 @@
-package sm2
-
-import (
-       "crypto/aes"
-       "crypto/cipher"
-       "crypto/elliptic"
-       "crypto/hmac"
-       "crypto/md5"
-       "crypto/rand"
-       "crypto/sha1"
-       "crypto/sha256"
-       "crypto/sha512"
-       "crypto/x509/pkix"
-       "encoding/asn1"
-       "encoding/pem"
-       "errors"
-       "hash"
-       "io/ioutil"
-       "math/big"
-       "os"
-       "reflect"
-)
-
-/*
- * reference to RFC5959 and RFC2898
- */
-
-var (
-       oidPBES1  = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 5, 3}  // pbeWithMD5AndDES-CBC(PBES1)
-       oidPBES2  = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 5, 13} // id-PBES2(PBES2)
-       oidPBKDF2 = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 5, 12} // id-PBKDF2
-
-       oidKEYMD5    = asn1.ObjectIdentifier{1, 2, 840, 113549, 2, 5}
-       oidKEYSHA1   = asn1.ObjectIdentifier{1, 2, 840, 113549, 2, 7}
-       oidKEYSHA256 = asn1.ObjectIdentifier{1, 2, 840, 113549, 2, 9}
-       oidKEYSHA512 = asn1.ObjectIdentifier{1, 2, 840, 113549, 2, 11}
-
-       oidAES128CBC = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 1, 2}
-       oidAES256CBC = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 1, 42}
-
-       oidSM2 = asn1.ObjectIdentifier{1, 2, 840, 10045, 2, 1}
-)
-
-// reference to https://www.rfc-editor.org/rfc/rfc5958.txt
-type PrivateKeyInfo struct {
-       Version             int // v1 or v2
-       PrivateKeyAlgorithm []asn1.ObjectIdentifier
-       PrivateKey          []byte
-}
-
-// reference to https://www.rfc-editor.org/rfc/rfc5958.txt
-type EncryptedPrivateKeyInfo struct {
-       EncryptionAlgorithm Pbes2Algorithms
-       EncryptedData       []byte
-}
-
-// reference to https://www.ietf.org/rfc/rfc2898.txt
-type Pbes2Algorithms struct {
-       IdPBES2     asn1.ObjectIdentifier
-       Pbes2Params Pbes2Params
-}
-
-// reference to https://www.ietf.org/rfc/rfc2898.txt
-type Pbes2Params struct {
-       KeyDerivationFunc Pbes2KDfs // PBES2-KDFs
-       EncryptionScheme  Pbes2Encs // PBES2-Encs
-}
-
-// reference to https://www.ietf.org/rfc/rfc2898.txt
-type Pbes2KDfs struct {
-       IdPBKDF2    asn1.ObjectIdentifier
-       Pkdf2Params Pkdf2Params
-}
-
-type Pbes2Encs struct {
-       EncryAlgo asn1.ObjectIdentifier
-       IV        []byte
-}
-
-// reference to https://www.ietf.org/rfc/rfc2898.txt
-type Pkdf2Params struct {
-       Salt           []byte
-       IterationCount int
-       Prf            pkix.AlgorithmIdentifier
-}
-
-type sm2PrivateKey struct {
-       Version       int
-       PrivateKey    []byte
-       NamedCurveOID asn1.ObjectIdentifier `asn1:"optional,explicit,tag:0"`
-       PublicKey     asn1.BitString        `asn1:"optional,explicit,tag:1"`
-}
-
-type pkcs8 struct {
-       Version    int
-       Algo       pkix.AlgorithmIdentifier
-       PrivateKey []byte
-}
-
-// copy from crypto/pbkdf2.go
-func pbkdf(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
-       prf := hmac.New(h, password)
-       hashLen := prf.Size()
-       numBlocks := (keyLen + hashLen - 1) / hashLen
-
-       var buf [4]byte
-       dk := make([]byte, 0, numBlocks*hashLen)
-       U := make([]byte, hashLen)
-       for block := 1; block <= numBlocks; block++ {
-               // N.B.: || means concatenation, ^ means XOR
-               // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter
-               // U_1 = PRF(password, salt || uint(i))
-               prf.Reset()
-               prf.Write(salt)
-               buf[0] = byte(block >> 24)
-               buf[1] = byte(block >> 16)
-               buf[2] = byte(block >> 8)
-               buf[3] = byte(block)
-               prf.Write(buf[:4])
-               dk = prf.Sum(dk)
-               T := dk[len(dk)-hashLen:]
-               copy(U, T)
-
-               // U_n = PRF(password, U_(n-1))
-               for n := 2; n <= iter; n++ {
-                       prf.Reset()
-                       prf.Write(U)
-                       U = U[:0]
-                       U = prf.Sum(U)
-                       for x := range U {
-                               T[x] ^= U[x]
-                       }
-               }
-       }
-       return dk[:keyLen]
-}
-
-func ParseSm2PublicKey(der []byte) (*PublicKey, error) {
-       var pubkey pkixPublicKey
-
-       if _, err := asn1.Unmarshal(der, &pubkey); err != nil {
-               return nil, err
-       }
-       if !reflect.DeepEqual(pubkey.Algo.Algorithm, oidSM2) {
-               return nil, errors.New("x509: not sm2 elliptic curve")
-       }
-       curve := P256Sm2()
-       x, y := elliptic.Unmarshal(curve, pubkey.BitString.Bytes)
-       pub := PublicKey{
-               Curve: curve,
-               X:     x,
-               Y:     y,
-       }
-       return &pub, nil
-}
-
-func MarshalSm2PublicKey(key *PublicKey) ([]byte, error) {
-       var r pkixPublicKey
-       var algo pkix.AlgorithmIdentifier
-
-       algo.Algorithm = oidSM2
-       algo.Parameters.Class = 0
-       algo.Parameters.Tag = 6
-       algo.Parameters.IsCompound = false
-       algo.Parameters.FullBytes = []byte{6, 8, 42, 129, 28, 207, 85, 1, 130, 45} // asn1.Marshal(asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 301})
-       r.Algo = algo
-       r.BitString = asn1.BitString{Bytes: elliptic.Marshal(key.Curve, key.X, key.Y)}
-       return asn1.Marshal(r)
-}
-
-func ParseSm2PrivateKey(der []byte) (*PrivateKey, error) {
-       var privKey sm2PrivateKey
-
-       if _, err := asn1.Unmarshal(der, &privKey); err != nil {
-               return nil, errors.New("x509: failed to parse SM2 private key: " + err.Error())
-       }
-       curve := P256Sm2()
-       k := new(big.Int).SetBytes(privKey.PrivateKey)
-       curveOrder := curve.Params().N
-       if k.Cmp(curveOrder) >= 0 {
-               return nil, errors.New("x509: invalid elliptic curve private key value")
-       }
-       priv := new(PrivateKey)
-       priv.Curve = curve
-       priv.D = k
-       privateKey := make([]byte, (curveOrder.BitLen()+7)/8)
-       for len(privKey.PrivateKey) > len(privateKey) {
-               if privKey.PrivateKey[0] != 0 {
-                       return nil, errors.New("x509: invalid private key length")
-               }
-               privKey.PrivateKey = privKey.PrivateKey[1:]
-       }
-       copy(privateKey[len(privateKey)-len(privKey.PrivateKey):], privKey.PrivateKey)
-       priv.X, priv.Y = curve.ScalarBaseMult(privateKey)
-       return priv, nil
-}
-
-func ParsePKCS8UnecryptedPrivateKey(der []byte) (*PrivateKey, error) {
-       var privKey pkcs8
-
-       if _, err := asn1.Unmarshal(der, &privKey); err != nil {
-               return nil, err
-       }
-       if !reflect.DeepEqual(privKey.Algo.Algorithm, oidSM2) {
-               return nil, errors.New("x509: not sm2 elliptic curve")
-       }
-       return ParseSm2PrivateKey(privKey.PrivateKey)
-}
-
-func ParsePKCS8EcryptedPrivateKey(der, pwd []byte) (*PrivateKey, error) {
-       var keyInfo EncryptedPrivateKeyInfo
-
-       _, err := asn1.Unmarshal(der, &keyInfo)
-       if err != nil {
-               return nil, errors.New("x509: unknown format")
-       }
-       if !reflect.DeepEqual(keyInfo.EncryptionAlgorithm.IdPBES2, oidPBES2) {
-               return nil, errors.New("x509: only support PBES2")
-       }
-       encryptionScheme := keyInfo.EncryptionAlgorithm.Pbes2Params.EncryptionScheme
-       keyDerivationFunc := keyInfo.EncryptionAlgorithm.Pbes2Params.KeyDerivationFunc
-       if !reflect.DeepEqual(keyDerivationFunc.IdPBKDF2, oidPBKDF2) {
-               return nil, errors.New("x509: only support PBKDF2")
-       }
-       pkdf2Params := keyDerivationFunc.Pkdf2Params
-       if !reflect.DeepEqual(encryptionScheme.EncryAlgo, oidAES128CBC) &&
-               !reflect.DeepEqual(encryptionScheme.EncryAlgo, oidAES256CBC) {
-               return nil, errors.New("x509: unknow encryption algorithm")
-       }
-       iv := encryptionScheme.IV
-       salt := pkdf2Params.Salt
-       iter := pkdf2Params.IterationCount
-       encryptedKey := keyInfo.EncryptedData
-       var key []byte
-       switch {
-       case pkdf2Params.Prf.Algorithm.Equal(oidKEYMD5):
-               key = pbkdf(pwd, salt, iter, 32, md5.New)
-               break
-       case pkdf2Params.Prf.Algorithm.Equal(oidKEYSHA1):
-               key = pbkdf(pwd, salt, iter, 32, sha1.New)
-               break
-       case pkdf2Params.Prf.Algorithm.Equal(oidKEYSHA256):
-               key = pbkdf(pwd, salt, iter, 32, sha256.New)
-               break
-       case pkdf2Params.Prf.Algorithm.Equal(oidKEYSHA512):
-               key = pbkdf(pwd, salt, iter, 32, sha512.New)
-               break
-       default:
-               return nil, errors.New("x509: unknown hash algorithm")
-       }
-       block, err := aes.NewCipher(key)
-       if err != nil {
-               return nil, err
-       }
-       mode := cipher.NewCBCDecrypter(block, iv)
-       mode.CryptBlocks(encryptedKey, encryptedKey)
-       rKey, err := ParsePKCS8UnecryptedPrivateKey(encryptedKey)
-       if err != nil {
-               return nil, errors.New("pkcs8: incorrect password")
-       }
-       return rKey, nil
-}
-
-func ParsePKCS8PrivateKey(der, pwd []byte) (*PrivateKey, error) {
-       if pwd == nil {
-               return ParsePKCS8UnecryptedPrivateKey(der)
-       }
-       return ParsePKCS8EcryptedPrivateKey(der, pwd)
-}
-
-func MarshalSm2UnecryptedPrivateKey(key *PrivateKey) ([]byte, error) {
-       var r pkcs8
-       var priv sm2PrivateKey
-       var algo pkix.AlgorithmIdentifier
-
-       algo.Algorithm = oidSM2
-       algo.Parameters.Class = 0
-       algo.Parameters.Tag = 6
-       algo.Parameters.IsCompound = false
-       algo.Parameters.FullBytes = []byte{6, 8, 42, 129, 28, 207, 85, 1, 130, 45} // asn1.Marshal(asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 301})
-       priv.Version = 1
-       priv.NamedCurveOID = oidNamedCurveP256SM2
-       priv.PublicKey = asn1.BitString{Bytes: elliptic.Marshal(key.Curve, key.X, key.Y)}
-       priv.PrivateKey = key.D.Bytes()
-       r.Version = 0
-       r.Algo = algo
-       r.PrivateKey, _ = asn1.Marshal(priv)
-       return asn1.Marshal(r)
-}
-
-func MarshalSm2EcryptedPrivateKey(PrivKey *PrivateKey, pwd []byte) ([]byte, error) {
-       der, err := MarshalSm2UnecryptedPrivateKey(PrivKey)
-       if err != nil {
-               return nil, err
-       }
-       iter := 2048
-       salt := make([]byte, 8)
-       iv := make([]byte, 16)
-       rand.Reader.Read(salt)
-       rand.Reader.Read(iv)
-       key := pbkdf(pwd, salt, iter, 32, sha1.New) // 默认是SHA1
-       padding := aes.BlockSize - len(der)%aes.BlockSize
-       if padding > 0 {
-               n := len(der)
-               der = append(der, make([]byte, padding)...)
-               for i := 0; i < padding; i++ {
-                       der[n+i] = byte(padding)
-               }
-       }
-       encryptedKey := make([]byte, len(der))
-       block, err := aes.NewCipher(key)
-       if err != nil {
-               return nil, err
-       }
-       mode := cipher.NewCBCEncrypter(block, iv)
-       mode.CryptBlocks(encryptedKey, der)
-       var algorithmIdentifier pkix.AlgorithmIdentifier
-       algorithmIdentifier.Algorithm = oidKEYSHA1
-       algorithmIdentifier.Parameters.Tag = 5
-       algorithmIdentifier.Parameters.IsCompound = false
-       algorithmIdentifier.Parameters.FullBytes = []byte{5, 0}
-       keyDerivationFunc := Pbes2KDfs{
-               oidPBKDF2,
-               Pkdf2Params{
-                       salt,
-                       iter,
-                       algorithmIdentifier,
-               },
-       }
-       encryptionScheme := Pbes2Encs{
-               oidAES256CBC,
-               iv,
-       }
-       pbes2Algorithms := Pbes2Algorithms{
-               oidPBES2,
-               Pbes2Params{
-                       keyDerivationFunc,
-                       encryptionScheme,
-               },
-       }
-       encryptedPkey := EncryptedPrivateKeyInfo{
-               pbes2Algorithms,
-               encryptedKey,
-       }
-       return asn1.Marshal(encryptedPkey)
-}
-
-func MarshalSm2PrivateKey(key *PrivateKey, pwd []byte) ([]byte, error) {
-       if pwd == nil {
-               return MarshalSm2UnecryptedPrivateKey(key)
-       }
-       return MarshalSm2EcryptedPrivateKey(key, pwd)
-}
-
-func ReadPrivateKeyFromMem(data []byte, pwd []byte) (*PrivateKey, error) {
-       var block *pem.Block
-
-       block, _ = pem.Decode(data)
-       if block == nil {
-               return nil, errors.New("failed to decode private key")
-       }
-       priv, err := ParsePKCS8PrivateKey(block.Bytes, pwd)
-       return priv, err
-}
-
-func ReadPrivateKeyFromPem(FileName string, pwd []byte) (*PrivateKey, error) {
-       data, err := ioutil.ReadFile(FileName)
-       if err != nil {
-               return nil, err
-       }
-       return ReadPrivateKeyFromMem(data, pwd)
-}
-
-func WritePrivateKeytoMem(key *PrivateKey, pwd []byte) ([]byte, error) {
-       var block *pem.Block
-
-       der, err := MarshalSm2PrivateKey(key, pwd)
-       if err != nil {
-               return nil, err
-       }
-       if pwd != nil {
-               block = &pem.Block{
-                       Type:  "ENCRYPTED PRIVATE KEY",
-                       Bytes: der,
-               }
-       } else {
-               block = &pem.Block{
-                       Type:  "PRIVATE KEY",
-                       Bytes: der,
-               }
-       }
-       return pem.EncodeToMemory(block), nil
-}
-
-func WritePrivateKeytoPem(FileName string, key *PrivateKey, pwd []byte) (bool, error) {
-       var block *pem.Block
-
-       der, err := MarshalSm2PrivateKey(key, pwd)
-       if err != nil {
-               return false, err
-       }
-       if pwd != nil {
-               block = &pem.Block{
-                       Type:  "ENCRYPTED PRIVATE KEY",
-                       Bytes: der,
-               }
-       } else {
-               block = &pem.Block{
-                       Type:  "PRIVATE KEY",
-                       Bytes: der,
-               }
-       }
-       file, err := os.Create(FileName)
-       if err != nil {
-               return false, err
-       }
-       defer file.Close()
-       err = pem.Encode(file, block)
-       if err != nil {
-               return false, err
-       }
-       return true, nil
-}
-
-func ReadPublicKeyFromMem(data []byte, _ []byte) (*PublicKey, error) {
-       block, _ := pem.Decode(data)
-       if block == nil || block.Type != "PUBLIC KEY" {
-               return nil, errors.New("failed to decode public key")
-       }
-       pub, err := ParseSm2PublicKey(block.Bytes)
-       return pub, err
-}
-
-func ReadPublicKeyFromPem(FileName string, pwd []byte) (*PublicKey, error) {
-       data, err := ioutil.ReadFile(FileName)
-       if err != nil {
-               return nil, err
-       }
-       return ReadPublicKeyFromMem(data, pwd)
-}
-
-func WritePublicKeytoMem(key *PublicKey, _ []byte) ([]byte, error) {
-       der, err := MarshalSm2PublicKey(key)
-       if err != nil {
-               return nil, err
-       }
-       block := &pem.Block{
-               Type:  "PUBLIC KEY",
-               Bytes: der,
-       }
-       return pem.EncodeToMemory(block), nil
-}
-
-func WritePublicKeytoPem(FileName string, key *PublicKey, _ []byte) (bool, error) {
-       der, err := MarshalSm2PublicKey(key)
-       if err != nil {
-               return false, err
-       }
-       block := &pem.Block{
-               Type:  "PUBLIC KEY",
-               Bytes: der,
-       }
-       file, err := os.Create(FileName)
-       defer file.Close()
-       if err != nil {
-               return false, err
-       }
-       err = pem.Encode(file, block)
-       if err != nil {
-               return false, err
-       }
-       return true, nil
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/sm2.go b/vendor/github.com/bytom/crypto/sm2/sm2.go
deleted file mode 100644 (file)
index 8339c9b..0000000
--- a/vendor/github.com/bytom/crypto/sm2/sm2.go
+++ /dev/null
@@ -1,509 +0,0 @@
-package sm2
-
-// reference to ecdsa
-import (
-       "bytes"
-       "crypto"
-       "crypto/aes"
-       "crypto/cipher"
-       "crypto/elliptic"
-       "crypto/rand"
-       "crypto/sha512"
-       "encoding/asn1"
-       "encoding/binary"
-       "errors"
-       "io"
-       "math/big"
-
-       "github.com/bytom/crypto/sm3"
-)
-
-const (
-       aesIV = "IV for <SM2> CTR"
-)
-
-type PublicKey struct {
-       elliptic.Curve
-       X, Y *big.Int
-}
-
-type PrivateKey struct {
-       PublicKey
-       D *big.Int
-}
-
-type sm2Signature struct {
-       R, S *big.Int
-}
-
-// The SM2's private key contains the public key
-func (priv *PrivateKey) Public() crypto.PublicKey {
-       return &priv.PublicKey
-}
-
-func SignDigitToSignData(r, s *big.Int) ([]byte, error) {
-       return asn1.Marshal(sm2Signature{r, s})
-}
-
-func SignDataToSignDigit(sign []byte) (*big.Int, *big.Int, error) {
-       var sm2Sign sm2Signature
-
-       _, err := asn1.Unmarshal(sign, &sm2Sign)
-       if err != nil {
-               return nil, nil, err
-       }
-       return sm2Sign.R, sm2Sign.S, nil
-}
-
-// sign format = 30 + len(z) + 02 + len(r) + r + 02 + len(s) + s, z being what follows its size, ie 02+len(r)+r+02+len(s)+s
-func (priv *PrivateKey) Sign(rand io.Reader, msg []byte, opts crypto.SignerOpts) ([]byte, error) {
-       r, s, err := Sign(priv, msg)
-       if err != nil {
-               return nil, err
-       }
-       return asn1.Marshal(sm2Signature{r, s})
-}
-
-func (priv *PrivateKey) Decrypt(data []byte) ([]byte, error) {
-       return Decrypt(priv, data)
-}
-
-func (pub *PublicKey) Verify(msg []byte, sign []byte) bool {
-       var sm2Sign sm2Signature
-
-       _, err := asn1.Unmarshal(sign, &sm2Sign)
-       if err != nil {
-               return false
-       }
-       return Verify(pub, msg, sm2Sign.R, sm2Sign.S)
-}
-
-func (pub *PublicKey) Encrypt(data []byte) ([]byte, error) {
-       return Encrypt(pub, data)
-}
-
-var one = new(big.Int).SetInt64(1)
-
-func intToBytes(x int) []byte {
-       var buf = make([]byte, 4)
-
-       binary.BigEndian.PutUint32(buf, uint32(x))
-       return buf
-}
-
-func kdf(x, y []byte, length int) ([]byte, bool) {
-       var c []byte
-
-       ct := 1
-       h := sm3.New()
-       x = append(x, y...)
-       for i, j := 0, (length+31)/32; i < j; i++ {
-               h.Reset()
-               h.Write(x)
-               h.Write(intToBytes(ct))
-               hash := h.Sum(nil)
-               if i+1 == j && length%32 != 0 {
-                       c = append(c, hash[:length%32]...)
-               } else {
-                       c = append(c, hash...)
-               }
-               ct++
-       }
-       for i := 0; i < length; i++ {
-               if c[i] != 0 {
-                       return c, true
-               }
-       }
-       return c, false
-}
-
-func randFieldElement(c elliptic.Curve, rand io.Reader) (k *big.Int, err error) {
-       params := c.Params()
-       b := make([]byte, params.BitSize/8+8)
-       _, err = io.ReadFull(rand, b)
-       if err != nil {
-               return
-       }
-       k = new(big.Int).SetBytes(b)
-       n := new(big.Int).Sub(params.N, one)
-       k.Mod(k, n)
-       k.Add(k, one)
-       return
-}
-
-func GenerateKey() (*PrivateKey, error) {
-       c := P256Sm2()
-       k, err := randFieldElement(c, rand.Reader)
-       if err != nil {
-               return nil, err
-       }
-       priv := new(PrivateKey)
-       priv.PublicKey.Curve = c
-       priv.D = k
-       priv.PublicKey.X, priv.PublicKey.Y = c.ScalarBaseMult(k.Bytes())
-       return priv, nil
-}
-
-var errZeroParam = errors.New("zero parameter")
-
-func Sign(priv *PrivateKey, hash []byte) (r, s *big.Int, err error) {
-       entropylen := (priv.Curve.Params().BitSize + 7) / 16
-       if entropylen > 32 {
-               entropylen = 32
-       }
-       entropy := make([]byte, entropylen)
-       _, err = io.ReadFull(rand.Reader, entropy)
-       if err != nil {
-               return
-       }
-
-       // Initialize an SHA-512 hash context; digest ...
-       md := sha512.New()
-       md.Write(priv.D.Bytes()) // the private key,
-       md.Write(entropy)        // the entropy,
-       md.Write(hash)           // and the input hash;
-       key := md.Sum(nil)[:32]  // and compute ChopMD-256(SHA-512),
-       // which is an indifferentiable MAC.
-
-       // Create an AES-CTR instance to use as a CSPRNG.
-       block, err := aes.NewCipher(key)
-       if err != nil {
-               return nil, nil, err
-       }
-
-       // Create a CSPRNG that xors a stream of zeros with
-       // the output of the AES-CTR instance.
-       csprng := cipher.StreamReader{
-               R: zeroReader,
-               S: cipher.NewCTR(block, []byte(aesIV)),
-       }
-
-       // See [NSA] 3.4.1
-       c := priv.PublicKey.Curve
-       N := c.Params().N
-       if N.Sign() == 0 {
-               return nil, nil, errZeroParam
-       }
-       var k *big.Int
-       e := new(big.Int).SetBytes(hash)
-       for { // 调整算法细节以实现SM2
-               for {
-                       k, err = randFieldElement(c, csprng)
-                       if err != nil {
-                               r = nil
-                               return
-                       }
-                       r, _ = priv.Curve.ScalarBaseMult(k.Bytes())
-                       r.Add(r, e)
-                       r.Mod(r, N)
-                       if r.Sign() != 0 {
-                               break
-                       }
-                       if t := new(big.Int).Add(r, k); t.Cmp(N) == 0 {
-                               break
-                       }
-               }
-               rD := new(big.Int).Mul(priv.D, r)
-               s = new(big.Int).Sub(k, rD)
-               d1 := new(big.Int).Add(priv.D, one)
-               d1Inv := new(big.Int).ModInverse(d1, N)
-               s.Mul(s, d1Inv)
-               s.Mod(s, N)
-               if s.Sign() != 0 {
-                       break
-               }
-       }
-       return
-}
-
-func Verify(pub *PublicKey, hash []byte, r, s *big.Int) bool {
-       c := pub.Curve
-       N := c.Params().N
-
-       if r.Sign() <= 0 || s.Sign() <= 0 {
-               return false
-       }
-       if r.Cmp(N) >= 0 || s.Cmp(N) >= 0 {
-               return false
-       }
-
-       // 调整算法细节以实现SM2
-       t := new(big.Int).Add(r, s)
-       t.Mod(t, N)
-       if t.Sign() == 0 {
-               return false
-       }
-
-       var x *big.Int
-       x1, y1 := c.ScalarBaseMult(s.Bytes())
-       x2, y2 := c.ScalarMult(pub.X, pub.Y, t.Bytes())
-       x, _ = c.Add(x1, y1, x2, y2)
-
-       e := new(big.Int).SetBytes(hash)
-       x.Add(x, e)
-       x.Mod(x, N)
-       return x.Cmp(r) == 0
-}
-
-func Sm2Sign(priv *PrivateKey, msg, uid []byte) (r, s *big.Int, err error) {
-       za, err := ZA(&priv.PublicKey, uid)
-       if err != nil {
-               return nil, nil, err
-       }
-       e, err := msgHash(za, msg)
-       if err != nil {
-               return nil, nil, err
-       }
-       c := priv.PublicKey.Curve
-       N := c.Params().N
-       if N.Sign() == 0 {
-               return nil, nil, errZeroParam
-       }
-       var k *big.Int
-       for { // 调整算法细节以实现SM2
-               for {
-                       k, err = randFieldElement(c, rand.Reader)
-                       if err != nil {
-                               r = nil
-                               return
-                       }
-                       r, _ = priv.Curve.ScalarBaseMult(k.Bytes())
-                       r.Add(r, e)
-                       r.Mod(r, N)
-                       if r.Sign() != 0 {
-                               break
-                       }
-                       if t := new(big.Int).Add(r, k); t.Cmp(N) == 0 {
-                               break
-                       }
-               }
-               rD := new(big.Int).Mul(priv.D, r)
-               s = new(big.Int).Sub(k, rD)
-               d1 := new(big.Int).Add(priv.D, one)
-               d1Inv := new(big.Int).ModInverse(d1, N)
-               s.Mul(s, d1Inv)
-               s.Mod(s, N)
-               if s.Sign() != 0 {
-                       break
-               }
-       }
-       return
-}
-
-func Sm2Verify(pub *PublicKey, msg, uid []byte, r, s *big.Int) bool {
-       c := pub.Curve
-       N := c.Params().N
-       one := new(big.Int).SetInt64(1)
-       if r.Cmp(one) < 0 || s.Cmp(one) < 0 {
-               return false
-       }
-       if r.Cmp(N) >= 0 || s.Cmp(N) >= 0 {
-               return false
-       }
-       za, err := ZA(pub, uid)
-       if err != nil {
-               return false
-       }
-       e, err := msgHash(za, msg)
-       if err != nil {
-               return false
-       }
-       t := new(big.Int).Add(r, s)
-       t.Mod(t, N)
-       if t.Sign() == 0 {
-               return false
-       }
-       var x *big.Int
-       x1, y1 := c.ScalarBaseMult(s.Bytes())
-       x2, y2 := c.ScalarMult(pub.X, pub.Y, t.Bytes())
-       x, _ = c.Add(x1, y1, x2, y2)
-
-       x.Add(x, e)
-       x.Mod(x, N)
-       return x.Cmp(r) == 0
-}
-
-func msgHash(za, msg []byte) (*big.Int, error) {
-       e := sm3.New()
-       e.Write(za)
-       e.Write(msg)
-       return new(big.Int).SetBytes(e.Sum(nil)[:32]), nil
-}
-
-// ZA = H256(ENTLA || IDA || a || b || xG || yG || xA || yA)
-func ZA(pub *PublicKey, uid []byte) ([]byte, error) {
-       za := sm3.New()
-       uidLen := len(uid)
-       if uidLen >= 8192 {
-               return []byte{}, errors.New("SM2: uid too large")
-       }
-       Entla := uint16(8 * uidLen)
-       za.Write([]byte{byte((Entla >> 8) & 0xFF)})
-       za.Write([]byte{byte(Entla & 0xFF)})
-       za.Write(uid)
-       za.Write(sm2P256ToBig(&sm2P256.a).Bytes())
-       za.Write(sm2P256.B.Bytes())
-       za.Write(sm2P256.Gx.Bytes())
-       za.Write(sm2P256.Gy.Bytes())
-
-       xBuf := pub.X.Bytes()
-       yBuf := pub.Y.Bytes()
-       if n := len(xBuf); n < 32 {
-               xBuf = append(zeroByteSlice[:32-n], xBuf...)
-       }
-       za.Write(xBuf)
-       za.Write(yBuf)
-       return za.Sum(nil)[:32], nil
-}
-
-// 32byte
-var zeroByteSlice = []byte{
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-       0, 0, 0, 0,
-}
-
-/*
- * sm2密文结构如下:
- *  x
- *  y
- *  hash
- *  CipherText
- */
-func Encrypt(pub *PublicKey, data []byte) ([]byte, error) {
-       length := len(data)
-       for {
-               c := []byte{}
-               curve := pub.Curve
-               k, err := randFieldElement(curve, rand.Reader)
-               if err != nil {
-                       return nil, err
-               }
-               x1, y1 := curve.ScalarBaseMult(k.Bytes())
-               x2, y2 := curve.ScalarMult(pub.X, pub.Y, k.Bytes())
-               x1Buf := x1.Bytes()
-               y1Buf := y1.Bytes()
-               x2Buf := x2.Bytes()
-               y2Buf := y2.Bytes()
-               if n := len(x1Buf); n < 32 {
-                       x1Buf = append(zeroByteSlice[:32-n], x1Buf...)
-               }
-               if n := len(y1Buf); n < 32 {
-                       y1Buf = append(zeroByteSlice[:32-n], y1Buf...)
-               }
-               if n := len(x2Buf); n < 32 {
-                       x2Buf = append(zeroByteSlice[:32-n], x2Buf...)
-               }
-               if n := len(y2Buf); n < 32 {
-                       y2Buf = append(zeroByteSlice[:32-n], y2Buf...)
-               }
-               c = append(c, x1Buf...) // x分量
-               c = append(c, y1Buf...) // y分量
-               tm := []byte{}
-               tm = append(tm, x2Buf...)
-               tm = append(tm, data...)
-               tm = append(tm, y2Buf...)
-               h := sm3.Sm3Sum(tm)
-               c = append(c, h...)
-               ct, ok := kdf(x2Buf, y2Buf, length) // 密文
-               if !ok {
-                       continue
-               }
-               c = append(c, ct...)
-               for i := 0; i < length; i++ {
-                       c[96+i] ^= data[i]
-               }
-               return append([]byte{0x04}, c...), nil
-       }
-}
-
-func Decrypt(priv *PrivateKey, data []byte) ([]byte, error) {
-       data = data[1:]
-       length := len(data) - 96
-       curve := priv.Curve
-       x := new(big.Int).SetBytes(data[:32])
-       y := new(big.Int).SetBytes(data[32:64])
-       x2, y2 := curve.ScalarMult(x, y, priv.D.Bytes())
-       x2Buf := x2.Bytes()
-       y2Buf := y2.Bytes()
-       if n := len(x2Buf); n < 32 {
-               x2Buf = append(zeroByteSlice[:32-n], x2Buf...)
-       }
-       if n := len(y2Buf); n < 32 {
-               y2Buf = append(zeroByteSlice[:32-n], y2Buf...)
-       }
-       c, ok := kdf(x2Buf, y2Buf, length)
-       if !ok {
-               return nil, errors.New("Decrypt: failed to decrypt")
-       }
-       for i := 0; i < length; i++ {
-               c[i] ^= data[i+96]
-       }
-       tm := []byte{}
-       tm = append(tm, x2Buf...)
-       tm = append(tm, c...)
-       tm = append(tm, y2Buf...)
-       h := sm3.Sm3Sum(tm)
-       if bytes.Compare(h, data[64:96]) != 0 {
-               return c, errors.New("Decrypt: failed to decrypt")
-       }
-       return c, nil
-}
-
-type zr struct {
-       io.Reader
-}
-
-func (z *zr) Read(dst []byte) (n int, err error) {
-       for i := range dst {
-               dst[i] = 0
-       }
-       return len(dst), nil
-}
-
-var zeroReader = &zr{}
-
-func getLastBit(a *big.Int) uint {
-       return a.Bit(0)
-}
-
-func Compress(a *PublicKey) []byte {
-       buf := []byte{}
-       yp := getLastBit(a.Y)
-       buf = append(buf, a.X.Bytes()...)
-       if n := len(a.X.Bytes()); n < 32 {
-               buf = append(zeroByteSlice[:(32-n)], buf...)
-       }
-       buf = append([]byte{byte(yp)}, buf...)
-       return buf
-}
-
-func Decompress(a []byte) *PublicKey {
-       var aa, xx, xx3 sm2P256FieldElement
-
-       P256Sm2()
-       x := new(big.Int).SetBytes(a[1:])
-       curve := sm2P256
-       sm2P256FromBig(&xx, x)
-       sm2P256Square(&xx3, &xx)       // x3 = x ^ 2
-       sm2P256Mul(&xx3, &xx3, &xx)    // x3 = x ^ 2 * x
-       sm2P256Mul(&aa, &curve.a, &xx) // a = a * x
-       sm2P256Add(&xx3, &xx3, &aa)
-       sm2P256Add(&xx3, &xx3, &curve.b)
-
-       y2 := sm2P256ToBig(&xx3)
-       y := new(big.Int).ModSqrt(y2, sm2P256.P)
-       if getLastBit(y) != uint(a[0]) {
-               y.Sub(sm2P256.P, y)
-       }
-       return &PublicKey{
-               Curve: P256Sm2(),
-               X:     x,
-               Y:     y,
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/sm2_test.go b/vendor/github.com/bytom/crypto/sm2/sm2_test.go
deleted file mode 100644 (file)
index 0820118..0000000
--- a/vendor/github.com/bytom/crypto/sm2/sm2_test.go
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
-Copyright Suzhou Tongji Fintech Research Institute 2017 All Rights Reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-                 http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package sm2
-
-import (
-       "crypto/rand"
-       "crypto/x509/pkix"
-       "encoding/asn1"
-       "fmt"
-       "io/ioutil"
-       "log"
-       "math/big"
-       "net"
-       "os"
-       "testing"
-       "time"
-)
-
-func TestSm2(t *testing.T) {
-       priv, err := GenerateKey() // 生成密钥对
-       if err != nil {
-               log.Fatal(err)
-       }
-       fmt.Printf("%v\n", priv.Curve.IsOnCurve(priv.X, priv.Y)) // 验证是否为sm2的曲线
-       pub := &priv.PublicKey
-       msg := []byte("123456")
-       d0, err := pub.Encrypt(msg)
-       if err != nil {
-               fmt.Printf("Error: failed to encrypt %s: %v\n", msg, err)
-               return
-       }
-       fmt.Printf("Cipher text = %v\n", d0)
-       d1, err := priv.Decrypt(d0)
-       if err != nil {
-               fmt.Printf("Error: failed to decrypt: %v\n", err)
-       }
-       fmt.Printf("clear text = %s\n", d1)
-       ok, err := WritePrivateKeytoPem("priv.pem", priv, nil) // 生成密钥文件
-       if ok != true {
-               log.Fatal(err)
-       }
-       pubKey, _ := priv.Public().(*PublicKey)
-       ok, err = WritePublicKeytoPem("pub.pem", pubKey, nil) // 生成公钥文件
-       if ok != true {
-               log.Fatal(err)
-       }
-       msg = []byte("test")
-       err = ioutil.WriteFile("ifile", msg, os.FileMode(0644)) // 生成测试文件
-       if err != nil {
-               log.Fatal(err)
-       }
-       privKey, err := ReadPrivateKeyFromPem("priv.pem", nil) // 读取密钥
-       if err != nil {
-               log.Fatal(err)
-       }
-       pubKey, err = ReadPublicKeyFromPem("pub.pem", nil) // 读取公钥
-       if err != nil {
-               log.Fatal(err)
-       }
-       msg, _ = ioutil.ReadFile("ifile")                // 从文件读取数据
-       sign, err := privKey.Sign(rand.Reader, msg, nil) // 签名
-       if err != nil {
-               log.Fatal(err)
-       }
-       err = ioutil.WriteFile("ofile", sign, os.FileMode(0644))
-       if err != nil {
-               log.Fatal(err)
-       }
-       signdata, _ := ioutil.ReadFile("ofile")
-       ok = privKey.Verify(msg, signdata) // 密钥验证
-       if ok != true {
-               fmt.Printf("Verify error\n")
-       } else {
-               fmt.Printf("Verify ok\n")
-       }
-       ok = pubKey.Verify(msg, signdata) // 公钥验证
-       if ok != true {
-               fmt.Printf("Verify error\n")
-       } else {
-               fmt.Printf("Verify ok\n")
-       }
-       templateReq := CertificateRequest{
-               Subject: pkix.Name{
-                       CommonName:   "test.example.com",
-                       Organization: []string{"Test"},
-               },
-               //              SignatureAlgorithm: ECDSAWithSHA256,
-               SignatureAlgorithm: SM2WithSM3,
-       }
-       _, err = CreateCertificateRequestToPem("req.pem", &templateReq, privKey)
-       if err != nil {
-               log.Fatal(err)
-       }
-       req, err := ReadCertificateRequestFromPem("req.pem")
-       if err != nil {
-               log.Fatal(err)
-       }
-       err = req.CheckSignature()
-       if err != nil {
-               log.Fatal(err)
-       } else {
-               fmt.Printf("CheckSignature ok\n")
-       }
-       testExtKeyUsage := []ExtKeyUsage{ExtKeyUsageClientAuth, ExtKeyUsageServerAuth}
-       testUnknownExtKeyUsage := []asn1.ObjectIdentifier{[]int{1, 2, 3}, []int{2, 59, 1}}
-       extraExtensionData := []byte("extra extension")
-       commonName := "test.example.com"
-       template := Certificate{
-               // SerialNumber is negative to ensure that negative
-               // values are parsed. This is due to the prevalence of
-               // buggy code that produces certificates with negative
-               // serial numbers.
-               SerialNumber: big.NewInt(-1),
-               Subject: pkix.Name{
-                       CommonName:   commonName,
-                       Organization: []string{"TEST"},
-                       Country:      []string{"China"},
-                       ExtraNames: []pkix.AttributeTypeAndValue{
-                               {
-                                       Type:  []int{2, 5, 4, 42},
-                                       Value: "Gopher",
-                               },
-                               // This should override the Country, above.
-                               {
-                                       Type:  []int{2, 5, 4, 6},
-                                       Value: "NL",
-                               },
-                       },
-               },
-               NotBefore: time.Unix(1000, 0),
-               NotAfter:  time.Unix(100000, 0),
-
-               //              SignatureAlgorithm: ECDSAWithSHA256,
-               SignatureAlgorithm: SM2WithSM3,
-
-               SubjectKeyId: []byte{1, 2, 3, 4},
-               KeyUsage:     KeyUsageCertSign,
-
-               ExtKeyUsage:        testExtKeyUsage,
-               UnknownExtKeyUsage: testUnknownExtKeyUsage,
-
-               BasicConstraintsValid: true,
-               IsCA: true,
-
-               OCSPServer:            []string{"http://ocsp.example.com"},
-               IssuingCertificateURL: []string{"http://crt.example.com/ca1.crt"},
-
-               DNSNames:       []string{"test.example.com"},
-               EmailAddresses: []string{"gopher@golang.org"},
-               IPAddresses:    []net.IP{net.IPv4(127, 0, 0, 1).To4(), net.ParseIP("2001:4860:0:2001::68")},
-
-               PolicyIdentifiers:   []asn1.ObjectIdentifier{[]int{1, 2, 3}},
-               PermittedDNSDomains: []string{".example.com", "example.com"},
-
-               CRLDistributionPoints: []string{"http://crl1.example.com/ca1.crl", "http://crl2.example.com/ca1.crl"},
-
-               ExtraExtensions: []pkix.Extension{
-                       {
-                               Id:    []int{1, 2, 3, 4},
-                               Value: extraExtensionData,
-                       },
-                       // This extension should override the SubjectKeyId, above.
-                       {
-                               Id:       oidExtensionSubjectKeyId,
-                               Critical: false,
-                               Value:    []byte{0x04, 0x04, 4, 3, 2, 1},
-                       },
-               },
-       }
-       pubKey, _ = priv.Public().(*PublicKey)
-       ok, _ = CreateCertificateToPem("cert.pem", &template, &template, pubKey, privKey)
-       if ok != true {
-               fmt.Printf("failed to create cert file\n")
-       }
-       cert, err := ReadCertificateFromPem("cert.pem")
-       if err != nil {
-               fmt.Printf("failed to read cert file")
-       }
-       err = cert.CheckSignature(cert.SignatureAlgorithm, cert.RawTBSCertificate, cert.Signature)
-       if err != nil {
-               log.Fatal(err)
-       } else {
-               fmt.Printf("CheckSignature ok\n")
-       }
-}
-
-func BenchmarkSM2(t *testing.B) {
-       t.ReportAllocs()
-       for i := 0; i < t.N; i++ {
-               priv, err := GenerateKey() // 生成密钥对
-               if err != nil {
-                       log.Fatal(err)
-               }
-               msg := []byte("test")
-               sign, err := priv.Sign(rand.Reader, msg, nil) // 签名
-               if err != nil {
-                       log.Fatal(err)
-               }
-               ok := priv.Verify(msg, sign) // 密钥验证
-               if ok != true {
-                       fmt.Printf("Verify error\n")
-               } else {
-                       fmt.Printf("Verify ok\n")
-               }
-       }
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/verify.go b/vendor/github.com/bytom/crypto/sm2/verify.go
deleted file mode 100644 (file)
index ec23e48..0000000
--- a/vendor/github.com/bytom/crypto/sm2/verify.go
+++ /dev/null
@@ -1,553 +0,0 @@
-package sm2
-
-import (
-       "bytes"
-       "errors"
-       "fmt"
-       "net"
-       "runtime"
-       "strings"
-       "time"
-       "unicode/utf8"
-)
-
-type InvalidReason int
-
-const (
-       // NotAuthorizedToSign results when a certificate is signed by another
-       // which isn't marked as a CA certificate.
-       NotAuthorizedToSign InvalidReason = iota
-       // Expired results when a certificate has expired, based on the time
-       // given in the VerifyOptions.
-       Expired
-       // CANotAuthorizedForThisName results when an intermediate or root
-       // certificate has a name constraint which doesn't include the name
-       // being checked.
-       CANotAuthorizedForThisName
-       // TooManyIntermediates results when a path length constraint is
-       // violated.
-       TooManyIntermediates
-       // IncompatibleUsage results when the certificate's key usage indicates
-       // that it may only be used for a different purpose.
-       IncompatibleUsage
-       // NameMismatch results when the subject name of a parent certificate
-       // does not match the issuer name in the child.
-       NameMismatch
-)
-
-// CertificateInvalidError results when an odd error occurs. Users of this
-// library probably want to handle all these errors uniformly.
-type CertificateInvalidError struct {
-       Cert   *Certificate
-       Reason InvalidReason
-}
-
-func (e CertificateInvalidError) Error() string {
-       switch e.Reason {
-       case NotAuthorizedToSign:
-               return "x509: certificate is not authorized to sign other certificates"
-       case Expired:
-               return "x509: certificate has expired or is not yet valid"
-       case CANotAuthorizedForThisName:
-               return "x509: a root or intermediate certificate is not authorized to sign in this domain"
-       case TooManyIntermediates:
-               return "x509: too many intermediates for path length constraint"
-       case IncompatibleUsage:
-               return "x509: certificate specifies an incompatible key usage"
-       case NameMismatch:
-               return "x509: issuer name does not match subject from issuing certificate"
-       }
-       return "x509: unknown error"
-}
-
-// HostnameError results when the set of authorized names doesn't match the
-// requested name.
-type HostnameError struct {
-       Certificate *Certificate
-       Host        string
-}
-
-func (h HostnameError) Error() string {
-       c := h.Certificate
-
-       var valid string
-       if ip := net.ParseIP(h.Host); ip != nil {
-               // Trying to validate an IP
-               if len(c.IPAddresses) == 0 {
-                       return "x509: cannot validate certificate for " + h.Host + " because it doesn't contain any IP SANs"
-               }
-               for _, san := range c.IPAddresses {
-                       if len(valid) > 0 {
-                               valid += ", "
-                       }
-                       valid += san.String()
-               }
-       } else {
-               if len(c.DNSNames) > 0 {
-                       valid = strings.Join(c.DNSNames, ", ")
-               } else {
-                       valid = c.Subject.CommonName
-               }
-       }
-
-       if len(valid) == 0 {
-               return "x509: certificate is not valid for any names, but wanted to match " + h.Host
-       }
-       return "x509: certificate is valid for " + valid + ", not " + h.Host
-}
-
-// UnknownAuthorityError results when the certificate issuer is unknown
-type UnknownAuthorityError struct {
-       Cert *Certificate
-       // hintErr contains an error that may be helpful in determining why an
-       // authority wasn't found.
-       hintErr error
-       // hintCert contains a possible authority certificate that was rejected
-       // because of the error in hintErr.
-       hintCert *Certificate
-}
-
-func (e UnknownAuthorityError) Error() string {
-       s := "x509: certificate signed by unknown authority"
-       if e.hintErr != nil {
-               certName := e.hintCert.Subject.CommonName
-               if len(certName) == 0 {
-                       if len(e.hintCert.Subject.Organization) > 0 {
-                               certName = e.hintCert.Subject.Organization[0]
-                       } else {
-                               certName = "serial:" + e.hintCert.SerialNumber.String()
-                       }
-               }
-               s += fmt.Sprintf(" (possibly because of %q while trying to verify candidate authority certificate %q)", e.hintErr, certName)
-       }
-       return s
-}
-
-// SystemRootsError results when we fail to load the system root certificates.
-type SystemRootsError struct {
-       Err error
-}
-
-func (se SystemRootsError) Error() string {
-       msg := "x509: failed to load system roots and no roots provided"
-       if se.Err != nil {
-               return msg + "; " + se.Err.Error()
-       }
-       return msg
-}
-
-// errNotParsed is returned when a certificate without ASN.1 contents is
-// verified. Platform-specific verification needs the ASN.1 contents.
-var errNotParsed = errors.New("x509: missing ASN.1 contents; use ParseCertificate")
-
-// VerifyOptions contains parameters for Certificate.Verify. It's a structure
-// because other PKIX verification APIs have ended up needing many options.
-type VerifyOptions struct {
-       DNSName       string
-       Intermediates *CertPool
-       Roots         *CertPool // if nil, the system roots are used
-       CurrentTime   time.Time // if zero, the current time is used
-       // KeyUsage specifies which Extended Key Usage values are acceptable.
-       // An empty list means ExtKeyUsageServerAuth. Key usage is considered a
-       // constraint down the chain which mirrors Windows CryptoAPI behavior,
-       // but not the spec. To accept any key usage, include ExtKeyUsageAny.
-       KeyUsages []ExtKeyUsage
-}
-
-const (
-       leafCertificate = iota
-       intermediateCertificate
-       rootCertificate
-)
-
-func matchNameConstraint(domain, constraint string) bool {
-       // The meaning of zero length constraints is not specified, but this
-       // code follows NSS and accepts them as valid for everything.
-       if len(constraint) == 0 {
-               return true
-       }
-
-       if len(domain) < len(constraint) {
-               return false
-       }
-
-       prefixLen := len(domain) - len(constraint)
-       if !strings.EqualFold(domain[prefixLen:], constraint) {
-               return false
-       }
-
-       if prefixLen == 0 {
-               return true
-       }
-
-       isSubdomain := domain[prefixLen-1] == '.'
-       constraintHasLeadingDot := constraint[0] == '.'
-       return isSubdomain != constraintHasLeadingDot
-}
-
-// isValid performs validity checks on the c.
-func (c *Certificate) isValid(certType int, currentChain []*Certificate, opts *VerifyOptions) error {
-       if len(currentChain) > 0 {
-               child := currentChain[len(currentChain)-1]
-               if !bytes.Equal(child.RawIssuer, c.RawSubject) {
-                       return CertificateInvalidError{c, NameMismatch}
-               }
-       }
-       now := opts.CurrentTime
-       if now.IsZero() {
-               now = time.Now()
-       }
-       if now.Before(c.NotBefore) || now.After(c.NotAfter) {
-               return CertificateInvalidError{c, Expired}
-       }
-       if len(c.PermittedDNSDomains) > 0 {
-               ok := false
-               for _, constraint := range c.PermittedDNSDomains {
-                       ok = matchNameConstraint(opts.DNSName, constraint)
-                       if ok {
-                               break
-                       }
-               }
-
-               if !ok {
-                       return CertificateInvalidError{c, CANotAuthorizedForThisName}
-               }
-       }
-
-       // KeyUsage status flags are ignored. From Engineering Security, Peter
-       // Gutmann: A European government CA marked its signing certificates as
-       // being valid for encryption only, but no-one noticed. Another
-       // European CA marked its signature keys as not being valid for
-       // signatures. A different CA marked its own trusted root certificate
-       // as being invalid for certificate signing. Another national CA
-       // distributed a certificate to be used to encrypt data for the
-       // country’s tax authority that was marked as only being usable for
-       // digital signatures but not for encryption. Yet another CA reversed
-       // the order of the bit flags in the keyUsage due to confusion over
-       // encoding endianness, essentially setting a random keyUsage in
-       // certificates that it issued. Another CA created a self-invalidating
-       // certificate by adding a certificate policy statement stipulating
-       // that the certificate had to be used strictly as specified in the
-       // keyUsage, and a keyUsage containing a flag indicating that the RSA
-       // encryption key could only be used for Diffie-Hellman key agreement.
-
-       if certType == intermediateCertificate && (!c.BasicConstraintsValid || !c.IsCA) {
-               return CertificateInvalidError{c, NotAuthorizedToSign}
-       }
-
-       if c.BasicConstraintsValid && c.MaxPathLen >= 0 {
-               numIntermediates := len(currentChain) - 1
-               if numIntermediates > c.MaxPathLen {
-                       return CertificateInvalidError{c, TooManyIntermediates}
-               }
-       }
-
-       return nil
-}
-
-// Verify attempts to verify c by building one or more chains from c to a
-// certificate in opts.Roots, using certificates in opts.Intermediates if
-// needed. If successful, it returns one or more chains where the first
-// element of the chain is c and the last element is from opts.Roots.
-//
-// If opts.Roots is nil and system roots are unavailable the returned error
-// will be of type SystemRootsError.
-//
-// WARNING: this doesn't do any revocation checking.
-func (c *Certificate) Verify(opts VerifyOptions) (chains [][]*Certificate, err error) {
-       // Platform-specific verification needs the ASN.1 contents so
-       // this makes the behavior consistent across platforms.
-       if len(c.Raw) == 0 {
-               return nil, errNotParsed
-       }
-       if opts.Intermediates != nil {
-               for _, intermediate := range opts.Intermediates.certs {
-                       if len(intermediate.Raw) == 0 {
-                               return nil, errNotParsed
-                       }
-               }
-       }
-
-       // Use Windows's own verification and chain building.
-       if opts.Roots == nil && runtime.GOOS == "windows" {
-               return c.systemVerify(&opts)
-       }
-
-       if len(c.UnhandledCriticalExtensions) > 0 {
-               return nil, UnhandledCriticalExtension{}
-       }
-
-       if opts.Roots == nil {
-               opts.Roots = systemRootsPool()
-               if opts.Roots == nil {
-                       return nil, SystemRootsError{systemRootsErr}
-               }
-       }
-
-       err = c.isValid(leafCertificate, nil, &opts)
-       if err != nil {
-               return
-       }
-
-       if len(opts.DNSName) > 0 {
-               err = c.VerifyHostname(opts.DNSName)
-               if err != nil {
-                       return
-               }
-       }
-
-       var candidateChains [][]*Certificate
-       if opts.Roots.contains(c) {
-               candidateChains = append(candidateChains, []*Certificate{c})
-       } else {
-               if candidateChains, err = c.buildChains(make(map[int][][]*Certificate), []*Certificate{c}, &opts); err != nil {
-                       return nil, err
-               }
-       }
-
-       keyUsages := opts.KeyUsages
-       if len(keyUsages) == 0 {
-               keyUsages = []ExtKeyUsage{ExtKeyUsageServerAuth}
-       }
-
-       // If any key usage is acceptable then we're done.
-       for _, usage := range keyUsages {
-               if usage == ExtKeyUsageAny {
-                       chains = candidateChains
-                       return
-               }
-       }
-
-       for _, candidate := range candidateChains {
-               if checkChainForKeyUsage(candidate, keyUsages) {
-                       chains = append(chains, candidate)
-               }
-       }
-
-       if len(chains) == 0 {
-               err = CertificateInvalidError{c, IncompatibleUsage}
-       }
-
-       return
-}
-
-func appendToFreshChain(chain []*Certificate, cert *Certificate) []*Certificate {
-       n := make([]*Certificate, len(chain)+1)
-       copy(n, chain)
-       n[len(chain)] = cert
-       return n
-}
-
-func (c *Certificate) buildChains(cache map[int][][]*Certificate, currentChain []*Certificate, opts *VerifyOptions) (chains [][]*Certificate, err error) {
-       possibleRoots, failedRoot, rootErr := opts.Roots.findVerifiedParents(c)
-nextRoot:
-       for _, rootNum := range possibleRoots {
-               root := opts.Roots.certs[rootNum]
-
-               for _, cert := range currentChain {
-                       if cert.Equal(root) {
-                               continue nextRoot
-                       }
-               }
-
-               err = root.isValid(rootCertificate, currentChain, opts)
-               if err != nil {
-                       continue
-               }
-               chains = append(chains, appendToFreshChain(currentChain, root))
-       }
-
-       possibleIntermediates, failedIntermediate, intermediateErr := opts.Intermediates.findVerifiedParents(c)
-nextIntermediate:
-       for _, intermediateNum := range possibleIntermediates {
-               intermediate := opts.Intermediates.certs[intermediateNum]
-               for _, cert := range currentChain {
-                       if cert.Equal(intermediate) {
-                               continue nextIntermediate
-                       }
-               }
-               err = intermediate.isValid(intermediateCertificate, currentChain, opts)
-               if err != nil {
-                       continue
-               }
-               var childChains [][]*Certificate
-               childChains, ok := cache[intermediateNum]
-               if !ok {
-                       childChains, err = intermediate.buildChains(cache, appendToFreshChain(currentChain, intermediate), opts)
-                       cache[intermediateNum] = childChains
-               }
-               chains = append(chains, childChains...)
-       }
-
-       if len(chains) > 0 {
-               err = nil
-       }
-
-       if len(chains) == 0 && err == nil {
-               hintErr := rootErr
-               hintCert := failedRoot
-               if hintErr == nil {
-                       hintErr = intermediateErr
-                       hintCert = failedIntermediate
-               }
-               err = UnknownAuthorityError{c, hintErr, hintCert}
-       }
-
-       return
-}
-
-func matchHostnames(pattern, host string) bool {
-       host = strings.TrimSuffix(host, ".")
-       pattern = strings.TrimSuffix(pattern, ".")
-
-       if len(pattern) == 0 || len(host) == 0 {
-               return false
-       }
-
-       patternParts := strings.Split(pattern, ".")
-       hostParts := strings.Split(host, ".")
-
-       if len(patternParts) != len(hostParts) {
-               return false
-       }
-
-       for i, patternPart := range patternParts {
-               if i == 0 && patternPart == "*" {
-                       continue
-               }
-               if patternPart != hostParts[i] {
-                       return false
-               }
-       }
-
-       return true
-}
-
-// toLowerCaseASCII returns a lower-case version of in. See RFC 6125 6.4.1. We use
-// an explicitly ASCII function to avoid any sharp corners resulting from
-// performing Unicode operations on DNS labels.
-func toLowerCaseASCII(in string) string {
-       // If the string is already lower-case then there's nothing to do.
-       isAlreadyLowerCase := true
-       for _, c := range in {
-               if c == utf8.RuneError {
-                       // If we get a UTF-8 error then there might be
-                       // upper-case ASCII bytes in the invalid sequence.
-                       isAlreadyLowerCase = false
-                       break
-               }
-               if 'A' <= c && c <= 'Z' {
-                       isAlreadyLowerCase = false
-                       break
-               }
-       }
-
-       if isAlreadyLowerCase {
-               return in
-       }
-
-       out := []byte(in)
-       for i, c := range out {
-               if 'A' <= c && c <= 'Z' {
-                       out[i] += 'a' - 'A'
-               }
-       }
-       return string(out)
-}
-
-// VerifyHostname returns nil if c is a valid certificate for the named host.
-// Otherwise it returns an error describing the mismatch.
-func (c *Certificate) VerifyHostname(h string) error {
-       // IP addresses may be written in [ ].
-       candidateIP := h
-       if len(h) >= 3 && h[0] == '[' && h[len(h)-1] == ']' {
-               candidateIP = h[1 : len(h)-1]
-       }
-       if ip := net.ParseIP(candidateIP); ip != nil {
-               // We only match IP addresses against IP SANs.
-               // https://tools.ietf.org/html/rfc6125#appendix-B.2
-               for _, candidate := range c.IPAddresses {
-                       if ip.Equal(candidate) {
-                               return nil
-                       }
-               }
-               return HostnameError{c, candidateIP}
-       }
-
-       lowered := toLowerCaseASCII(h)
-
-       if len(c.DNSNames) > 0 {
-               for _, match := range c.DNSNames {
-                       if matchHostnames(toLowerCaseASCII(match), lowered) {
-                               return nil
-                       }
-               }
-               // If Subject Alt Name is given, we ignore the common name.
-       } else if matchHostnames(toLowerCaseASCII(c.Subject.CommonName), lowered) {
-               return nil
-       }
-
-       return HostnameError{c, h}
-}
-
-func checkChainForKeyUsage(chain []*Certificate, keyUsages []ExtKeyUsage) bool {
-       usages := make([]ExtKeyUsage, len(keyUsages))
-       copy(usages, keyUsages)
-
-       if len(chain) == 0 {
-               return false
-       }
-
-       usagesRemaining := len(usages)
-
-       // We walk down the list and cross out any usages that aren't supported
-       // by each certificate. If we cross out all the usages, then the chain
-       // is unacceptable.
-
-NextCert:
-       for i := len(chain) - 1; i >= 0; i-- {
-               cert := chain[i]
-               if len(cert.ExtKeyUsage) == 0 && len(cert.UnknownExtKeyUsage) == 0 {
-                       // The certificate doesn't have any extended key usage specified.
-                       continue
-               }
-
-               for _, usage := range cert.ExtKeyUsage {
-                       if usage == ExtKeyUsageAny {
-                               // The certificate is explicitly good for any usage.
-                               continue NextCert
-                       }
-               }
-
-               const invalidUsage ExtKeyUsage = -1
-
-       NextRequestedUsage:
-               for i, requestedUsage := range usages {
-                       if requestedUsage == invalidUsage {
-                               continue
-                       }
-
-                       for _, usage := range cert.ExtKeyUsage {
-                               if requestedUsage == usage {
-                                       continue NextRequestedUsage
-                               } else if requestedUsage == ExtKeyUsageServerAuth &&
-                                       (usage == ExtKeyUsageNetscapeServerGatedCrypto ||
-                                               usage == ExtKeyUsageMicrosoftServerGatedCrypto) {
-                                       // In order to support COMODO
-                                       // certificate chains, we have to
-                                       // accept Netscape or Microsoft SGC
-                                       // usages as equal to ServerAuth.
-                                       continue NextRequestedUsage
-                               }
-                       }
-
-                       usages[i] = invalidUsage
-                       usagesRemaining--
-                       if usagesRemaining == 0 {
-                               return false
-                       }
-               }
-       }
-
-       return true
-}

diff --git a/vendor/github.com/bytom/crypto/sm2/x509.go b/vendor/github.com/bytom/crypto/sm2/x509.go
deleted file mode 100644 (file)
index d786ca2..0000000
--- a/vendor/github.com/bytom/crypto/sm2/x509.go
+++ /dev/null
@@ -1,2514 +0,0 @@
-// crypto/x509 add sm2 support
-package sm2
-
-import (
-       "bytes"
-       "crypto"
-       "crypto/dsa"
-       "crypto/ecdsa"
-       "crypto/elliptic"
-       "crypto/md5"
-       "crypto/rand"
-       "crypto/rsa"
-       "crypto/sha1"
-       "crypto/sha256"
-       "crypto/sha512"
-       "crypto/x509/pkix"
-       "encoding/asn1"
-       "encoding/pem"
-       "errors"
-       "fmt"
-       "hash"
-       "io"
-       "io/ioutil"
-       "math/big"
-       "net"
-       "os"
-       "strconv"
-       "time"
-
-       "golang.org/x/crypto/ripemd160"
-       "golang.org/x/crypto/sha3"
-
-       "github.com/bytom/crypto/sm3"
-)
-
-// pkixPublicKey reflects a PKIX public key structure. See SubjectPublicKeyInfo
-// in RFC 3280.
-type pkixPublicKey struct {
-       Algo      pkix.AlgorithmIdentifier
-       BitString asn1.BitString
-}
-
-// ParsePKIXPublicKey parses a DER encoded public key. These values are
-// typically found in PEM blocks with "BEGIN PUBLIC KEY".
-//
-// Supported key types include RSA, DSA, and ECDSA. Unknown key
-// types result in an error.
-//
-// On success, pub will be of type *rsa.PublicKey, *dsa.PublicKey,
-// or *ecdsa.PublicKey.
-func ParsePKIXPublicKey(derBytes []byte) (pub interface{}, err error) {
-       var pki publicKeyInfo
-
-       if rest, err := asn1.Unmarshal(derBytes, &pki); err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, errors.New("x509: trailing data after ASN.1 of public-key")
-       }
-       algo := getPublicKeyAlgorithmFromOID(pki.Algorithm.Algorithm)
-       if algo == UnknownPublicKeyAlgorithm {
-               return nil, errors.New("x509: unknown public key algorithm")
-       }
-       return parsePublicKey(algo, &pki)
-}
-
-func marshalPublicKey(pub interface{}) (publicKeyBytes []byte, publicKeyAlgorithm pkix.AlgorithmIdentifier, err error) {
-       switch pub := pub.(type) {
-       case *rsa.PublicKey:
-               publicKeyBytes, err = asn1.Marshal(rsaPublicKey{
-                       N: pub.N,
-                       E: pub.E,
-               })
-               if err != nil {
-                       return nil, pkix.AlgorithmIdentifier{}, err
-               }
-               publicKeyAlgorithm.Algorithm = oidPublicKeyRSA
-               // This is a NULL parameters value which is required by
-               // https://tools.ietf.org/html/rfc3279#section-2.3.1.
-               publicKeyAlgorithm.Parameters = asn1.RawValue{
-                       Tag: 5,
-               }
-       case *ecdsa.PublicKey:
-               publicKeyBytes = elliptic.Marshal(pub.Curve, pub.X, pub.Y)
-               oid, ok := oidFromNamedCurve(pub.Curve)
-               if !ok {
-                       return nil, pkix.AlgorithmIdentifier{}, errors.New("x509: unsupported elliptic curve")
-               }
-               publicKeyAlgorithm.Algorithm = oidPublicKeyECDSA
-               var paramBytes []byte
-               paramBytes, err = asn1.Marshal(oid)
-               if err != nil {
-                       return
-               }
-               publicKeyAlgorithm.Parameters.FullBytes = paramBytes
-       case *PublicKey:
-               publicKeyBytes = elliptic.Marshal(pub.Curve, pub.X, pub.Y)
-               oid, ok := oidFromNamedCurve(pub.Curve)
-               if !ok {
-                       return nil, pkix.AlgorithmIdentifier{}, errors.New("x509: unsupported SM2 curve")
-               }
-               publicKeyAlgorithm.Algorithm = oidPublicKeyECDSA
-               var paramBytes []byte
-               paramBytes, err = asn1.Marshal(oid)
-               if err != nil {
-                       return
-               }
-               publicKeyAlgorithm.Parameters.FullBytes = paramBytes
-       default:
-               return nil, pkix.AlgorithmIdentifier{}, errors.New("x509: only RSA and ECDSA(SM2) public keys supported")
-       }
-
-       return publicKeyBytes, publicKeyAlgorithm, nil
-}
-
-// MarshalPKIXPublicKey serialises a public key to DER-encoded PKIX format.
-func MarshalPKIXPublicKey(pub interface{}) ([]byte, error) {
-       var publicKeyBytes []byte
-       var publicKeyAlgorithm pkix.AlgorithmIdentifier
-       var err error
-
-       if publicKeyBytes, publicKeyAlgorithm, err = marshalPublicKey(pub); err != nil {
-               return nil, err
-       }
-
-       pkix := pkixPublicKey{
-               Algo: publicKeyAlgorithm,
-               BitString: asn1.BitString{
-                       Bytes:     publicKeyBytes,
-                       BitLength: 8 * len(publicKeyBytes),
-               },
-       }
-
-       ret, _ := asn1.Marshal(pkix)
-       return ret, nil
-}
-
-// These structures reflect the ASN.1 structure of X.509 certificates.:
-
-type certificate struct {
-       Raw                asn1.RawContent
-       TBSCertificate     tbsCertificate
-       SignatureAlgorithm pkix.AlgorithmIdentifier
-       SignatureValue     asn1.BitString
-}
-
-type tbsCertificate struct {
-       Raw                asn1.RawContent
-       Version            int `asn1:"optional,explicit,default:0,tag:0"`
-       SerialNumber       *big.Int
-       SignatureAlgorithm pkix.AlgorithmIdentifier
-       Issuer             asn1.RawValue
-       Validity           validity
-       Subject            asn1.RawValue
-       PublicKey          publicKeyInfo
-       UniqueId           asn1.BitString   `asn1:"optional,tag:1"`
-       SubjectUniqueId    asn1.BitString   `asn1:"optional,tag:2"`
-       Extensions         []pkix.Extension `asn1:"optional,explicit,tag:3"`
-}
-
-type dsaAlgorithmParameters struct {
-       P, Q, G *big.Int
-}
-
-type dsaSignature struct {
-       R, S *big.Int
-}
-
-type ecdsaSignature dsaSignature
-
-type validity struct {
-       NotBefore, NotAfter time.Time
-}
-
-type publicKeyInfo struct {
-       Raw       asn1.RawContent
-       Algorithm pkix.AlgorithmIdentifier
-       PublicKey asn1.BitString
-}
-
-// RFC 5280,  4.2.1.1
-type authKeyId struct {
-       Id []byte `asn1:"optional,tag:0"`
-}
-
-type SignatureAlgorithm int
-
-type Hash uint
-
-func init() {
-       RegisterHash(MD4, nil)
-       RegisterHash(MD5, md5.New)
-       RegisterHash(SHA1, sha1.New)
-       RegisterHash(SHA224, sha256.New224)
-       RegisterHash(SHA256, sha256.New)
-       RegisterHash(SHA384, sha512.New384)
-       RegisterHash(SHA512, sha512.New)
-       RegisterHash(MD5SHA1, nil)
-       RegisterHash(RIPEMD160, ripemd160.New)
-       RegisterHash(SHA3_224, sha3.New224)
-       RegisterHash(SHA3_256, sha3.New256)
-       RegisterHash(SHA3_384, sha3.New384)
-       RegisterHash(SHA3_512, sha3.New512)
-       RegisterHash(SHA512_224, sha512.New512_224)
-       RegisterHash(SHA512_256, sha512.New512_256)
-       RegisterHash(SM3, sm3.New)
-}
-
-// HashFunc simply returns the value of h so that Hash implements SignerOpts.
-func (h Hash) HashFunc() crypto.Hash {
-       return crypto.Hash(h)
-}
-
-const (
-       MD4        Hash = 1 + iota // import golang.org/x/crypto/md4
-       MD5                        // import crypto/md5
-       SHA1                       // import crypto/sha1
-       SHA224                     // import crypto/sha256
-       SHA256                     // import crypto/sha256
-       SHA384                     // import crypto/sha512
-       SHA512                     // import crypto/sha512
-       MD5SHA1                    // no implementation; MD5+SHA1 used for TLS RSA
-       RIPEMD160                  // import golang.org/x/crypto/ripemd160
-       SHA3_224                   // import golang.org/x/crypto/sha3
-       SHA3_256                   // import golang.org/x/crypto/sha3
-       SHA3_384                   // import golang.org/x/crypto/sha3
-       SHA3_512                   // import golang.org/x/crypto/sha3
-       SHA512_224                 // import crypto/sha512
-       SHA512_256                 // import crypto/sha512
-       SM3
-       maxHash
-)
-
-var digestSizes = []uint8{
-       MD4:        16,
-       MD5:        16,
-       SHA1:       20,
-       SHA224:     28,
-       SHA256:     32,
-       SHA384:     48,
-       SHA512:     64,
-       SHA512_224: 28,
-       SHA512_256: 32,
-       SHA3_224:   28,
-       SHA3_256:   32,
-       SHA3_384:   48,
-       SHA3_512:   64,
-       MD5SHA1:    36,
-       RIPEMD160:  20,
-       SM3:        32,
-}
-
-// Size returns the length, in bytes, of a digest resulting from the given hash
-// function. It doesn't require that the hash function in question be linked
-// into the program.
-func (h Hash) Size() int {
-       if h > 0 && h < maxHash {
-               return int(digestSizes[h])
-       }
-       panic("crypto: Size of unknown hash function")
-}
-
-var hashes = make([]func() hash.Hash, maxHash)
-
-// New returns a new hash.Hash calculating the given hash function. New panics
-// if the hash function is not linked into the binary.
-func (h Hash) New() hash.Hash {
-       if h > 0 && h < maxHash {
-               f := hashes[h]
-               if f != nil {
-                       return f()
-               }
-       }
-       panic("crypto: requested hash function #" + strconv.Itoa(int(h)) + " is unavailable")
-}
-
-// Available reports whether the given hash function is linked into the binary.
-func (h Hash) Available() bool {
-       return h < maxHash && hashes[h] != nil
-}
-
-// RegisterHash registers a function that returns a new instance of the given
-// hash function. This is intended to be called from the init function in
-// packages that implement hash functions.
-func RegisterHash(h Hash, f func() hash.Hash) {
-       if h >= maxHash {
-               panic("crypto: RegisterHash of unknown hash function")
-       }
-       hashes[h] = f
-}
-
-const (
-       UnknownSignatureAlgorithm SignatureAlgorithm = iota
-       MD2WithRSA
-       MD5WithRSA
-       //      SM3WithRSA reserve
-       SHA1WithRSA
-       SHA256WithRSA
-       SHA384WithRSA
-       SHA512WithRSA
-       DSAWithSHA1
-       DSAWithSHA256
-       ECDSAWithSHA1
-       ECDSAWithSHA256
-       ECDSAWithSHA384
-       ECDSAWithSHA512
-       SHA256WithRSAPSS
-       SHA384WithRSAPSS
-       SHA512WithRSAPSS
-       SM2WithSM3
-       SM2WithSHA1
-       SM2WithSHA256
-)
-
-func (algo SignatureAlgorithm) isRSAPSS() bool {
-       switch algo {
-       case SHA256WithRSAPSS, SHA384WithRSAPSS, SHA512WithRSAPSS:
-               return true
-       default:
-               return false
-       }
-}
-
-var algoName = [...]string{
-       MD2WithRSA:  "MD2-RSA",
-       MD5WithRSA:  "MD5-RSA",
-       SHA1WithRSA: "SHA1-RSA",
-       //      SM3WithRSA:       "SM3-RSA", reserve
-       SHA256WithRSA:    "SHA256-RSA",
-       SHA384WithRSA:    "SHA384-RSA",
-       SHA512WithRSA:    "SHA512-RSA",
-       SHA256WithRSAPSS: "SHA256-RSAPSS",
-       SHA384WithRSAPSS: "SHA384-RSAPSS",
-       SHA512WithRSAPSS: "SHA512-RSAPSS",
-       DSAWithSHA1:      "DSA-SHA1",
-       DSAWithSHA256:    "DSA-SHA256",
-       ECDSAWithSHA1:    "ECDSA-SHA1",
-       ECDSAWithSHA256:  "ECDSA-SHA256",
-       ECDSAWithSHA384:  "ECDSA-SHA384",
-       ECDSAWithSHA512:  "ECDSA-SHA512",
-       SM2WithSM3:       "SM2-SM3",
-       SM2WithSHA1:      "SM2-SHA1",
-       SM2WithSHA256:    "SM2-SHA256",
-}
-
-func (algo SignatureAlgorithm) String() string {
-       if 0 < algo && int(algo) < len(algoName) {
-               return algoName[algo]
-       }
-       return strconv.Itoa(int(algo))
-}
-
-type PublicKeyAlgorithm int
-
-const (
-       UnknownPublicKeyAlgorithm PublicKeyAlgorithm = iota
-       RSA
-       DSA
-       ECDSA
-)
-
-// OIDs for signature algorithms
-//
-// pkcs-1 OBJECT IDENTIFIER ::= {
-//    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) 1 }
-//
-//
-// RFC 3279 2.2.1 RSA Signature Algorithms
-//
-// md2WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 2 }
-//
-// md5WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 4 }
-//
-// sha-1WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 5 }
-//
-// dsaWithSha1 OBJECT IDENTIFIER ::= {
-//    iso(1) member-body(2) us(840) x9-57(10040) x9cm(4) 3 }
-//
-// RFC 3279 2.2.3 ECDSA Signature Algorithm
-//
-// ecdsa-with-SHA1 OBJECT IDENTIFIER ::= {
-//       iso(1) member-body(2) us(840) ansi-x962(10045)
-//    signatures(4) ecdsa-with-SHA1(1)}
-//
-//
-// RFC 4055 5 PKCS #1 Version 1.5
-//
-// sha256WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 11 }
-//
-// sha384WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 12 }
-//
-// sha512WithRSAEncryption OBJECT IDENTIFIER ::= { pkcs-1 13 }
-//
-//
-// RFC 5758 3.1 DSA Signature Algorithms
-//
-// dsaWithSha256 OBJECT IDENTIFIER ::= {
-//    joint-iso-ccitt(2) country(16) us(840) organization(1) gov(101)
-//    csor(3) algorithms(4) id-dsa-with-sha2(3) 2}
-//
-// RFC 5758 3.2 ECDSA Signature Algorithm
-//
-// ecdsa-with-SHA256 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
-//    us(840) ansi-X9-62(10045) signatures(4) ecdsa-with-SHA2(3) 2 }
-//
-// ecdsa-with-SHA384 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
-//    us(840) ansi-X9-62(10045) signatures(4) ecdsa-with-SHA2(3) 3 }
-//
-// ecdsa-with-SHA512 OBJECT IDENTIFIER ::= { iso(1) member-body(2)
-//    us(840) ansi-X9-62(10045) signatures(4) ecdsa-with-SHA2(3) 4 }
-
-var (
-       oidSignatureMD2WithRSA      = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2}
-       oidSignatureMD5WithRSA      = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4}
-       oidSignatureSHA1WithRSA     = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5}
-       oidSignatureSHA256WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11}
-       oidSignatureSHA384WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12}
-       oidSignatureSHA512WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13}
-       oidSignatureRSAPSS          = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 10}
-       oidSignatureDSAWithSHA1     = asn1.ObjectIdentifier{1, 2, 840, 10040, 4, 3}
-       oidSignatureDSAWithSHA256   = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 3, 2}
-       oidSignatureECDSAWithSHA1   = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 1}
-       oidSignatureECDSAWithSHA256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 2}
-       oidSignatureECDSAWithSHA384 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 3}
-       oidSignatureECDSAWithSHA512 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 4}
-       oidSignatureSM2WithSM3      = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 501}
-       oidSignatureSM2WithSHA1     = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 502}
-       oidSignatureSM2WithSHA256   = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 503}
-       //      oidSignatureSM3WithRSA      = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 504}
-
-       oidSM3    = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 401, 1}
-       oidSHA256 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 1}
-       oidSHA384 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 2}
-       oidSHA512 = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 2, 3}
-
-       oidMGF1 = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 8}
-
-       // oidISOSignatureSHA1WithRSA means the same as oidSignatureSHA1WithRSA
-       // but it's specified by ISO. Microsoft's makecert.exe has been known
-       // to produce certificates with this OID.
-       oidISOSignatureSHA1WithRSA = asn1.ObjectIdentifier{1, 3, 14, 3, 2, 29}
-)
-
-var signatureAlgorithmDetails = []struct {
-       algo       SignatureAlgorithm
-       oid        asn1.ObjectIdentifier
-       pubKeyAlgo PublicKeyAlgorithm
-       hash       Hash
-}{
-       {MD2WithRSA, oidSignatureMD2WithRSA, RSA, Hash(0) /* no value for MD2 */},
-       {MD5WithRSA, oidSignatureMD5WithRSA, RSA, MD5},
-       {SHA1WithRSA, oidSignatureSHA1WithRSA, RSA, SHA1},
-       {SHA1WithRSA, oidISOSignatureSHA1WithRSA, RSA, SHA1},
-       {SHA256WithRSA, oidSignatureSHA256WithRSA, RSA, SHA256},
-       {SHA384WithRSA, oidSignatureSHA384WithRSA, RSA, SHA384},
-       {SHA512WithRSA, oidSignatureSHA512WithRSA, RSA, SHA512},
-       {SHA256WithRSAPSS, oidSignatureRSAPSS, RSA, SHA256},
-       {SHA384WithRSAPSS, oidSignatureRSAPSS, RSA, SHA384},
-       {SHA512WithRSAPSS, oidSignatureRSAPSS, RSA, SHA512},
-       {DSAWithSHA1, oidSignatureDSAWithSHA1, DSA, SHA1},
-       {DSAWithSHA256, oidSignatureDSAWithSHA256, DSA, SHA256},
-       {ECDSAWithSHA1, oidSignatureECDSAWithSHA1, ECDSA, SHA1},
-       {ECDSAWithSHA256, oidSignatureECDSAWithSHA256, ECDSA, SHA256},
-       {ECDSAWithSHA384, oidSignatureECDSAWithSHA384, ECDSA, SHA384},
-       {ECDSAWithSHA512, oidSignatureECDSAWithSHA512, ECDSA, SHA512},
-       {SM2WithSM3, oidSignatureSM2WithSM3, ECDSA, SM3},
-       {SM2WithSHA1, oidSignatureSM2WithSHA1, ECDSA, SHA1},
-       {SM2WithSHA256, oidSignatureSM2WithSHA256, ECDSA, SHA256},
-       //      {SM3WithRSA, oidSignatureSM3WithRSA, RSA, SM3},
-}
-
-// pssParameters reflects the parameters in an AlgorithmIdentifier that
-// specifies RSA PSS. See https://tools.ietf.org/html/rfc3447#appendix-A.2.3
-type pssParameters struct {
-       // The following three fields are not marked as
-       // optional because the default values specify SHA-1,
-       // which is no longer suitable for use in signatures.
-       Hash         pkix.AlgorithmIdentifier `asn1:"explicit,tag:0"`
-       MGF          pkix.AlgorithmIdentifier `asn1:"explicit,tag:1"`
-       SaltLength   int                      `asn1:"explicit,tag:2"`
-       TrailerField int                      `asn1:"optional,explicit,tag:3,default:1"`
-}
-
-// rsaPSSParameters returns an asn1.RawValue suitable for use as the Parameters
-// in an AlgorithmIdentifier that specifies RSA PSS.
-func rsaPSSParameters(hashFunc Hash) asn1.RawValue {
-       var hashOID asn1.ObjectIdentifier
-
-       switch hashFunc {
-       case SHA256:
-               hashOID = oidSHA256
-       case SHA384:
-               hashOID = oidSHA384
-       case SHA512:
-               hashOID = oidSHA512
-       }
-
-       params := pssParameters{
-               Hash: pkix.AlgorithmIdentifier{
-                       Algorithm: hashOID,
-                       Parameters: asn1.RawValue{
-                               Tag: 5, /* ASN.1 NULL */
-                       },
-               },
-               MGF: pkix.AlgorithmIdentifier{
-                       Algorithm: oidMGF1,
-               },
-               SaltLength:   hashFunc.Size(),
-               TrailerField: 1,
-       }
-
-       mgf1Params := pkix.AlgorithmIdentifier{
-               Algorithm: hashOID,
-               Parameters: asn1.RawValue{
-                       Tag: 5, /* ASN.1 NULL */
-               },
-       }
-
-       var err error
-       params.MGF.Parameters.FullBytes, err = asn1.Marshal(mgf1Params)
-       if err != nil {
-               panic(err)
-       }
-
-       serialized, err := asn1.Marshal(params)
-       if err != nil {
-               panic(err)
-       }
-
-       return asn1.RawValue{FullBytes: serialized}
-}
-
-func getSignatureAlgorithmFromAI(ai pkix.AlgorithmIdentifier) SignatureAlgorithm {
-       if !ai.Algorithm.Equal(oidSignatureRSAPSS) {
-               for _, details := range signatureAlgorithmDetails {
-                       if ai.Algorithm.Equal(details.oid) {
-                               return details.algo
-                       }
-               }
-               return UnknownSignatureAlgorithm
-       }
-
-       // RSA PSS is special because it encodes important parameters
-       // in the Parameters.
-
-       var params pssParameters
-       if _, err := asn1.Unmarshal(ai.Parameters.FullBytes, &params); err != nil {
-               return UnknownSignatureAlgorithm
-       }
-
-       var mgf1HashFunc pkix.AlgorithmIdentifier
-       if _, err := asn1.Unmarshal(params.MGF.Parameters.FullBytes, &mgf1HashFunc); err != nil {
-               return UnknownSignatureAlgorithm
-       }
-
-       // PSS is greatly overburdened with options. This code forces
-       // them into three buckets by requiring that the MGF1 hash
-       // function always match the message hash function (as
-       // recommended in
-       // https://tools.ietf.org/html/rfc3447#section-8.1), that the
-       // salt length matches the hash length, and that the trailer
-       // field has the default value.
-       asn1NULL := []byte{0x05, 0x00}
-       if !bytes.Equal(params.Hash.Parameters.FullBytes, asn1NULL) ||
-               !params.MGF.Algorithm.Equal(oidMGF1) ||
-               !mgf1HashFunc.Algorithm.Equal(params.Hash.Algorithm) ||
-               !bytes.Equal(mgf1HashFunc.Parameters.FullBytes, asn1NULL) ||
-               params.TrailerField != 1 {
-               return UnknownSignatureAlgorithm
-       }
-
-       switch {
-       case params.Hash.Algorithm.Equal(oidSHA256) && params.SaltLength == 32:
-               return SHA256WithRSAPSS
-       case params.Hash.Algorithm.Equal(oidSHA384) && params.SaltLength == 48:
-               return SHA384WithRSAPSS
-       case params.Hash.Algorithm.Equal(oidSHA512) && params.SaltLength == 64:
-               return SHA512WithRSAPSS
-       }
-
-       return UnknownSignatureAlgorithm
-}
-
-// RFC 3279, 2.3 Public Key Algorithms
-//
-// pkcs-1 OBJECT IDENTIFIER ::== { iso(1) member-body(2) us(840)
-//    rsadsi(113549) pkcs(1) 1 }
-//
-// rsaEncryption OBJECT IDENTIFIER ::== { pkcs1-1 1 }
-//
-// id-dsa OBJECT IDENTIFIER ::== { iso(1) member-body(2) us(840)
-//    x9-57(10040) x9cm(4) 1 }
-//
-// RFC 5480, 2.1.1 Unrestricted Algorithm Identifier and Parameters
-//
-// id-ecPublicKey OBJECT IDENTIFIER ::= {
-//       iso(1) member-body(2) us(840) ansi-X9-62(10045) keyType(2) 1 }
-var (
-       oidPublicKeyRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 1}
-       oidPublicKeyDSA   = asn1.ObjectIdentifier{1, 2, 840, 10040, 4, 1}
-       oidPublicKeyECDSA = asn1.ObjectIdentifier{1, 2, 840, 10045, 2, 1}
-)
-
-func getPublicKeyAlgorithmFromOID(oid asn1.ObjectIdentifier) PublicKeyAlgorithm {
-       switch {
-       case oid.Equal(oidPublicKeyRSA):
-               return RSA
-       case oid.Equal(oidPublicKeyDSA):
-               return DSA
-       case oid.Equal(oidPublicKeyECDSA):
-               return ECDSA
-       }
-       return UnknownPublicKeyAlgorithm
-}
-
-// RFC 5480, 2.1.1.1. Named Curve
-//
-// secp224r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 33 }
-//
-// secp256r1 OBJECT IDENTIFIER ::= {
-//   iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
-//   prime(1) 7 }
-//
-// secp384r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 34 }
-//
-// secp521r1 OBJECT IDENTIFIER ::= {
-//   iso(1) identified-organization(3) certicom(132) curve(0) 35 }
-//
-// NB: secp256r1 is equivalent to prime256v1
-var (
-       oidNamedCurveP224    = asn1.ObjectIdentifier{1, 3, 132, 0, 33}
-       oidNamedCurveP256    = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
-       oidNamedCurveP384    = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
-       oidNamedCurveP521    = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
-       oidNamedCurveP256SM2 = asn1.ObjectIdentifier{1, 2, 156, 10197, 1, 301} // I get the SM2 ID through parsing the pem file generated by gmssl
-)
-
-func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
-       switch {
-       case oid.Equal(oidNamedCurveP224):
-               return elliptic.P224()
-       case oid.Equal(oidNamedCurveP256):
-               return elliptic.P256()
-       case oid.Equal(oidNamedCurveP384):
-               return elliptic.P384()
-       case oid.Equal(oidNamedCurveP521):
-               return elliptic.P521()
-       case oid.Equal(oidNamedCurveP256SM2):
-               return P256Sm2()
-       }
-       return nil
-}
-
-func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
-       switch curve {
-       case elliptic.P224():
-               return oidNamedCurveP224, true
-       case elliptic.P256():
-               return oidNamedCurveP256, true
-       case elliptic.P384():
-               return oidNamedCurveP384, true
-       case elliptic.P521():
-               return oidNamedCurveP521, true
-       case P256Sm2():
-               return oidNamedCurveP256SM2, true
-       }
-       return nil, false
-}
-
-// KeyUsage represents the set of actions that are valid for a given key. It's
-// a bitmap of the KeyUsage* constants.
-type KeyUsage int
-
-const (
-       KeyUsageDigitalSignature KeyUsage = 1 << iota
-       KeyUsageContentCommitment
-       KeyUsageKeyEncipherment
-       KeyUsageDataEncipherment
-       KeyUsageKeyAgreement
-       KeyUsageCertSign
-       KeyUsageCRLSign
-       KeyUsageEncipherOnly
-       KeyUsageDecipherOnly
-)
-
-// RFC 5280, 4.2.1.12  Extended Key Usage
-//
-// anyExtendedKeyUsage OBJECT IDENTIFIER ::= { id-ce-extKeyUsage 0 }
-//
-// id-kp OBJECT IDENTIFIER ::= { id-pkix 3 }
-//
-// id-kp-serverAuth             OBJECT IDENTIFIER ::= { id-kp 1 }
-// id-kp-clientAuth             OBJECT IDENTIFIER ::= { id-kp 2 }
-// id-kp-codeSigning            OBJECT IDENTIFIER ::= { id-kp 3 }
-// id-kp-emailProtection        OBJECT IDENTIFIER ::= { id-kp 4 }
-// id-kp-timeStamping           OBJECT IDENTIFIER ::= { id-kp 8 }
-// id-kp-OCSPSigning            OBJECT IDENTIFIER ::= { id-kp 9 }
-var (
-       oidExtKeyUsageAny                        = asn1.ObjectIdentifier{2, 5, 29, 37, 0}
-       oidExtKeyUsageServerAuth                 = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 1}
-       oidExtKeyUsageClientAuth                 = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 2}
-       oidExtKeyUsageCodeSigning                = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 3}
-       oidExtKeyUsageEmailProtection            = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 4}
-       oidExtKeyUsageIPSECEndSystem             = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 5}
-       oidExtKeyUsageIPSECTunnel                = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 6}
-       oidExtKeyUsageIPSECUser                  = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 7}
-       oidExtKeyUsageTimeStamping               = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 8}
-       oidExtKeyUsageOCSPSigning                = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 3, 9}
-       oidExtKeyUsageMicrosoftServerGatedCrypto = asn1.ObjectIdentifier{1, 3, 6, 1, 4, 1, 311, 10, 3, 3}
-       oidExtKeyUsageNetscapeServerGatedCrypto  = asn1.ObjectIdentifier{2, 16, 840, 1, 113730, 4, 1}
-)
-
-// ExtKeyUsage represents an extended set of actions that are valid for a given key.
-// Each of the ExtKeyUsage* constants define a unique action.
-type ExtKeyUsage int
-
-const (
-       ExtKeyUsageAny ExtKeyUsage = iota
-       ExtKeyUsageServerAuth
-       ExtKeyUsageClientAuth
-       ExtKeyUsageCodeSigning
-       ExtKeyUsageEmailProtection
-       ExtKeyUsageIPSECEndSystem
-       ExtKeyUsageIPSECTunnel
-       ExtKeyUsageIPSECUser
-       ExtKeyUsageTimeStamping
-       ExtKeyUsageOCSPSigning
-       ExtKeyUsageMicrosoftServerGatedCrypto
-       ExtKeyUsageNetscapeServerGatedCrypto
-)
-
-// extKeyUsageOIDs contains the mapping between an ExtKeyUsage and its OID.
-var extKeyUsageOIDs = []struct {
-       extKeyUsage ExtKeyUsage
-       oid         asn1.ObjectIdentifier
-}{
-       {ExtKeyUsageAny, oidExtKeyUsageAny},
-       {ExtKeyUsageServerAuth, oidExtKeyUsageServerAuth},
-       {ExtKeyUsageClientAuth, oidExtKeyUsageClientAuth},
-       {ExtKeyUsageCodeSigning, oidExtKeyUsageCodeSigning},
-       {ExtKeyUsageEmailProtection, oidExtKeyUsageEmailProtection},
-       {ExtKeyUsageIPSECEndSystem, oidExtKeyUsageIPSECEndSystem},
-       {ExtKeyUsageIPSECTunnel, oidExtKeyUsageIPSECTunnel},
-       {ExtKeyUsageIPSECUser, oidExtKeyUsageIPSECUser},
-       {ExtKeyUsageTimeStamping, oidExtKeyUsageTimeStamping},
-       {ExtKeyUsageOCSPSigning, oidExtKeyUsageOCSPSigning},
-       {ExtKeyUsageMicrosoftServerGatedCrypto, oidExtKeyUsageMicrosoftServerGatedCrypto},
-       {ExtKeyUsageNetscapeServerGatedCrypto, oidExtKeyUsageNetscapeServerGatedCrypto},
-}
-
-func extKeyUsageFromOID(oid asn1.ObjectIdentifier) (eku ExtKeyUsage, ok bool) {
-       for _, pair := range extKeyUsageOIDs {
-               if oid.Equal(pair.oid) {
-                       return pair.extKeyUsage, true
-               }
-       }
-       return
-}
-
-func oidFromExtKeyUsage(eku ExtKeyUsage) (oid asn1.ObjectIdentifier, ok bool) {
-       for _, pair := range extKeyUsageOIDs {
-               if eku == pair.extKeyUsage {
-                       return pair.oid, true
-               }
-       }
-       return
-}
-
-// A Certificate represents an X.509 certificate.
-type Certificate struct {
-       Raw                     []byte // Complete ASN.1 DER content (certificate, signature algorithm and signature).
-       RawTBSCertificate       []byte // Certificate part of raw ASN.1 DER content.
-       RawSubjectPublicKeyInfo []byte // DER encoded SubjectPublicKeyInfo.
-       RawSubject              []byte // DER encoded Subject
-       RawIssuer               []byte // DER encoded Issuer
-
-       Signature          []byte
-       SignatureAlgorithm SignatureAlgorithm
-
-       PublicKeyAlgorithm PublicKeyAlgorithm
-       PublicKey          interface{}
-
-       Version             int
-       SerialNumber        *big.Int
-       Issuer              pkix.Name
-       Subject             pkix.Name
-       NotBefore, NotAfter time.Time // Validity bounds.
-       KeyUsage            KeyUsage
-
-       // Extensions contains raw X.509 extensions. When parsing certificates,
-       // this can be used to extract non-critical extensions that are not
-       // parsed by this package. When marshaling certificates, the Extensions
-       // field is ignored, see ExtraExtensions.
-       Extensions []pkix.Extension
-
-       // ExtraExtensions contains extensions to be copied, raw, into any
-       // marshaled certificates. Values override any extensions that would
-       // otherwise be produced based on the other fields. The ExtraExtensions
-       // field is not populated when parsing certificates, see Extensions.
-       ExtraExtensions []pkix.Extension
-
-       // UnhandledCriticalExtensions contains a list of extension IDs that
-       // were not (fully) processed when parsing. Verify will fail if this
-       // slice is non-empty, unless verification is delegated to an OS
-       // library which understands all the critical extensions.
-       //
-       // Users can access these extensions using Extensions and can remove
-       // elements from this slice if they believe that they have been
-       // handled.
-       UnhandledCriticalExtensions []asn1.ObjectIdentifier
-
-       ExtKeyUsage        []ExtKeyUsage           // Sequence of extended key usages.
-       UnknownExtKeyUsage []asn1.ObjectIdentifier // Encountered extended key usages unknown to this package.
-
-       BasicConstraintsValid bool // if true then the next two fields are valid.
-       IsCA                  bool
-       MaxPathLen            int
-       // MaxPathLenZero indicates that BasicConstraintsValid==true and
-       // MaxPathLen==0 should be interpreted as an actual maximum path length
-       // of zero. Otherwise, that combination is interpreted as MaxPathLen
-       // not being set.
-       MaxPathLenZero bool
-
-       SubjectKeyId   []byte
-       AuthorityKeyId []byte
-
-       // RFC 5280, 4.2.2.1 (Authority Information Access)
-       OCSPServer            []string
-       IssuingCertificateURL []string
-
-       // Subject Alternate Name values
-       DNSNames       []string
-       EmailAddresses []string
-       IPAddresses    []net.IP
-
-       // Name constraints
-       PermittedDNSDomainsCritical bool // if true then the name constraints are marked critical.
-       PermittedDNSDomains         []string
-
-       // CRL Distribution Points
-       CRLDistributionPoints []string
-
-       PolicyIdentifiers []asn1.ObjectIdentifier
-}
-
-// ErrUnsupportedAlgorithm results from attempting to perform an operation that
-// involves algorithms that are not currently implemented.
-var ErrUnsupportedAlgorithm = errors.New("x509: cannot verify signature: algorithm unimplemented")
-
-// An InsecureAlgorithmError
-type InsecureAlgorithmError SignatureAlgorithm
-
-func (e InsecureAlgorithmError) Error() string {
-       return fmt.Sprintf("x509: cannot verify signature: insecure algorithm %v", SignatureAlgorithm(e))
-}
-
-// ConstraintViolationError results when a requested usage is not permitted by
-// a certificate. For example: checking a signature when the public key isn't a
-// certificate signing key.
-type ConstraintViolationError struct{}
-
-func (ConstraintViolationError) Error() string {
-       return "x509: invalid signature: parent certificate cannot sign this kind of certificate"
-}
-
-func (c *Certificate) Equal(other *Certificate) bool {
-       return bytes.Equal(c.Raw, other.Raw)
-}
-
-// Entrust have a broken root certificate (CN=Entrust.net Certification
-// Authority (2048)) which isn't marked as a CA certificate and is thus invalid
-// according to PKIX.
-// We recognise this certificate by its SubjectPublicKeyInfo and exempt it
-// from the Basic Constraints requirement.
-// See http://www.entrust.net/knowledge-base/technote.cfm?tn=7869
-//
-// TODO(agl): remove this hack once their reissued root is sufficiently
-// widespread.
-var entrustBrokenSPKI = []byte{
-       0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09,
-       0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
-       0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00,
-       0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01,
-       0x00, 0x97, 0xa3, 0x2d, 0x3c, 0x9e, 0xde, 0x05,
-       0xda, 0x13, 0xc2, 0x11, 0x8d, 0x9d, 0x8e, 0xe3,
-       0x7f, 0xc7, 0x4b, 0x7e, 0x5a, 0x9f, 0xb3, 0xff,
-       0x62, 0xab, 0x73, 0xc8, 0x28, 0x6b, 0xba, 0x10,
-       0x64, 0x82, 0x87, 0x13, 0xcd, 0x57, 0x18, 0xff,
-       0x28, 0xce, 0xc0, 0xe6, 0x0e, 0x06, 0x91, 0x50,
-       0x29, 0x83, 0xd1, 0xf2, 0xc3, 0x2a, 0xdb, 0xd8,
-       0xdb, 0x4e, 0x04, 0xcc, 0x00, 0xeb, 0x8b, 0xb6,
-       0x96, 0xdc, 0xbc, 0xaa, 0xfa, 0x52, 0x77, 0x04,
-       0xc1, 0xdb, 0x19, 0xe4, 0xae, 0x9c, 0xfd, 0x3c,
-       0x8b, 0x03, 0xef, 0x4d, 0xbc, 0x1a, 0x03, 0x65,
-       0xf9, 0xc1, 0xb1, 0x3f, 0x72, 0x86, 0xf2, 0x38,
-       0xaa, 0x19, 0xae, 0x10, 0x88, 0x78, 0x28, 0xda,
-       0x75, 0xc3, 0x3d, 0x02, 0x82, 0x02, 0x9c, 0xb9,
-       0xc1, 0x65, 0x77, 0x76, 0x24, 0x4c, 0x98, 0xf7,
-       0x6d, 0x31, 0x38, 0xfb, 0xdb, 0xfe, 0xdb, 0x37,
-       0x02, 0x76, 0xa1, 0x18, 0x97, 0xa6, 0xcc, 0xde,
-       0x20, 0x09, 0x49, 0x36, 0x24, 0x69, 0x42, 0xf6,
-       0xe4, 0x37, 0x62, 0xf1, 0x59, 0x6d, 0xa9, 0x3c,
-       0xed, 0x34, 0x9c, 0xa3, 0x8e, 0xdb, 0xdc, 0x3a,
-       0xd7, 0xf7, 0x0a, 0x6f, 0xef, 0x2e, 0xd8, 0xd5,
-       0x93, 0x5a, 0x7a, 0xed, 0x08, 0x49, 0x68, 0xe2,
-       0x41, 0xe3, 0x5a, 0x90, 0xc1, 0x86, 0x55, 0xfc,
-       0x51, 0x43, 0x9d, 0xe0, 0xb2, 0xc4, 0x67, 0xb4,
-       0xcb, 0x32, 0x31, 0x25, 0xf0, 0x54, 0x9f, 0x4b,
-       0xd1, 0x6f, 0xdb, 0xd4, 0xdd, 0xfc, 0xaf, 0x5e,
-       0x6c, 0x78, 0x90, 0x95, 0xde, 0xca, 0x3a, 0x48,
-       0xb9, 0x79, 0x3c, 0x9b, 0x19, 0xd6, 0x75, 0x05,
-       0xa0, 0xf9, 0x88, 0xd7, 0xc1, 0xe8, 0xa5, 0x09,
-       0xe4, 0x1a, 0x15, 0xdc, 0x87, 0x23, 0xaa, 0xb2,
-       0x75, 0x8c, 0x63, 0x25, 0x87, 0xd8, 0xf8, 0x3d,
-       0xa6, 0xc2, 0xcc, 0x66, 0xff, 0xa5, 0x66, 0x68,
-       0x55, 0x02, 0x03, 0x01, 0x00, 0x01,
-}
-
-// CheckSignatureFrom verifies that the signature on c is a valid signature
-// from parent.
-func (c *Certificate) CheckSignatureFrom(parent *Certificate) error {
-       // RFC 5280, 4.2.1.9:
-       // "If the basic constraints extension is not present in a version 3
-       // certificate, or the extension is present but the cA boolean is not
-       // asserted, then the certified public key MUST NOT be used to verify
-       // certificate signatures."
-       // (except for Entrust, see comment above entrustBrokenSPKI)
-       if (parent.Version == 3 && !parent.BasicConstraintsValid ||
-               parent.BasicConstraintsValid && !parent.IsCA) &&
-               !bytes.Equal(c.RawSubjectPublicKeyInfo, entrustBrokenSPKI) {
-               return ConstraintViolationError{}
-       }
-
-       if parent.KeyUsage != 0 && parent.KeyUsage&KeyUsageCertSign == 0 {
-               return ConstraintViolationError{}
-       }
-
-       if parent.PublicKeyAlgorithm == UnknownPublicKeyAlgorithm {
-               return ErrUnsupportedAlgorithm
-       }
-
-       // TODO(agl): don't ignore the path length constraint.
-
-       return parent.CheckSignature(c.SignatureAlgorithm, c.RawTBSCertificate, c.Signature)
-}
-
-// CheckSignature verifies that signature is a valid signature over signed from
-// c's public key.
-func (c *Certificate) CheckSignature(algo SignatureAlgorithm, signed, signature []byte) error {
-       return checkSignature(algo, signed, signature, c.PublicKey)
-}
-
-// CheckSignature verifies that signature is a valid signature over signed from
-// a crypto.PublicKey.
-func checkSignature(algo SignatureAlgorithm, signed, signature []byte, publicKey crypto.PublicKey) (err error) {
-       var hashType Hash
-
-       switch algo {
-       case SHA1WithRSA, DSAWithSHA1, ECDSAWithSHA1, SM2WithSHA1:
-               hashType = SHA1
-       case SHA256WithRSA, SHA256WithRSAPSS, DSAWithSHA256, ECDSAWithSHA256, SM2WithSHA256:
-               hashType = SHA256
-       case SHA384WithRSA, SHA384WithRSAPSS, ECDSAWithSHA384:
-               hashType = SHA384
-       case SHA512WithRSA, SHA512WithRSAPSS, ECDSAWithSHA512:
-               hashType = SHA512
-       case MD2WithRSA, MD5WithRSA:
-               return InsecureAlgorithmError(algo)
-       case SM2WithSM3: // SM3WithRSA reserve
-               hashType = SM3
-       default:
-               return ErrUnsupportedAlgorithm
-       }
-
-       if !hashType.Available() {
-               return ErrUnsupportedAlgorithm
-       }
-       h := hashType.New()
-
-       h.Write(signed)
-       digest := h.Sum(nil)
-
-       switch pub := publicKey.(type) {
-       case *rsa.PublicKey:
-               if algo.isRSAPSS() {
-                       return rsa.VerifyPSS(pub, crypto.Hash(hashType), digest, signature, &rsa.PSSOptions{SaltLength: rsa.PSSSaltLengthEqualsHash})
-               } else {
-                       return rsa.VerifyPKCS1v15(pub, crypto.Hash(hashType), digest, signature)
-               }
-       case *dsa.PublicKey:
-               dsaSig := new(dsaSignature)
-               if rest, err := asn1.Unmarshal(signature, dsaSig); err != nil {
-                       return err
-               } else if len(rest) != 0 {
-                       return errors.New("x509: trailing data after DSA signature")
-               }
-               if dsaSig.R.Sign() <= 0 || dsaSig.S.Sign() <= 0 {
-                       return errors.New("x509: DSA signature contained zero or negative values")
-               }
-               if !dsa.Verify(pub, digest, dsaSig.R, dsaSig.S) {
-                       return errors.New("x509: DSA verification failure")
-               }
-               return
-       case *ecdsa.PublicKey:
-               ecdsaSig := new(ecdsaSignature)
-               if rest, err := asn1.Unmarshal(signature, ecdsaSig); err != nil {
-                       return err
-               } else if len(rest) != 0 {
-                       return errors.New("x509: trailing data after ECDSA signature")
-               }
-               if ecdsaSig.R.Sign() <= 0 || ecdsaSig.S.Sign() <= 0 {
-                       return errors.New("x509: ECDSA signature contained zero or negative values")
-               }
-               switch pub.Curve {
-               case P256Sm2():
-                       if !Verify(&PublicKey{
-                               Curve: pub.Curve,
-                               X:     pub.X,
-                               Y:     pub.Y,
-                       }, digest, ecdsaSig.R, ecdsaSig.S) {
-                               return errors.New("x509: SM2 verification failure")
-                       }
-               default:
-                       if !ecdsa.Verify(pub, digest, ecdsaSig.R, ecdsaSig.S) {
-                               return errors.New("x509: ECDSA verification failure")
-                       }
-               }
-               return
-       }
-       return ErrUnsupportedAlgorithm
-}
-
-// CheckCRLSignature checks that the signature in crl is from c.
-func (c *Certificate) CheckCRLSignature(crl *pkix.CertificateList) error {
-       algo := getSignatureAlgorithmFromAI(crl.SignatureAlgorithm)
-       return c.CheckSignature(algo, crl.TBSCertList.Raw, crl.SignatureValue.RightAlign())
-}
-
-type UnhandledCriticalExtension struct{}
-
-func (h UnhandledCriticalExtension) Error() string {
-       return "x509: unhandled critical extension"
-}
-
-type basicConstraints struct {
-       IsCA       bool `asn1:"optional"`
-       MaxPathLen int  `asn1:"optional,default:-1"`
-}
-
-// RFC 5280 4.2.1.4
-type policyInformation struct {
-       Policy asn1.ObjectIdentifier
-       // policyQualifiers omitted
-}
-
-// RFC 5280, 4.2.1.10
-type nameConstraints struct {
-       Permitted []generalSubtree `asn1:"optional,tag:0"`
-       Excluded  []generalSubtree `asn1:"optional,tag:1"`
-}
-
-type generalSubtree struct {
-       Name string `asn1:"tag:2,optional,ia5"`
-}
-
-// RFC 5280, 4.2.2.1
-type authorityInfoAccess struct {
-       Method   asn1.ObjectIdentifier
-       Location asn1.RawValue
-}
-
-// RFC 5280, 4.2.1.14
-type distributionPoint struct {
-       DistributionPoint distributionPointName `asn1:"optional,tag:0"`
-       Reason            asn1.BitString        `asn1:"optional,tag:1"`
-       CRLIssuer         asn1.RawValue         `asn1:"optional,tag:2"`
-}
-
-type distributionPointName struct {
-       FullName     asn1.RawValue    `asn1:"optional,tag:0"`
-       RelativeName pkix.RDNSequence `asn1:"optional,tag:1"`
-}
-
-// asn1Null is the ASN.1 encoding of a NULL value.
-var asn1Null = []byte{5, 0}
-
-func parsePublicKey(algo PublicKeyAlgorithm, keyData *publicKeyInfo) (interface{}, error) {
-       asn1Data := keyData.PublicKey.RightAlign()
-       switch algo {
-       case RSA:
-               // RSA public keys must have a NULL in the parameters
-               // (https://tools.ietf.org/html/rfc3279#section-2.3.1).
-               if !bytes.Equal(keyData.Algorithm.Parameters.FullBytes, asn1Null) {
-                       return nil, errors.New("x509: RSA key missing NULL parameters")
-               }
-
-               p := new(rsaPublicKey)
-               rest, err := asn1.Unmarshal(asn1Data, p)
-               if err != nil {
-                       return nil, err
-               }
-               if len(rest) != 0 {
-                       return nil, errors.New("x509: trailing data after RSA public key")
-               }
-
-               if p.N.Sign() <= 0 {
-                       return nil, errors.New("x509: RSA modulus is not a positive number")
-               }
-               if p.E <= 0 {
-                       return nil, errors.New("x509: RSA public exponent is not a positive number")
-               }
-
-               pub := &rsa.PublicKey{
-                       E: p.E,
-                       N: p.N,
-               }
-               return pub, nil
-       case DSA:
-               var p *big.Int
-               rest, err := asn1.Unmarshal(asn1Data, &p)
-               if err != nil {
-                       return nil, err
-               }
-               if len(rest) != 0 {
-                       return nil, errors.New("x509: trailing data after DSA public key")
-               }
-               paramsData := keyData.Algorithm.Parameters.FullBytes
-               params := new(dsaAlgorithmParameters)
-               rest, err = asn1.Unmarshal(paramsData, params)
-               if err != nil {
-                       return nil, err
-               }
-               if len(rest) != 0 {
-                       return nil, errors.New("x509: trailing data after DSA parameters")
-               }
-               if p.Sign() <= 0 || params.P.Sign() <= 0 || params.Q.Sign() <= 0 || params.G.Sign() <= 0 {
-                       return nil, errors.New("x509: zero or negative DSA parameter")
-               }
-               pub := &dsa.PublicKey{
-                       Parameters: dsa.Parameters{
-                               P: params.P,
-                               Q: params.Q,
-                               G: params.G,
-                       },
-                       Y: p,
-               }
-               return pub, nil
-       case ECDSA:
-               paramsData := keyData.Algorithm.Parameters.FullBytes
-               namedCurveOID := new(asn1.ObjectIdentifier)
-               rest, err := asn1.Unmarshal(paramsData, namedCurveOID)
-               if err != nil {
-                       return nil, err
-               }
-               if len(rest) != 0 {
-                       return nil, errors.New("x509: trailing data after ECDSA parameters")
-               }
-               namedCurve := namedCurveFromOID(*namedCurveOID)
-               if namedCurve == nil {
-                       return nil, errors.New("x509: unsupported elliptic curve")
-               }
-               x, y := elliptic.Unmarshal(namedCurve, asn1Data)
-               if x == nil {
-                       return nil, errors.New("x509: failed to unmarshal elliptic curve point")
-               }
-               pub := &ecdsa.PublicKey{
-                       Curve: namedCurve,
-                       X:     x,
-                       Y:     y,
-               }
-               return pub, nil
-       default:
-               return nil, nil
-       }
-}
-
-func parseSANExtension(value []byte) (dnsNames, emailAddresses []string, ipAddresses []net.IP, err error) {
-       // RFC 5280, 4.2.1.6
-
-       // SubjectAltName ::= GeneralNames
-       //
-       // GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName
-       //
-       // GeneralName ::= CHOICE {
-       //      otherName                       [0]     OtherName,
-       //      rfc822Name                      [1]     IA5String,
-       //      dNSName                         [2]     IA5String,
-       //      x400Address                     [3]     ORAddress,
-       //      directoryName                   [4]     Name,
-       //      ediPartyName                    [5]     EDIPartyName,
-       //      uniformResourceIdentifier       [6]     IA5String,
-       //      iPAddress                       [7]     OCTET STRING,
-       //      registeredID                    [8]     OBJECT IDENTIFIER }
-       var seq asn1.RawValue
-       var rest []byte
-       if rest, err = asn1.Unmarshal(value, &seq); err != nil {
-               return
-       } else if len(rest) != 0 {
-               err = errors.New("x509: trailing data after X.509 extension")
-               return
-       }
-       if !seq.IsCompound || seq.Tag != 16 || seq.Class != 0 {
-               err = asn1.StructuralError{Msg: "bad SAN sequence"}
-               return
-       }
-
-       rest = seq.Bytes
-       for len(rest) > 0 {
-               var v asn1.RawValue
-               rest, err = asn1.Unmarshal(rest, &v)
-               if err != nil {
-                       return
-               }
-               switch v.Tag {
-               case 1:
-                       emailAddresses = append(emailAddresses, string(v.Bytes))
-               case 2:
-                       dnsNames = append(dnsNames, string(v.Bytes))
-               case 7:
-                       switch len(v.Bytes) {
-                       case net.IPv4len, net.IPv6len:
-                               ipAddresses = append(ipAddresses, v.Bytes)
-                       default:
-                               err = errors.New("x509: certificate contained IP address of length " + strconv.Itoa(len(v.Bytes)))
-                               return
-                       }
-               }
-       }
-
-       return
-}
-
-func parseCertificate(in *certificate) (*Certificate, error) {
-       out := new(Certificate)
-       out.Raw = in.Raw
-       out.RawTBSCertificate = in.TBSCertificate.Raw
-       out.RawSubjectPublicKeyInfo = in.TBSCertificate.PublicKey.Raw
-       out.RawSubject = in.TBSCertificate.Subject.FullBytes
-       out.RawIssuer = in.TBSCertificate.Issuer.FullBytes
-
-       out.Signature = in.SignatureValue.RightAlign()
-       out.SignatureAlgorithm =
-               getSignatureAlgorithmFromAI(in.TBSCertificate.SignatureAlgorithm)
-
-       out.PublicKeyAlgorithm =
-               getPublicKeyAlgorithmFromOID(in.TBSCertificate.PublicKey.Algorithm.Algorithm)
-       var err error
-       out.PublicKey, err = parsePublicKey(out.PublicKeyAlgorithm, &in.TBSCertificate.PublicKey)
-       if err != nil {
-               return nil, err
-       }
-
-       out.Version = in.TBSCertificate.Version + 1
-       out.SerialNumber = in.TBSCertificate.SerialNumber
-
-       var issuer, subject pkix.RDNSequence
-       if rest, err := asn1.Unmarshal(in.TBSCertificate.Subject.FullBytes, &subject); err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, errors.New("x509: trailing data after X.509 subject")
-       }
-       if rest, err := asn1.Unmarshal(in.TBSCertificate.Issuer.FullBytes, &issuer); err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, errors.New("x509: trailing data after X.509 subject")
-       }
-
-       out.Issuer.FillFromRDNSequence(&issuer)
-       out.Subject.FillFromRDNSequence(&subject)
-
-       out.NotBefore = in.TBSCertificate.Validity.NotBefore
-       out.NotAfter = in.TBSCertificate.Validity.NotAfter
-
-       for _, e := range in.TBSCertificate.Extensions {
-               out.Extensions = append(out.Extensions, e)
-               unhandled := false
-
-               if len(e.Id) == 4 && e.Id[0] == 2 && e.Id[1] == 5 && e.Id[2] == 29 {
-                       switch e.Id[3] {
-                       case 15:
-                               // RFC 5280, 4.2.1.3
-                               var usageBits asn1.BitString
-                               if rest, err := asn1.Unmarshal(e.Value, &usageBits); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 KeyUsage")
-                               }
-
-                               var usage int
-                               for i := 0; i < 9; i++ {
-                                       if usageBits.At(i) != 0 {
-                                               usage |= 1 << uint(i)
-                                       }
-                               }
-                               out.KeyUsage = KeyUsage(usage)
-
-                       case 19:
-                               // RFC 5280, 4.2.1.9
-                               var constraints basicConstraints
-                               if rest, err := asn1.Unmarshal(e.Value, &constraints); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 BasicConstraints")
-                               }
-
-                               out.BasicConstraintsValid = true
-                               out.IsCA = constraints.IsCA
-                               out.MaxPathLen = constraints.MaxPathLen
-                               out.MaxPathLenZero = out.MaxPathLen == 0
-
-                       case 17:
-                               out.DNSNames, out.EmailAddresses, out.IPAddresses, err = parseSANExtension(e.Value)
-                               if err != nil {
-                                       return nil, err
-                               }
-
-                               if len(out.DNSNames) == 0 && len(out.EmailAddresses) == 0 && len(out.IPAddresses) == 0 {
-                                       // If we didn't parse anything then we do the critical check, below.
-                                       unhandled = true
-                               }
-
-                       case 30:
-                               // RFC 5280, 4.2.1.10
-
-                               // NameConstraints ::= SEQUENCE {
-                               //      permittedSubtrees       [0]     GeneralSubtrees OPTIONAL,
-                               //      excludedSubtrees        [1]     GeneralSubtrees OPTIONAL }
-                               //
-                               // GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree
-                               //
-                               // GeneralSubtree ::= SEQUENCE {
-                               //      base                    GeneralName,
-                               //      minimum         [0]     BaseDistance DEFAULT 0,
-                               //      maximum         [1]     BaseDistance OPTIONAL }
-                               //
-                               // BaseDistance ::= INTEGER (0..MAX)
-
-                               var constraints nameConstraints
-                               if rest, err := asn1.Unmarshal(e.Value, &constraints); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 NameConstraints")
-                               }
-
-                               if len(constraints.Excluded) > 0 && e.Critical {
-                                       return out, UnhandledCriticalExtension{}
-                               }
-
-                               for _, subtree := range constraints.Permitted {
-                                       if len(subtree.Name) == 0 {
-                                               if e.Critical {
-                                                       return out, UnhandledCriticalExtension{}
-                                               }
-                                               continue
-                                       }
-                                       out.PermittedDNSDomains = append(out.PermittedDNSDomains, subtree.Name)
-                               }
-
-                       case 31:
-                               // RFC 5280, 4.2.1.13
-
-                               // CRLDistributionPoints ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint
-                               //
-                               // DistributionPoint ::= SEQUENCE {
-                               //     distributionPoint       [0]     DistributionPointName OPTIONAL,
-                               //     reasons                 [1]     ReasonFlags OPTIONAL,
-                               //     cRLIssuer               [2]     GeneralNames OPTIONAL }
-                               //
-                               // DistributionPointName ::= CHOICE {
-                               //     fullName                [0]     GeneralNames,
-                               //     nameRelativeToCRLIssuer [1]     RelativeDistinguishedName }
-
-                               var cdp []distributionPoint
-                               if rest, err := asn1.Unmarshal(e.Value, &cdp); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 CRL distribution point")
-                               }
-
-                               for i := range cdp {
-                                       // use index & pointer here to avoid value copy (each iteration copies 200 bytes)
-                                       dp := &cdp[i]
-                                       // Per RFC 5280, 4.2.1.13, one of distributionPoint or cRLIssuer may be empty.
-                                       if len(dp.DistributionPoint.FullName.Bytes) == 0 {
-                                               continue
-                                       }
-
-                                       var n asn1.RawValue
-                                       if _, err := asn1.Unmarshal(dp.DistributionPoint.FullName.Bytes, &n); err != nil {
-                                               return nil, err
-                                       }
-                                       // Trailing data after the fullName is
-                                       // allowed because other elements of
-                                       // the SEQUENCE can appear.
-
-                                       if n.Tag == 6 {
-                                               out.CRLDistributionPoints = append(out.CRLDistributionPoints, string(n.Bytes))
-                                       }
-                               }
-
-                       case 35:
-                               // RFC 5280, 4.2.1.1
-                               var a authKeyId
-                               if rest, err := asn1.Unmarshal(e.Value, &a); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 authority key-id")
-                               }
-                               out.AuthorityKeyId = a.Id
-
-                       case 37:
-                               // RFC 5280, 4.2.1.12.  Extended Key Usage
-
-                               // id-ce-extKeyUsage OBJECT IDENTIFIER ::= { id-ce 37 }
-                               //
-                               // ExtKeyUsageSyntax ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
-                               //
-                               // KeyPurposeId ::= OBJECT IDENTIFIER
-
-                               var keyUsage []asn1.ObjectIdentifier
-                               if rest, err := asn1.Unmarshal(e.Value, &keyUsage); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 ExtendedKeyUsage")
-                               }
-
-                               for _, u := range keyUsage {
-                                       if extKeyUsage, ok := extKeyUsageFromOID(u); ok {
-                                               out.ExtKeyUsage = append(out.ExtKeyUsage, extKeyUsage)
-                                       } else {
-                                               out.UnknownExtKeyUsage = append(out.UnknownExtKeyUsage, u)
-                                       }
-                               }
-
-                       case 14:
-                               // RFC 5280, 4.2.1.2
-                               var keyid []byte
-                               if rest, err := asn1.Unmarshal(e.Value, &keyid); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 key-id")
-                               }
-                               out.SubjectKeyId = keyid
-
-                       case 32:
-                               // RFC 5280 4.2.1.4: Certificate Policies
-                               var policies []policyInformation
-                               if rest, err := asn1.Unmarshal(e.Value, &policies); err != nil {
-                                       return nil, err
-                               } else if len(rest) != 0 {
-                                       return nil, errors.New("x509: trailing data after X.509 certificate policies")
-                               }
-                               out.PolicyIdentifiers = make([]asn1.ObjectIdentifier, len(policies))
-                               for i, policy := range policies {
-                                       out.PolicyIdentifiers[i] = policy.Policy
-                               }
-
-                       default:
-                               // Unknown extensions are recorded if critical.
-                               unhandled = true
-                       }
-               } else if e.Id.Equal(oidExtensionAuthorityInfoAccess) {
-                       // RFC 5280 4.2.2.1: Authority Information Access
-                       var aia []authorityInfoAccess
-                       if rest, err := asn1.Unmarshal(e.Value, &aia); err != nil {
-                               return nil, err
-                       } else if len(rest) != 0 {
-                               return nil, errors.New("x509: trailing data after X.509 authority information")
-                       }
-
-                       for _, v := range aia {
-                               // GeneralName: uniformResourceIdentifier [6] IA5String
-                               if v.Location.Tag != 6 {
-                                       continue
-                               }
-                               if v.Method.Equal(oidAuthorityInfoAccessOcsp) {
-                                       out.OCSPServer = append(out.OCSPServer, string(v.Location.Bytes))
-                               } else if v.Method.Equal(oidAuthorityInfoAccessIssuers) {
-                                       out.IssuingCertificateURL = append(out.IssuingCertificateURL, string(v.Location.Bytes))
-                               }
-                       }
-               } else {
-                       // Unknown extensions are recorded if critical.
-                       unhandled = true
-               }
-
-               if e.Critical && unhandled {
-                       out.UnhandledCriticalExtensions = append(out.UnhandledCriticalExtensions, e.Id)
-               }
-       }
-
-       return out, nil
-}
-
-// ParseCertificate parses a single certificate from the given ASN.1 DER data.
-func ParseCertificate(asn1Data []byte) (*Certificate, error) {
-       var cert certificate
-       rest, err := asn1.Unmarshal(asn1Data, &cert)
-       if err != nil {
-               return nil, err
-       }
-       if len(rest) > 0 {
-               return nil, asn1.SyntaxError{Msg: "trailing data"}
-       }
-
-       return parseCertificate(&cert)
-}
-
-// ParseCertificates parses one or more certificates from the given ASN.1 DER
-// data. The certificates must be concatenated with no intermediate padding.
-func ParseCertificates(asn1Data []byte) ([]*Certificate, error) {
-       var v []*certificate
-
-       for len(asn1Data) > 0 {
-               cert := new(certificate)
-               var err error
-               asn1Data, err = asn1.Unmarshal(asn1Data, cert)
-               if err != nil {
-                       return nil, err
-               }
-               v = append(v, cert)
-       }
-
-       ret := make([]*Certificate, len(v))
-       for i, ci := range v {
-               cert, err := parseCertificate(ci)
-               if err != nil {
-                       return nil, err
-               }
-               ret[i] = cert
-       }
-
-       return ret, nil
-}
-
-func reverseBitsInAByte(in byte) byte {
-       b1 := in>>4 | in<<4
-       b2 := b1>>2&0x33 | b1<<2&0xcc
-       b3 := b2>>1&0x55 | b2<<1&0xaa
-       return b3
-}
-
-// asn1BitLength returns the bit-length of bitString by considering the
-// most-significant bit in a byte to be the "first" bit. This convention
-// matches ASN.1, but differs from almost everything else.
-func asn1BitLength(bitString []byte) int {
-       bitLen := len(bitString) * 8
-
-       for i := range bitString {
-               b := bitString[len(bitString)-i-1]
-
-               for bit := uint(0); bit < 8; bit++ {
-                       if (b>>bit)&1 == 1 {
-                               return bitLen
-                       }
-                       bitLen--
-               }
-       }
-
-       return 0
-}
-
-var (
-       oidExtensionSubjectKeyId          = []int{2, 5, 29, 14}
-       oidExtensionKeyUsage              = []int{2, 5, 29, 15}
-       oidExtensionExtendedKeyUsage      = []int{2, 5, 29, 37}
-       oidExtensionAuthorityKeyId        = []int{2, 5, 29, 35}
-       oidExtensionBasicConstraints      = []int{2, 5, 29, 19}
-       oidExtensionSubjectAltName        = []int{2, 5, 29, 17}
-       oidExtensionCertificatePolicies   = []int{2, 5, 29, 32}
-       oidExtensionNameConstraints       = []int{2, 5, 29, 30}
-       oidExtensionCRLDistributionPoints = []int{2, 5, 29, 31}
-       oidExtensionAuthorityInfoAccess   = []int{1, 3, 6, 1, 5, 5, 7, 1, 1}
-)
-
-var (
-       oidAuthorityInfoAccessOcsp    = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 48, 1}
-       oidAuthorityInfoAccessIssuers = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 48, 2}
-)
-
-// oidNotInExtensions returns whether an extension with the given oid exists in
-// extensions.
-func oidInExtensions(oid asn1.ObjectIdentifier, extensions []pkix.Extension) bool {
-       for _, e := range extensions {
-               if e.Id.Equal(oid) {
-                       return true
-               }
-       }
-       return false
-}
-
-// marshalSANs marshals a list of addresses into a the contents of an X.509
-// SubjectAlternativeName extension.
-func marshalSANs(dnsNames, emailAddresses []string, ipAddresses []net.IP) (derBytes []byte, err error) {
-       var rawValues []asn1.RawValue
-       for _, name := range dnsNames {
-               rawValues = append(rawValues, asn1.RawValue{Tag: 2, Class: 2, Bytes: []byte(name)})
-       }
-       for _, email := range emailAddresses {
-               rawValues = append(rawValues, asn1.RawValue{Tag: 1, Class: 2, Bytes: []byte(email)})
-       }
-       for _, rawIP := range ipAddresses {
-               // If possible, we always want to encode IPv4 addresses in 4 bytes.
-               ip := rawIP.To4()
-               if ip == nil {
-                       ip = rawIP
-               }
-               rawValues = append(rawValues, asn1.RawValue{Tag: 7, Class: 2, Bytes: ip})
-       }
-       return asn1.Marshal(rawValues)
-}
-
-func buildExtensions(template *Certificate) (ret []pkix.Extension, err error) {
-       ret = make([]pkix.Extension, 10 /* maximum number of elements. */)
-       n := 0
-
-       if template.KeyUsage != 0 &&
-               !oidInExtensions(oidExtensionKeyUsage, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionKeyUsage
-               ret[n].Critical = true
-
-               var a [2]byte
-               a[0] = reverseBitsInAByte(byte(template.KeyUsage))
-               a[1] = reverseBitsInAByte(byte(template.KeyUsage >> 8))
-
-               l := 1
-               if a[1] != 0 {
-                       l = 2
-               }
-
-               bitString := a[:l]
-               ret[n].Value, err = asn1.Marshal(asn1.BitString{Bytes: bitString, BitLength: asn1BitLength(bitString)})
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if (len(template.ExtKeyUsage) > 0 || len(template.UnknownExtKeyUsage) > 0) &&
-               !oidInExtensions(oidExtensionExtendedKeyUsage, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionExtendedKeyUsage
-
-               var oids []asn1.ObjectIdentifier
-               for _, u := range template.ExtKeyUsage {
-                       if oid, ok := oidFromExtKeyUsage(u); ok {
-                               oids = append(oids, oid)
-                       } else {
-                               panic("internal error")
-                       }
-               }
-
-               oids = append(oids, template.UnknownExtKeyUsage...)
-
-               ret[n].Value, err = asn1.Marshal(oids)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if template.BasicConstraintsValid && !oidInExtensions(oidExtensionBasicConstraints, template.ExtraExtensions) {
-               // Leaving MaxPathLen as zero indicates that no maximum path
-               // length is desired, unless MaxPathLenZero is set. A value of
-               // -1 causes encoding/asn1 to omit the value as desired.
-               maxPathLen := template.MaxPathLen
-               if maxPathLen == 0 && !template.MaxPathLenZero {
-                       maxPathLen = -1
-               }
-               ret[n].Id = oidExtensionBasicConstraints
-               ret[n].Value, err = asn1.Marshal(basicConstraints{template.IsCA, maxPathLen})
-               ret[n].Critical = true
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if len(template.SubjectKeyId) > 0 && !oidInExtensions(oidExtensionSubjectKeyId, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionSubjectKeyId
-               ret[n].Value, err = asn1.Marshal(template.SubjectKeyId)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if len(template.AuthorityKeyId) > 0 && !oidInExtensions(oidExtensionAuthorityKeyId, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionAuthorityKeyId
-               ret[n].Value, err = asn1.Marshal(authKeyId{template.AuthorityKeyId})
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if (len(template.OCSPServer) > 0 || len(template.IssuingCertificateURL) > 0) &&
-               !oidInExtensions(oidExtensionAuthorityInfoAccess, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionAuthorityInfoAccess
-               var aiaValues []authorityInfoAccess
-               for _, name := range template.OCSPServer {
-                       aiaValues = append(aiaValues, authorityInfoAccess{
-                               Method:   oidAuthorityInfoAccessOcsp,
-                               Location: asn1.RawValue{Tag: 6, Class: 2, Bytes: []byte(name)},
-                       })
-               }
-               for _, name := range template.IssuingCertificateURL {
-                       aiaValues = append(aiaValues, authorityInfoAccess{
-                               Method:   oidAuthorityInfoAccessIssuers,
-                               Location: asn1.RawValue{Tag: 6, Class: 2, Bytes: []byte(name)},
-                       })
-               }
-               ret[n].Value, err = asn1.Marshal(aiaValues)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if (len(template.DNSNames) > 0 || len(template.EmailAddresses) > 0 || len(template.IPAddresses) > 0) &&
-               !oidInExtensions(oidExtensionSubjectAltName, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionSubjectAltName
-               ret[n].Value, err = marshalSANs(template.DNSNames, template.EmailAddresses, template.IPAddresses)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if len(template.PolicyIdentifiers) > 0 &&
-               !oidInExtensions(oidExtensionCertificatePolicies, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionCertificatePolicies
-               policies := make([]policyInformation, len(template.PolicyIdentifiers))
-               for i, policy := range template.PolicyIdentifiers {
-                       policies[i].Policy = policy
-               }
-               ret[n].Value, err = asn1.Marshal(policies)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if len(template.PermittedDNSDomains) > 0 &&
-               !oidInExtensions(oidExtensionNameConstraints, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionNameConstraints
-               ret[n].Critical = template.PermittedDNSDomainsCritical
-
-               var out nameConstraints
-               out.Permitted = make([]generalSubtree, len(template.PermittedDNSDomains))
-               for i, permitted := range template.PermittedDNSDomains {
-                       out.Permitted[i] = generalSubtree{Name: permitted}
-               }
-               ret[n].Value, err = asn1.Marshal(out)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       if len(template.CRLDistributionPoints) > 0 &&
-               !oidInExtensions(oidExtensionCRLDistributionPoints, template.ExtraExtensions) {
-               ret[n].Id = oidExtensionCRLDistributionPoints
-
-               var crlDp []distributionPoint
-               for _, name := range template.CRLDistributionPoints {
-                       rawFullName, _ := asn1.Marshal(asn1.RawValue{Tag: 6, Class: 2, Bytes: []byte(name)})
-
-                       dp := distributionPoint{
-                               DistributionPoint: distributionPointName{
-                                       FullName: asn1.RawValue{Tag: 0, Class: 2, IsCompound: true, Bytes: rawFullName},
-                               },
-                       }
-                       crlDp = append(crlDp, dp)
-               }
-
-               ret[n].Value, err = asn1.Marshal(crlDp)
-               if err != nil {
-                       return
-               }
-               n++
-       }
-
-       // Adding another extension here? Remember to update the maximum number
-       // of elements in the make() at the top of the function.
-
-       return append(ret[:n], template.ExtraExtensions...), nil
-}
-
-func subjectBytes(cert *Certificate) ([]byte, error) {
-       if len(cert.RawSubject) > 0 {
-               return cert.RawSubject, nil
-       }
-
-       return asn1.Marshal(cert.Subject.ToRDNSequence())
-}
-
-// signingParamsForPublicKey returns the parameters to use for signing with
-// priv. If requestedSigAlgo is not zero then it overrides the default
-// signature algorithm.
-func signingParamsForPublicKey(pub interface{}, requestedSigAlgo SignatureAlgorithm) (hashFunc Hash, sigAlgo pkix.AlgorithmIdentifier, err error) {
-       var pubType PublicKeyAlgorithm
-
-       switch pub := pub.(type) {
-       case *rsa.PublicKey:
-               pubType = RSA
-               hashFunc = SHA256
-               sigAlgo.Algorithm = oidSignatureSHA256WithRSA
-               sigAlgo.Parameters = asn1.RawValue{
-                       Tag: 5,
-               }
-
-       case *ecdsa.PublicKey:
-               pubType = ECDSA
-               switch pub.Curve {
-               case elliptic.P224(), elliptic.P256():
-                       hashFunc = SHA256
-                       sigAlgo.Algorithm = oidSignatureECDSAWithSHA256
-               case elliptic.P384():
-                       hashFunc = SHA384
-                       sigAlgo.Algorithm = oidSignatureECDSAWithSHA384
-               case elliptic.P521():
-                       hashFunc = SHA512
-                       sigAlgo.Algorithm = oidSignatureECDSAWithSHA512
-               default:
-                       err = errors.New("x509: unknown elliptic curve")
-               }
-       case *PublicKey:
-               pubType = ECDSA
-               switch pub.Curve {
-               case P256Sm2():
-                       hashFunc = SM3
-                       sigAlgo.Algorithm = oidSignatureSM2WithSM3
-               default:
-                       err = errors.New("x509: unknown SM2 curve")
-               }
-       default:
-               err = errors.New("x509: only RSA and ECDSA keys supported")
-       }
-
-       if err != nil {
-               return
-       }
-
-       if requestedSigAlgo == 0 {
-               return
-       }
-
-       found := false
-       for _, details := range signatureAlgorithmDetails {
-               if details.algo == requestedSigAlgo {
-                       if details.pubKeyAlgo != pubType {
-                               err = errors.New("x509: requested SignatureAlgorithm does not match private key type")
-                               return
-                       }
-                       sigAlgo.Algorithm, hashFunc = details.oid, details.hash
-                       if hashFunc == 0 {
-                               err = errors.New("x509: cannot sign with hash function requested")
-                               return
-                       }
-                       if requestedSigAlgo.isRSAPSS() {
-                               sigAlgo.Parameters = rsaPSSParameters(hashFunc)
-                       }
-                       found = true
-                       break
-               }
-       }
-
-       if !found {
-               err = errors.New("x509: unknown SignatureAlgorithm")
-       }
-
-       return
-}
-
-// CreateCertificate creates a new certificate based on a template. The
-// following members of template are used: SerialNumber, Subject, NotBefore,
-// NotAfter, KeyUsage, ExtKeyUsage, UnknownExtKeyUsage, BasicConstraintsValid,
-// IsCA, MaxPathLen, SubjectKeyId, DNSNames, PermittedDNSDomainsCritical,
-// PermittedDNSDomains, SignatureAlgorithm.
-//
-// The certificate is signed by parent. If parent is equal to template then the
-// certificate is self-signed. The parameter pub is the public key of the
-// signee and priv is the private key of the signer.
-//
-// The returned slice is the certificate in DER encoding.
-//
-// All keys types that are implemented via crypto.Signer are supported (This
-// includes *rsa.PublicKey and *ecdsa.PublicKey.)
-func CreateCertificate(rand io.Reader, template, parent *Certificate, pub, priv interface{}) (cert []byte, err error) {
-       key, ok := priv.(crypto.Signer)
-       if !ok {
-               return nil, errors.New("x509: certificate private key does not implement crypto.Signer")
-       }
-
-       if template.SerialNumber == nil {
-               return nil, errors.New("x509: no SerialNumber given")
-       }
-
-       hashFunc, signatureAlgorithm, err := signingParamsForPublicKey(key.Public(), template.SignatureAlgorithm)
-       if err != nil {
-               return nil, err
-       }
-
-       publicKeyBytes, publicKeyAlgorithm, err := marshalPublicKey(pub)
-       if err != nil {
-               return nil, err
-       }
-
-       asn1Issuer, err := subjectBytes(parent)
-       if err != nil {
-               return
-       }
-
-       asn1Subject, err := subjectBytes(template)
-       if err != nil {
-               return
-       }
-
-       if !bytes.Equal(asn1Issuer, asn1Subject) && len(parent.SubjectKeyId) > 0 {
-               template.AuthorityKeyId = parent.SubjectKeyId
-       }
-
-       extensions, err := buildExtensions(template)
-       if err != nil {
-               return
-       }
-       encodedPublicKey := asn1.BitString{BitLength: len(publicKeyBytes) * 8, Bytes: publicKeyBytes}
-       c := tbsCertificate{
-               Version:            2,
-               SerialNumber:       template.SerialNumber,
-               SignatureAlgorithm: signatureAlgorithm,
-               Issuer:             asn1.RawValue{FullBytes: asn1Issuer},
-               Validity:           validity{template.NotBefore.UTC(), template.NotAfter.UTC()},
-               Subject:            asn1.RawValue{FullBytes: asn1Subject},
-               PublicKey:          publicKeyInfo{nil, publicKeyAlgorithm, encodedPublicKey},
-               Extensions:         extensions,
-       }
-
-       tbsCertContents, err := asn1.Marshal(c)
-       if err != nil {
-               return
-       }
-
-       c.Raw = tbsCertContents
-
-       h := hashFunc.New()
-       h.Write(tbsCertContents)
-       digest := h.Sum(nil)
-
-       var signerOpts crypto.SignerOpts
-       signerOpts = hashFunc
-       if template.SignatureAlgorithm != 0 && template.SignatureAlgorithm.isRSAPSS() {
-               signerOpts = &rsa.PSSOptions{
-                       SaltLength: rsa.PSSSaltLengthEqualsHash,
-                       Hash:       crypto.Hash(hashFunc),
-               }
-       }
-
-       var signature []byte
-       signature, err = key.Sign(rand, digest, signerOpts)
-       if err != nil {
-               return
-       }
-
-       return asn1.Marshal(certificate{
-               nil,
-               c,
-               signatureAlgorithm,
-               asn1.BitString{Bytes: signature, BitLength: len(signature) * 8},
-       })
-}
-
-// pemCRLPrefix is the magic string that indicates that we have a PEM encoded
-// CRL.
-var pemCRLPrefix = []byte("-----BEGIN X509 CRL")
-
-// pemType is the type of a PEM encoded CRL.
-var pemType = "X509 CRL"
-
-// ParseCRL parses a CRL from the given bytes. It's often the case that PEM
-// encoded CRLs will appear where they should be DER encoded, so this function
-// will transparently handle PEM encoding as long as there isn't any leading
-// garbage.
-func ParseCRL(crlBytes []byte) (*pkix.CertificateList, error) {
-       if bytes.HasPrefix(crlBytes, pemCRLPrefix) {
-               block, _ := pem.Decode(crlBytes)
-               if block != nil && block.Type == pemType {
-                       crlBytes = block.Bytes
-               }
-       }
-       return ParseDERCRL(crlBytes)
-}
-
-// ParseDERCRL parses a DER encoded CRL from the given bytes.
-func ParseDERCRL(derBytes []byte) (*pkix.CertificateList, error) {
-       certList := new(pkix.CertificateList)
-       if rest, err := asn1.Unmarshal(derBytes, certList); err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, errors.New("x509: trailing data after CRL")
-       }
-       return certList, nil
-}
-
-// CreateCRL returns a DER encoded CRL, signed by this Certificate, that
-// contains the given list of revoked certificates.
-func (c *Certificate) CreateCRL(rand io.Reader, priv interface{}, revokedCerts []pkix.RevokedCertificate, now, expiry time.Time) (crlBytes []byte, err error) {
-       key, ok := priv.(crypto.Signer)
-       if !ok {
-               return nil, errors.New("x509: certificate private key does not implement crypto.Signer")
-       }
-
-       hashFunc, signatureAlgorithm, err := signingParamsForPublicKey(key.Public(), 0)
-       if err != nil {
-               return nil, err
-       }
-
-       // Force revocation times to UTC per RFC 5280.
-       revokedCertsUTC := make([]pkix.RevokedCertificate, len(revokedCerts))
-       for i, rc := range revokedCerts {
-               rc.RevocationTime = rc.RevocationTime.UTC()
-               revokedCertsUTC[i] = rc
-       }
-
-       tbsCertList := pkix.TBSCertificateList{
-               Version:             1,
-               Signature:           signatureAlgorithm,
-               Issuer:              c.Subject.ToRDNSequence(),
-               ThisUpdate:          now.UTC(),
-               NextUpdate:          expiry.UTC(),
-               RevokedCertificates: revokedCertsUTC,
-       }
-
-       // Authority Key Id
-       if len(c.SubjectKeyId) > 0 {
-               var aki pkix.Extension
-               aki.Id = oidExtensionAuthorityKeyId
-               aki.Value, err = asn1.Marshal(authKeyId{Id: c.SubjectKeyId})
-               if err != nil {
-                       return
-               }
-               tbsCertList.Extensions = append(tbsCertList.Extensions, aki)
-       }
-
-       tbsCertListContents, err := asn1.Marshal(tbsCertList)
-       if err != nil {
-               return
-       }
-
-       h := hashFunc.New()
-       h.Write(tbsCertListContents)
-       digest := h.Sum(nil)
-
-       var signature []byte
-       signature, err = key.Sign(rand, digest, hashFunc)
-       if err != nil {
-               return
-       }
-
-       return asn1.Marshal(pkix.CertificateList{
-               TBSCertList:        tbsCertList,
-               SignatureAlgorithm: signatureAlgorithm,
-               SignatureValue:     asn1.BitString{Bytes: signature, BitLength: len(signature) * 8},
-       })
-}
-
-// CertificateRequest represents a PKCS #10, certificate signature request.
-type CertificateRequest struct {
-       Raw                      []byte // Complete ASN.1 DER content (CSR, signature algorithm and signature).
-       RawTBSCertificateRequest []byte // Certificate request info part of raw ASN.1 DER content.
-       RawSubjectPublicKeyInfo  []byte // DER encoded SubjectPublicKeyInfo.
-       RawSubject               []byte // DER encoded Subject.
-
-       Version            int
-       Signature          []byte
-       SignatureAlgorithm SignatureAlgorithm
-
-       PublicKeyAlgorithm PublicKeyAlgorithm
-       PublicKey          interface{}
-
-       Subject pkix.Name
-
-       // Attributes is the dried husk of a bug and shouldn't be used.
-       Attributes []pkix.AttributeTypeAndValueSET
-
-       // Extensions contains raw X.509 extensions. When parsing CSRs, this
-       // can be used to extract extensions that are not parsed by this
-       // package.
-       Extensions []pkix.Extension
-
-       // ExtraExtensions contains extensions to be copied, raw, into any
-       // marshaled CSR. Values override any extensions that would otherwise
-       // be produced based on the other fields but are overridden by any
-       // extensions specified in Attributes.
-       //
-       // The ExtraExtensions field is not populated when parsing CSRs, see
-       // Extensions.
-       ExtraExtensions []pkix.Extension
-
-       // Subject Alternate Name values.
-       DNSNames       []string
-       EmailAddresses []string
-       IPAddresses    []net.IP
-}
-
-// These structures reflect the ASN.1 structure of X.509 certificate
-// signature requests (see RFC 2986):
-
-type tbsCertificateRequest struct {
-       Raw           asn1.RawContent
-       Version       int
-       Subject       asn1.RawValue
-       PublicKey     publicKeyInfo
-       RawAttributes []asn1.RawValue `asn1:"tag:0"`
-}
-
-type certificateRequest struct {
-       Raw                asn1.RawContent
-       TBSCSR             tbsCertificateRequest
-       SignatureAlgorithm pkix.AlgorithmIdentifier
-       SignatureValue     asn1.BitString
-}
-
-// oidExtensionRequest is a PKCS#9 OBJECT IDENTIFIER that indicates requested
-// extensions in a CSR.
-var oidExtensionRequest = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 9, 14}
-
-// newRawAttributes converts AttributeTypeAndValueSETs from a template
-// CertificateRequest's Attributes into tbsCertificateRequest RawAttributes.
-func newRawAttributes(attributes []pkix.AttributeTypeAndValueSET) ([]asn1.RawValue, error) {
-       var rawAttributes []asn1.RawValue
-       b, err := asn1.Marshal(attributes)
-       if err != nil {
-               return nil, err
-       }
-       rest, err := asn1.Unmarshal(b, &rawAttributes)
-       if err != nil {
-               return nil, err
-       }
-       if len(rest) != 0 {
-               return nil, errors.New("x509: failed to unmarshal raw CSR Attributes")
-       }
-       return rawAttributes, nil
-}
-
-// parseRawAttributes Unmarshals RawAttributes intos AttributeTypeAndValueSETs.
-func parseRawAttributes(rawAttributes []asn1.RawValue) []pkix.AttributeTypeAndValueSET {
-       var attributes []pkix.AttributeTypeAndValueSET
-       for _, rawAttr := range rawAttributes {
-               var attr pkix.AttributeTypeAndValueSET
-               rest, err := asn1.Unmarshal(rawAttr.FullBytes, &attr)
-               // Ignore attributes that don't parse into pkix.AttributeTypeAndValueSET
-               // (i.e.: challengePassword or unstructuredName).
-               if err == nil && len(rest) == 0 {
-                       attributes = append(attributes, attr)
-               }
-       }
-       return attributes
-}
-
-// parseCSRExtensions parses the attributes from a CSR and extracts any
-// requested extensions.
-func parseCSRExtensions(rawAttributes []asn1.RawValue) ([]pkix.Extension, error) {
-       // pkcs10Attribute reflects the Attribute structure from section 4.1 of
-       // https://tools.ietf.org/html/rfc2986.
-       type pkcs10Attribute struct {
-               Id     asn1.ObjectIdentifier
-               Values []asn1.RawValue `asn1:"set"`
-       }
-
-       var ret []pkix.Extension
-       for _, rawAttr := range rawAttributes {
-               var attr pkcs10Attribute
-               if rest, err := asn1.Unmarshal(rawAttr.FullBytes, &attr); err != nil || len(rest) != 0 || len(attr.Values) == 0 {
-                       // Ignore attributes that don't parse.
-                       continue
-               }
-
-               if !attr.Id.Equal(oidExtensionRequest) {
-                       continue
-               }
-
-               var extensions []pkix.Extension
-               if _, err := asn1.Unmarshal(attr.Values[0].FullBytes, &extensions); err != nil {
-                       return nil, err
-               }
-               ret = append(ret, extensions...)
-       }
-
-       return ret, nil
-}
-
-// CreateCertificateRequest creates a new certificate request based on a template.
-// The following members of template are used: Subject, Attributes,
-// SignatureAlgorithm, Extensions, DNSNames, EmailAddresses, and IPAddresses.
-// The private key is the private key of the signer.
-//
-// The returned slice is the certificate request in DER encoding.
-//
-// All keys types that are implemented via crypto.Signer are supported (This
-// includes *rsa.PublicKey and *ecdsa.PublicKey.)
-func CreateCertificateRequest(rand io.Reader, template *CertificateRequest, priv interface{}) (csr []byte, err error) {
-       key, ok := priv.(crypto.Signer)
-       if !ok {
-               return nil, errors.New("x509: certificate private key does not implement crypto.Signer")
-       }
-
-       var hashFunc Hash
-       var sigAlgo pkix.AlgorithmIdentifier
-       hashFunc, sigAlgo, err = signingParamsForPublicKey(key.Public(), template.SignatureAlgorithm)
-       if err != nil {
-               return nil, err
-       }
-
-       var publicKeyBytes []byte
-       var publicKeyAlgorithm pkix.AlgorithmIdentifier
-       publicKeyBytes, publicKeyAlgorithm, err = marshalPublicKey(key.Public())
-       if err != nil {
-               return nil, err
-       }
-
-       var extensions []pkix.Extension
-
-       if (len(template.DNSNames) > 0 || len(template.EmailAddresses) > 0 || len(template.IPAddresses) > 0) &&
-               !oidInExtensions(oidExtensionSubjectAltName, template.ExtraExtensions) {
-               sanBytes, err := marshalSANs(template.DNSNames, template.EmailAddresses, template.IPAddresses)
-               if err != nil {
-                       return nil, err
-               }
-
-               extensions = append(extensions, pkix.Extension{
-                       Id:    oidExtensionSubjectAltName,
-                       Value: sanBytes,
-               })
-       }
-
-       extensions = append(extensions, template.ExtraExtensions...)
-
-       var attributes []pkix.AttributeTypeAndValueSET
-       attributes = append(attributes, template.Attributes...)
-
-       if len(extensions) > 0 {
-               // specifiedExtensions contains all the extensions that we
-               // found specified via template.Attributes.
-               specifiedExtensions := make(map[string]bool)
-
-               for _, atvSet := range template.Attributes {
-                       if !atvSet.Type.Equal(oidExtensionRequest) {
-                               continue
-                       }
-
-                       for _, atvs := range atvSet.Value {
-                               for _, atv := range atvs {
-                                       specifiedExtensions[atv.Type.String()] = true
-                               }
-                       }
-               }
-
-               atvs := make([]pkix.AttributeTypeAndValue, 0, len(extensions))
-               for _, e := range extensions {
-                       if specifiedExtensions[e.Id.String()] {
-                               // Attributes already contained a value for
-                               // this extension and it takes priority.
-                               continue
-                       }
-
-                       atvs = append(atvs, pkix.AttributeTypeAndValue{
-                               // There is no place for the critical flag in a CSR.
-                               Type:  e.Id,
-                               Value: e.Value,
-                       })
-               }
-
-               // Append the extensions to an existing attribute if possible.
-               appended := false
-               for _, atvSet := range attributes {
-                       if !atvSet.Type.Equal(oidExtensionRequest) || len(atvSet.Value) == 0 {
-                               continue
-                       }
-
-                       atvSet.Value[0] = append(atvSet.Value[0], atvs...)
-                       appended = true
-                       break
-               }
-
-               // Otherwise, add a new attribute for the extensions.
-               if !appended {
-                       attributes = append(attributes, pkix.AttributeTypeAndValueSET{
-                               Type: oidExtensionRequest,
-                               Value: [][]pkix.AttributeTypeAndValue{
-                                       atvs,
-                               },
-                       })
-               }
-       }
-
-       asn1Subject := template.RawSubject
-       if len(asn1Subject) == 0 {
-               asn1Subject, err = asn1.Marshal(template.Subject.ToRDNSequence())
-               if err != nil {
-                       return
-               }
-       }
-
-       rawAttributes, err := newRawAttributes(attributes)
-       if err != nil {
-               return
-       }
-
-       tbsCSR := tbsCertificateRequest{
-               Version: 0, // PKCS #10, RFC 2986
-               Subject: asn1.RawValue{FullBytes: asn1Subject},
-               PublicKey: publicKeyInfo{
-                       Algorithm: publicKeyAlgorithm,
-                       PublicKey: asn1.BitString{
-                               Bytes:     publicKeyBytes,
-                               BitLength: len(publicKeyBytes) * 8,
-                       },
-               },
-               RawAttributes: rawAttributes,
-       }
-
-       tbsCSRContents, err := asn1.Marshal(tbsCSR)
-       if err != nil {
-               return
-       }
-       tbsCSR.Raw = tbsCSRContents
-
-       h := hashFunc.New()
-       h.Write(tbsCSRContents)
-       digest := h.Sum(nil)
-
-       var signature []byte
-       signature, err = key.Sign(rand, digest, hashFunc)
-       if err != nil {
-               return
-       }
-
-       return asn1.Marshal(certificateRequest{
-               TBSCSR:             tbsCSR,
-               SignatureAlgorithm: sigAlgo,
-               SignatureValue: asn1.BitString{
-                       Bytes:     signature,
-                       BitLength: len(signature) * 8,
-               },
-       })
-}
-
-// ParseCertificateRequest parses a single certificate request from the
-// given ASN.1 DER data.
-func ParseCertificateRequest(asn1Data []byte) (*CertificateRequest, error) {
-       var csr certificateRequest
-
-       rest, err := asn1.Unmarshal(asn1Data, &csr)
-       if err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, asn1.SyntaxError{Msg: "trailing data"}
-       }
-
-       return parseCertificateRequest(&csr)
-}
-
-func parseCertificateRequest(in *certificateRequest) (*CertificateRequest, error) {
-       out := &CertificateRequest{
-               Raw: in.Raw,
-               RawTBSCertificateRequest: in.TBSCSR.Raw,
-               RawSubjectPublicKeyInfo:  in.TBSCSR.PublicKey.Raw,
-               RawSubject:               in.TBSCSR.Subject.FullBytes,
-
-               Signature:          in.SignatureValue.RightAlign(),
-               SignatureAlgorithm: getSignatureAlgorithmFromAI(in.SignatureAlgorithm),
-
-               PublicKeyAlgorithm: getPublicKeyAlgorithmFromOID(in.TBSCSR.PublicKey.Algorithm.Algorithm),
-
-               Version:    in.TBSCSR.Version,
-               Attributes: parseRawAttributes(in.TBSCSR.RawAttributes),
-       }
-
-       var err error
-       out.PublicKey, err = parsePublicKey(out.PublicKeyAlgorithm, &in.TBSCSR.PublicKey)
-       if err != nil {
-               return nil, err
-       }
-
-       var subject pkix.RDNSequence
-       if rest, err := asn1.Unmarshal(in.TBSCSR.Subject.FullBytes, &subject); err != nil {
-               return nil, err
-       } else if len(rest) != 0 {
-               return nil, errors.New("x509: trailing data after X.509 Subject")
-       }
-
-       out.Subject.FillFromRDNSequence(&subject)
-
-       if out.Extensions, err = parseCSRExtensions(in.TBSCSR.RawAttributes); err != nil {
-               return nil, err
-       }
-
-       for _, extension := range out.Extensions {
-               if extension.Id.Equal(oidExtensionSubjectAltName) {
-                       out.DNSNames, out.EmailAddresses, out.IPAddresses, err = parseSANExtension(extension.Value)
-                       if err != nil {
-                               return nil, err
-                       }
-               }
-       }
-
-       return out, nil
-}
-
-// CheckSignature reports whether the signature on c is valid.
-func (c *CertificateRequest) CheckSignature() error {
-       return checkSignature(c.SignatureAlgorithm, c.RawTBSCertificateRequest, c.Signature, c.PublicKey)
-}
-
-func ReadCertificateRequestFromMem(data []byte) (*CertificateRequest, error) {
-       block, _ := pem.Decode(data)
-       if block == nil {
-               return nil, errors.New("failed to decode certificate request")
-       }
-       return ParseCertificateRequest(block.Bytes)
-}
-
-func ReadCertificateRequestFromPem(FileName string) (*CertificateRequest, error) {
-       data, err := ioutil.ReadFile(FileName)
-       if err != nil {
-               return nil, err
-       }
-       return ReadCertificateRequestFromMem(data)
-}
-
-func CreateCertificateRequestToMem(template *CertificateRequest, privKey *PrivateKey) ([]byte, error) {
-       der, err := CreateCertificateRequest(rand.Reader, template, privKey)
-       if err != nil {
-               return nil, err
-       }
-       block := &pem.Block{
-               Type:  "CERTIFICATE REQUEST",
-               Bytes: der,
-       }
-       return pem.EncodeToMemory(block), nil
-}
-
-func CreateCertificateRequestToPem(FileName string, template *CertificateRequest,
-       privKey *PrivateKey) (bool, error) {
-       der, err := CreateCertificateRequest(rand.Reader, template, privKey)
-       if err != nil {
-               return false, err
-       }
-       block := &pem.Block{
-               Type:  "CERTIFICATE REQUEST",
-               Bytes: der,
-       }
-       file, err := os.Create(FileName)
-       if err != nil {
-               return false, err
-       }
-       defer file.Close()
-       err = pem.Encode(file, block)
-       if err != nil {
-               return false, err
-       }
-       return true, nil
-}
-
-func ReadCertificateFromMem(data []byte) (*Certificate, error) {
-       block, _ := pem.Decode(data)
-       if block == nil {
-               return nil, errors.New("failed to decode certificate request")
-       }
-       return ParseCertificate(block.Bytes)
-}
-
-func ReadCertificateFromPem(FileName string) (*Certificate, error) {
-       data, err := ioutil.ReadFile(FileName)
-       if err != nil {
-               return nil, err
-       }
-       return ReadCertificateFromMem(data)
-}
-
-func CreateCertificateToMem(template, parent *Certificate, pubKey *PublicKey, privKey *PrivateKey) ([]byte, error) {
-       der, err := CreateCertificate(rand.Reader, template, parent, pubKey, privKey)
-       if err != nil {
-               return nil, err
-       }
-       block := &pem.Block{
-               Type:  "CERTIFICATE",
-               Bytes: der,
-       }
-       return pem.EncodeToMemory(block), nil
-}
-
-func CreateCertificateToPem(FileName string, template, parent *Certificate, pubKey *PublicKey, privKey *PrivateKey) (bool, error) {
-       der, err := CreateCertificate(rand.Reader, template, parent, pubKey, privKey)
-       if err != nil {
-               return false, err
-       }
-       block := &pem.Block{
-               Type:  "CERTIFICATE",
-               Bytes: der,
-       }
-       file, err := os.Create(FileName)
-       if err != nil {
-               return false, err
-       }
-       defer file.Close()
-       err = pem.Encode(file, block)
-       if err != nil {
-               return false, err
-       }
-       return true, nil
-}

diff --git a/vendor/github.com/tendermint/ed25519/LICENSE b/vendor/github.com/tendermint/ed25519/LICENSE
deleted file mode 100644 (file)
index 7448756..0000000
--- a/vendor/github.com/tendermint/ed25519/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

diff --git a/vendor/github.com/tendermint/ed25519/ed25519.go b/vendor/github.com/tendermint/ed25519/ed25519.go
deleted file mode 100644 (file)
index 5a97cde..0000000
--- a/vendor/github.com/tendermint/ed25519/ed25519.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ed25519 implements the Ed25519 signature algorithm. See
-// http://ed25519.cr.yp.to/.
-package ed25519
-
-// This code is a port of the public domain, "ref10" implementation of ed25519
-// from SUPERCOP.
-
-import (
-       "crypto/sha512"
-       "crypto/subtle"
-
-       "github.com/tendermint/ed25519/edwards25519"
-)
-
-const (
-       PublicKeySize  = 32
-       PrivateKeySize = 64
-       SignatureSize  = 64
-)
-
-// MakePublicKey makes a publicKey from the first half of privateKey.
-func MakePublicKey(privateKey *[PrivateKeySize]byte) (publicKey *[PublicKeySize]byte) {
-       publicKey = new([32]byte)
-
-       h := sha512.New()
-       h.Write(privateKey[:32])
-       digest := h.Sum(nil)
-
-       digest[0] &= 248
-       digest[31] &= 127
-       digest[31] |= 64
-
-       var A edwards25519.ExtendedGroupElement
-       var hBytes [32]byte
-       copy(hBytes[:], digest)
-       edwards25519.GeScalarMultBase(&A, &hBytes)
-       A.ToBytes(publicKey)
-
-       copy(privateKey[32:], publicKey[:])
-       return
-}
-
-// Sign signs the message with privateKey and returns a signature.
-func Sign(privateKey *[PrivateKeySize]byte, message []byte) *[SignatureSize]byte {
-       h := sha512.New()
-       h.Write(privateKey[:32])
-
-       var digest1, messageDigest, hramDigest [64]byte
-       var expandedSecretKey [32]byte
-       h.Sum(digest1[:0])
-       copy(expandedSecretKey[:], digest1[:])
-       expandedSecretKey[0] &= 248
-       expandedSecretKey[31] &= 63
-       expandedSecretKey[31] |= 64
-
-       h.Reset()
-       h.Write(digest1[32:])
-       h.Write(message)
-       h.Sum(messageDigest[:0])
-
-       var messageDigestReduced [32]byte
-       edwards25519.ScReduce(&messageDigestReduced, &messageDigest)
-       var R edwards25519.ExtendedGroupElement
-       edwards25519.GeScalarMultBase(&R, &messageDigestReduced)
-
-       var encodedR [32]byte
-       R.ToBytes(&encodedR)
-
-       h.Reset()
-       h.Write(encodedR[:])
-       h.Write(privateKey[32:])
-       h.Write(message)
-       h.Sum(hramDigest[:0])
-       var hramDigestReduced [32]byte
-       edwards25519.ScReduce(&hramDigestReduced, &hramDigest)
-
-       var s [32]byte
-       edwards25519.ScMulAdd(&s, &hramDigestReduced, &expandedSecretKey, &messageDigestReduced)
-
-       signature := new([64]byte)
-       copy(signature[:], encodedR[:])
-       copy(signature[32:], s[:])
-       return signature
-}
-
-// Verify returns true iff sig is a valid signature of message by publicKey.
-func Verify(publicKey *[PublicKeySize]byte, message []byte, sig *[SignatureSize]byte) bool {
-       if sig[63]&224 != 0 {
-               return false
-       }
-
-       var A edwards25519.ExtendedGroupElement
-       if !A.FromBytes(publicKey) {
-               return false
-       }
-       edwards25519.FeNeg(&A.X, &A.X)
-       edwards25519.FeNeg(&A.T, &A.T)
-
-       h := sha512.New()
-       h.Write(sig[:32])
-       h.Write(publicKey[:])
-       h.Write(message)
-       var digest [64]byte
-       h.Sum(digest[:0])
-
-       var hReduced [32]byte
-       edwards25519.ScReduce(&hReduced, &digest)
-
-       var R edwards25519.ProjectiveGroupElement
-       var b [32]byte
-       copy(b[:], sig[32:])
-       edwards25519.GeDoubleScalarMultVartime(&R, &hReduced, &A, &b)
-
-       var checkR [32]byte
-       R.ToBytes(&checkR)
-       return subtle.ConstantTimeCompare(sig[:32], checkR[:]) == 1
-}

diff --git a/vendor/github.com/tendermint/ed25519/edwards25519/const.go b/vendor/github.com/tendermint/ed25519/edwards25519/const.go
deleted file mode 100644 (file)
index ea5b77a..0000000
--- a/vendor/github.com/tendermint/ed25519/edwards25519/const.go
+++ /dev/null
@@ -1,1411 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package edwards25519
-
-var d = FieldElement{
-       -10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116,
-}
-
-var d2 = FieldElement{
-       -21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199,
-}
-
-var SqrtM1 = FieldElement{
-       -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482,
-}
-
-var A = FieldElement{
-       486662, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-}
-
-var bi = [8]PreComputedGroupElement{
-       {
-               FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
-               FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
-               FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
-       },
-       {
-               FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
-               FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
-               FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
-       },
-       {
-               FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
-               FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
-               FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
-       },
-       {
-               FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
-               FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
-               FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
-       },
-       {
-               FieldElement{-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877},
-               FieldElement{-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951},
-               FieldElement{4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784},
-       },
-       {
-               FieldElement{-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436},
-               FieldElement{25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918},
-               FieldElement{23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877},
-       },
-       {
-               FieldElement{-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800},
-               FieldElement{-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305},
-               FieldElement{-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300},
-       },
-       {
-               FieldElement{-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876},
-               FieldElement{-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619},
-               FieldElement{-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683},
-       },
-}
-
-var base = [32][8]PreComputedGroupElement{
-       {
-               {
-                       FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
-                       FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
-                       FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
-               },
-               {
-                       FieldElement{-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303},
-                       FieldElement{-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081},
-                       FieldElement{26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697},
-               },
-               {
-                       FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
-                       FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
-                       FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
-               },
-               {
-                       FieldElement{-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540},
-                       FieldElement{23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397},
-                       FieldElement{7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325},
-               },
-               {
-                       FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
-                       FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
-                       FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
-               },
-               {
-                       FieldElement{-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777},
-                       FieldElement{-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737},
-                       FieldElement{-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652},
-               },
-               {
-                       FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
-                       FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
-                       FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
-               },
-               {
-                       FieldElement{14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726},
-                       FieldElement{-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955},
-                       FieldElement{27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425},
-               },
-       },
-       {
-               {
-                       FieldElement{-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171},
-                       FieldElement{27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510},
-                       FieldElement{17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660},
-               },
-               {
-                       FieldElement{-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639},
-                       FieldElement{29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963},
-                       FieldElement{5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950},
-               },
-               {
-                       FieldElement{-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568},
-                       FieldElement{12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335},
-                       FieldElement{25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628},
-               },
-               {
-                       FieldElement{-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007},
-                       FieldElement{-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772},
-                       FieldElement{-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653},
-               },
-               {
-                       FieldElement{2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567},
-                       FieldElement{13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686},
-                       FieldElement{21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372},
-               },
-               {
-                       FieldElement{-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887},
-                       FieldElement{-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954},
-                       FieldElement{-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953},
-               },
-               {
-                       FieldElement{24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833},
-                       FieldElement{-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532},
-                       FieldElement{-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876},
-               },
-               {
-                       FieldElement{2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268},
-                       FieldElement{33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214},
-                       FieldElement{1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038},
-               },
-       },
-       {
-               {
-                       FieldElement{6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800},
-                       FieldElement{4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645},
-                       FieldElement{-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664},
-               },
-               {
-                       FieldElement{1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933},
-                       FieldElement{-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182},
-                       FieldElement{-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222},
-               },
-               {
-                       FieldElement{-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991},
-                       FieldElement{20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880},
-                       FieldElement{9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092},
-               },
-               {
-                       FieldElement{-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295},
-                       FieldElement{19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788},
-                       FieldElement{8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553},
-               },
-               {
-                       FieldElement{-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026},
-                       FieldElement{11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347},
-                       FieldElement{-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033},
-               },
-               {
-                       FieldElement{-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395},
-                       FieldElement{-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278},
-                       FieldElement{1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890},
-               },
-               {
-                       FieldElement{32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995},
-                       FieldElement{-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596},
-                       FieldElement{-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891},
-               },
-               {
-                       FieldElement{31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060},
-                       FieldElement{11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608},
-                       FieldElement{-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606},
-               },
-       },
-       {
-               {
-                       FieldElement{7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389},
-                       FieldElement{-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016},
-                       FieldElement{-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341},
-               },
-               {
-                       FieldElement{-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505},
-                       FieldElement{14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553},
-                       FieldElement{-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655},
-               },
-               {
-                       FieldElement{15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220},
-                       FieldElement{12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631},
-                       FieldElement{-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099},
-               },
-               {
-                       FieldElement{26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556},
-                       FieldElement{14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749},
-                       FieldElement{236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930},
-               },
-               {
-                       FieldElement{1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391},
-                       FieldElement{5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253},
-                       FieldElement{20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066},
-               },
-               {
-                       FieldElement{24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958},
-                       FieldElement{-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082},
-                       FieldElement{-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383},
-               },
-               {
-                       FieldElement{-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521},
-                       FieldElement{-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807},
-                       FieldElement{23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948},
-               },
-               {
-                       FieldElement{9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134},
-                       FieldElement{-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455},
-                       FieldElement{27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629},
-               },
-       },
-       {
-               {
-                       FieldElement{-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069},
-                       FieldElement{-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746},
-                       FieldElement{24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919},
-               },
-               {
-                       FieldElement{11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837},
-                       FieldElement{8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906},
-                       FieldElement{-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771},
-               },
-               {
-                       FieldElement{-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817},
-                       FieldElement{10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098},
-                       FieldElement{10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409},
-               },
-               {
-                       FieldElement{-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504},
-                       FieldElement{-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727},
-                       FieldElement{28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420},
-               },
-               {
-                       FieldElement{-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003},
-                       FieldElement{-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605},
-                       FieldElement{-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384},
-               },
-               {
-                       FieldElement{-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701},
-                       FieldElement{-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683},
-                       FieldElement{29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708},
-               },
-               {
-                       FieldElement{-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563},
-                       FieldElement{-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260},
-                       FieldElement{-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387},
-               },
-               {
-                       FieldElement{-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672},
-                       FieldElement{23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686},
-                       FieldElement{-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665},
-               },
-       },
-       {
-               {
-                       FieldElement{11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182},
-                       FieldElement{-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277},
-                       FieldElement{14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628},
-               },
-               {
-                       FieldElement{-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474},
-                       FieldElement{-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539},
-                       FieldElement{-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822},
-               },
-               {
-                       FieldElement{-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970},
-                       FieldElement{19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756},
-                       FieldElement{-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508},
-               },
-               {
-                       FieldElement{-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683},
-                       FieldElement{-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655},
-                       FieldElement{-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158},
-               },
-               {
-                       FieldElement{-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125},
-                       FieldElement{-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839},
-                       FieldElement{-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664},
-               },
-               {
-                       FieldElement{27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294},
-                       FieldElement{-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899},
-                       FieldElement{-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070},
-               },
-               {
-                       FieldElement{3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294},
-                       FieldElement{-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949},
-                       FieldElement{-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083},
-               },
-               {
-                       FieldElement{31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420},
-                       FieldElement{-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940},
-                       FieldElement{29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396},
-               },
-       },
-       {
-               {
-                       FieldElement{-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567},
-                       FieldElement{20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127},
-                       FieldElement{-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294},
-               },
-               {
-                       FieldElement{-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887},
-                       FieldElement{22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964},
-                       FieldElement{16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195},
-               },
-               {
-                       FieldElement{9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244},
-                       FieldElement{24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999},
-                       FieldElement{-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762},
-               },
-               {
-                       FieldElement{-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274},
-                       FieldElement{-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236},
-                       FieldElement{-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605},
-               },
-               {
-                       FieldElement{-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761},
-                       FieldElement{-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884},
-                       FieldElement{-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482},
-               },
-               {
-                       FieldElement{-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638},
-                       FieldElement{-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490},
-                       FieldElement{-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170},
-               },
-               {
-                       FieldElement{5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736},
-                       FieldElement{10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124},
-                       FieldElement{-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392},
-               },
-               {
-                       FieldElement{8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029},
-                       FieldElement{6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048},
-                       FieldElement{28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958},
-               },
-       },
-       {
-               {
-                       FieldElement{24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593},
-                       FieldElement{26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071},
-                       FieldElement{-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692},
-               },
-               {
-                       FieldElement{11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687},
-                       FieldElement{-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441},
-                       FieldElement{-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001},
-               },
-               {
-                       FieldElement{-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460},
-                       FieldElement{-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007},
-                       FieldElement{-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762},
-               },
-               {
-                       FieldElement{15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005},
-                       FieldElement{-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674},
-                       FieldElement{4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035},
-               },
-               {
-                       FieldElement{7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590},
-                       FieldElement{-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957},
-                       FieldElement{-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812},
-               },
-               {
-                       FieldElement{33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740},
-                       FieldElement{-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122},
-                       FieldElement{-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158},
-               },
-               {
-                       FieldElement{8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885},
-                       FieldElement{26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140},
-                       FieldElement{19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857},
-               },
-               {
-                       FieldElement{801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155},
-                       FieldElement{19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260},
-                       FieldElement{19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483},
-               },
-       },
-       {
-               {
-                       FieldElement{-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677},
-                       FieldElement{32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815},
-                       FieldElement{22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751},
-               },
-               {
-                       FieldElement{-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203},
-                       FieldElement{-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208},
-                       FieldElement{1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230},
-               },
-               {
-                       FieldElement{16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850},
-                       FieldElement{-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389},
-                       FieldElement{-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968},
-               },
-               {
-                       FieldElement{-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689},
-                       FieldElement{14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880},
-                       FieldElement{5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304},
-               },
-               {
-                       FieldElement{30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632},
-                       FieldElement{-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412},
-                       FieldElement{20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566},
-               },
-               {
-                       FieldElement{-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038},
-                       FieldElement{-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232},
-                       FieldElement{-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943},
-               },
-               {
-                       FieldElement{17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856},
-                       FieldElement{23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738},
-                       FieldElement{15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971},
-               },
-               {
-                       FieldElement{-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718},
-                       FieldElement{-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697},
-                       FieldElement{-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883},
-               },
-       },
-       {
-               {
-                       FieldElement{5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912},
-                       FieldElement{-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358},
-                       FieldElement{3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849},
-               },
-               {
-                       FieldElement{29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307},
-                       FieldElement{-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977},
-                       FieldElement{-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335},
-               },
-               {
-                       FieldElement{-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644},
-                       FieldElement{-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616},
-                       FieldElement{-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735},
-               },
-               {
-                       FieldElement{-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099},
-                       FieldElement{29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341},
-                       FieldElement{-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336},
-               },
-               {
-                       FieldElement{-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646},
-                       FieldElement{31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425},
-                       FieldElement{-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388},
-               },
-               {
-                       FieldElement{-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743},
-                       FieldElement{-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822},
-                       FieldElement{-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462},
-               },
-               {
-                       FieldElement{18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985},
-                       FieldElement{9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702},
-                       FieldElement{-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797},
-               },
-               {
-                       FieldElement{21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293},
-                       FieldElement{27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100},
-                       FieldElement{19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688},
-               },
-       },
-       {
-               {
-                       FieldElement{12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186},
-                       FieldElement{2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610},
-                       FieldElement{-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707},
-               },
-               {
-                       FieldElement{7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220},
-                       FieldElement{915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025},
-                       FieldElement{32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044},
-               },
-               {
-                       FieldElement{32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992},
-                       FieldElement{-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027},
-                       FieldElement{21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197},
-               },
-               {
-                       FieldElement{8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901},
-                       FieldElement{31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952},
-                       FieldElement{19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878},
-               },
-               {
-                       FieldElement{-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390},
-                       FieldElement{32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730},
-                       FieldElement{2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730},
-               },
-               {
-                       FieldElement{-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180},
-                       FieldElement{-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272},
-                       FieldElement{-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715},
-               },
-               {
-                       FieldElement{-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970},
-                       FieldElement{-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772},
-                       FieldElement{-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865},
-               },
-               {
-                       FieldElement{15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750},
-                       FieldElement{20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373},
-                       FieldElement{32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348},
-               },
-       },
-       {
-               {
-                       FieldElement{9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144},
-                       FieldElement{-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195},
-                       FieldElement{5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086},
-               },
-               {
-                       FieldElement{-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684},
-                       FieldElement{-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518},
-                       FieldElement{-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233},
-               },
-               {
-                       FieldElement{-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793},
-                       FieldElement{-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794},
-                       FieldElement{580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435},
-               },
-               {
-                       FieldElement{23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921},
-                       FieldElement{13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518},
-                       FieldElement{2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563},
-               },
-               {
-                       FieldElement{14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278},
-                       FieldElement{-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024},
-                       FieldElement{4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030},
-               },
-               {
-                       FieldElement{10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783},
-                       FieldElement{27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717},
-                       FieldElement{6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844},
-               },
-               {
-                       FieldElement{14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333},
-                       FieldElement{16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048},
-                       FieldElement{22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760},
-               },
-               {
-                       FieldElement{-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760},
-                       FieldElement{-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757},
-                       FieldElement{-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112},
-               },
-       },
-       {
-               {
-                       FieldElement{-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468},
-                       FieldElement{3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184},
-                       FieldElement{10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289},
-               },
-               {
-                       FieldElement{15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066},
-                       FieldElement{24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882},
-                       FieldElement{13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226},
-               },
-               {
-                       FieldElement{16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101},
-                       FieldElement{29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279},
-                       FieldElement{-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811},
-               },
-               {
-                       FieldElement{27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709},
-                       FieldElement{20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714},
-                       FieldElement{-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121},
-               },
-               {
-                       FieldElement{9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464},
-                       FieldElement{12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847},
-                       FieldElement{13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400},
-               },
-               {
-                       FieldElement{4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414},
-                       FieldElement{-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158},
-                       FieldElement{17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045},
-               },
-               {
-                       FieldElement{-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415},
-                       FieldElement{-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459},
-                       FieldElement{-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079},
-               },
-               {
-                       FieldElement{21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412},
-                       FieldElement{-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743},
-                       FieldElement{-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836},
-               },
-       },
-       {
-               {
-                       FieldElement{12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022},
-                       FieldElement{18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429},
-                       FieldElement{-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065},
-               },
-               {
-                       FieldElement{30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861},
-                       FieldElement{10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000},
-                       FieldElement{-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101},
-               },
-               {
-                       FieldElement{32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815},
-                       FieldElement{29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642},
-                       FieldElement{10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966},
-               },
-               {
-                       FieldElement{25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574},
-                       FieldElement{-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742},
-                       FieldElement{-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689},
-               },
-               {
-                       FieldElement{12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020},
-                       FieldElement{-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772},
-                       FieldElement{3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982},
-               },
-               {
-                       FieldElement{-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953},
-                       FieldElement{-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218},
-                       FieldElement{-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265},
-               },
-               {
-                       FieldElement{29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073},
-                       FieldElement{-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325},
-                       FieldElement{-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798},
-               },
-               {
-                       FieldElement{-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870},
-                       FieldElement{-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863},
-                       FieldElement{-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927},
-               },
-       },
-       {
-               {
-                       FieldElement{-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267},
-                       FieldElement{-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663},
-                       FieldElement{22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862},
-               },
-               {
-                       FieldElement{-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673},
-                       FieldElement{15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943},
-                       FieldElement{15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020},
-               },
-               {
-                       FieldElement{-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238},
-                       FieldElement{11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064},
-                       FieldElement{14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795},
-               },
-               {
-                       FieldElement{15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052},
-                       FieldElement{-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904},
-                       FieldElement{29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531},
-               },
-               {
-                       FieldElement{-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979},
-                       FieldElement{-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841},
-                       FieldElement{10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431},
-               },
-               {
-                       FieldElement{10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324},
-                       FieldElement{-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940},
-                       FieldElement{10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320},
-               },
-               {
-                       FieldElement{-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184},
-                       FieldElement{14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114},
-                       FieldElement{30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878},
-               },
-               {
-                       FieldElement{12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784},
-                       FieldElement{-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091},
-                       FieldElement{-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585},
-               },
-       },
-       {
-               {
-                       FieldElement{-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208},
-                       FieldElement{10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864},
-                       FieldElement{17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661},
-               },
-               {
-                       FieldElement{7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233},
-                       FieldElement{26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212},
-                       FieldElement{-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525},
-               },
-               {
-                       FieldElement{-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068},
-                       FieldElement{9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397},
-                       FieldElement{-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988},
-               },
-               {
-                       FieldElement{5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889},
-                       FieldElement{32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038},
-                       FieldElement{14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697},
-               },
-               {
-                       FieldElement{20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875},
-                       FieldElement{-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905},
-                       FieldElement{-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656},
-               },
-               {
-                       FieldElement{11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818},
-                       FieldElement{27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714},
-                       FieldElement{10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203},
-               },
-               {
-                       FieldElement{20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931},
-                       FieldElement{-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024},
-                       FieldElement{-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084},
-               },
-               {
-                       FieldElement{-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204},
-                       FieldElement{20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817},
-                       FieldElement{27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667},
-               },
-       },
-       {
-               {
-                       FieldElement{11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504},
-                       FieldElement{-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768},
-                       FieldElement{-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255},
-               },
-               {
-                       FieldElement{6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790},
-                       FieldElement{1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438},
-                       FieldElement{-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333},
-               },
-               {
-                       FieldElement{17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971},
-                       FieldElement{31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905},
-                       FieldElement{29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409},
-               },
-               {
-                       FieldElement{12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409},
-                       FieldElement{6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499},
-                       FieldElement{-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363},
-               },
-               {
-                       FieldElement{28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664},
-                       FieldElement{-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324},
-                       FieldElement{-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940},
-               },
-               {
-                       FieldElement{13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990},
-                       FieldElement{-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914},
-                       FieldElement{-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290},
-               },
-               {
-                       FieldElement{24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257},
-                       FieldElement{-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433},
-                       FieldElement{-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236},
-               },
-               {
-                       FieldElement{-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045},
-                       FieldElement{11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093},
-                       FieldElement{-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347},
-               },
-       },
-       {
-               {
-                       FieldElement{-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191},
-                       FieldElement{-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507},
-                       FieldElement{-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906},
-               },
-               {
-                       FieldElement{3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018},
-                       FieldElement{-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109},
-                       FieldElement{-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926},
-               },
-               {
-                       FieldElement{-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528},
-                       FieldElement{8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625},
-                       FieldElement{-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286},
-               },
-               {
-                       FieldElement{2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033},
-                       FieldElement{27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866},
-                       FieldElement{21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896},
-               },
-               {
-                       FieldElement{30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075},
-                       FieldElement{26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347},
-                       FieldElement{-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437},
-               },
-               {
-                       FieldElement{-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165},
-                       FieldElement{-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588},
-                       FieldElement{-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193},
-               },
-               {
-                       FieldElement{-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017},
-                       FieldElement{-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883},
-                       FieldElement{21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961},
-               },
-               {
-                       FieldElement{8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043},
-                       FieldElement{29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663},
-                       FieldElement{-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362},
-               },
-       },
-       {
-               {
-                       FieldElement{-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860},
-                       FieldElement{2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466},
-                       FieldElement{-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063},
-               },
-               {
-                       FieldElement{-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997},
-                       FieldElement{-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295},
-                       FieldElement{-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369},
-               },
-               {
-                       FieldElement{9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385},
-                       FieldElement{18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109},
-                       FieldElement{2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906},
-               },
-               {
-                       FieldElement{4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424},
-                       FieldElement{-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185},
-                       FieldElement{7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962},
-               },
-               {
-                       FieldElement{-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325},
-                       FieldElement{10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593},
-                       FieldElement{696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404},
-               },
-               {
-                       FieldElement{-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644},
-                       FieldElement{17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801},
-                       FieldElement{26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804},
-               },
-               {
-                       FieldElement{-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884},
-                       FieldElement{-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577},
-                       FieldElement{-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849},
-               },
-               {
-                       FieldElement{32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473},
-                       FieldElement{-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644},
-                       FieldElement{-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319},
-               },
-       },
-       {
-               {
-                       FieldElement{-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599},
-                       FieldElement{-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768},
-                       FieldElement{-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084},
-               },
-               {
-                       FieldElement{-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328},
-                       FieldElement{-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369},
-                       FieldElement{20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920},
-               },
-               {
-                       FieldElement{12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815},
-                       FieldElement{-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025},
-                       FieldElement{-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397},
-               },
-               {
-                       FieldElement{-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448},
-                       FieldElement{6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981},
-                       FieldElement{30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165},
-               },
-               {
-                       FieldElement{32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501},
-                       FieldElement{17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073},
-                       FieldElement{-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861},
-               },
-               {
-                       FieldElement{14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845},
-                       FieldElement{-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211},
-                       FieldElement{18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870},
-               },
-               {
-                       FieldElement{10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096},
-                       FieldElement{33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803},
-                       FieldElement{-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168},
-               },
-               {
-                       FieldElement{30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965},
-                       FieldElement{-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505},
-                       FieldElement{18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598},
-               },
-       },
-       {
-               {
-                       FieldElement{5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782},
-                       FieldElement{5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900},
-                       FieldElement{-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479},
-               },
-               {
-                       FieldElement{-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208},
-                       FieldElement{8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232},
-                       FieldElement{17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719},
-               },
-               {
-                       FieldElement{16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271},
-                       FieldElement{-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326},
-                       FieldElement{-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132},
-               },
-               {
-                       FieldElement{14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300},
-                       FieldElement{8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570},
-                       FieldElement{15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670},
-               },
-               {
-                       FieldElement{-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994},
-                       FieldElement{-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913},
-                       FieldElement{31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317},
-               },
-               {
-                       FieldElement{-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730},
-                       FieldElement{842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096},
-                       FieldElement{-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078},
-               },
-               {
-                       FieldElement{-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411},
-                       FieldElement{-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905},
-                       FieldElement{-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654},
-               },
-               {
-                       FieldElement{-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870},
-                       FieldElement{-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498},
-                       FieldElement{12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579},
-               },
-       },
-       {
-               {
-                       FieldElement{14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677},
-                       FieldElement{10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647},
-                       FieldElement{-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743},
-               },
-               {
-                       FieldElement{-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468},
-                       FieldElement{21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375},
-                       FieldElement{-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155},
-               },
-               {
-                       FieldElement{6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725},
-                       FieldElement{-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612},
-                       FieldElement{-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943},
-               },
-               {
-                       FieldElement{-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944},
-                       FieldElement{30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928},
-                       FieldElement{9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406},
-               },
-               {
-                       FieldElement{22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139},
-                       FieldElement{-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963},
-                       FieldElement{-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693},
-               },
-               {
-                       FieldElement{1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734},
-                       FieldElement{-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680},
-                       FieldElement{-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410},
-               },
-               {
-                       FieldElement{-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931},
-                       FieldElement{-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654},
-                       FieldElement{22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710},
-               },
-               {
-                       FieldElement{29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180},
-                       FieldElement{-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684},
-                       FieldElement{-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895},
-               },
-       },
-       {
-               {
-                       FieldElement{22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501},
-                       FieldElement{-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413},
-                       FieldElement{6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880},
-               },
-               {
-                       FieldElement{-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874},
-                       FieldElement{22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962},
-                       FieldElement{-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899},
-               },
-               {
-                       FieldElement{21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152},
-                       FieldElement{9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063},
-                       FieldElement{7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080},
-               },
-               {
-                       FieldElement{-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146},
-                       FieldElement{-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183},
-                       FieldElement{-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133},
-               },
-               {
-                       FieldElement{-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421},
-                       FieldElement{-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622},
-                       FieldElement{-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197},
-               },
-               {
-                       FieldElement{2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663},
-                       FieldElement{31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753},
-                       FieldElement{4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755},
-               },
-               {
-                       FieldElement{-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862},
-                       FieldElement{-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118},
-                       FieldElement{26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171},
-               },
-               {
-                       FieldElement{15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380},
-                       FieldElement{16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824},
-                       FieldElement{28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270},
-               },
-       },
-       {
-               {
-                       FieldElement{-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438},
-                       FieldElement{-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584},
-                       FieldElement{-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562},
-               },
-               {
-                       FieldElement{30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471},
-                       FieldElement{18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610},
-                       FieldElement{19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269},
-               },
-               {
-                       FieldElement{-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650},
-                       FieldElement{14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369},
-                       FieldElement{19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461},
-               },
-               {
-                       FieldElement{30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462},
-                       FieldElement{-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793},
-                       FieldElement{-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218},
-               },
-               {
-                       FieldElement{-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226},
-                       FieldElement{18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019},
-                       FieldElement{-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037},
-               },
-               {
-                       FieldElement{31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171},
-                       FieldElement{-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132},
-                       FieldElement{-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841},
-               },
-               {
-                       FieldElement{21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181},
-                       FieldElement{-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210},
-                       FieldElement{-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040},
-               },
-               {
-                       FieldElement{3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935},
-                       FieldElement{24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105},
-                       FieldElement{-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814},
-               },
-       },
-       {
-               {
-                       FieldElement{793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852},
-                       FieldElement{5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581},
-                       FieldElement{-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646},
-               },
-               {
-                       FieldElement{10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844},
-                       FieldElement{10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025},
-                       FieldElement{27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453},
-               },
-               {
-                       FieldElement{-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068},
-                       FieldElement{4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192},
-                       FieldElement{-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921},
-               },
-               {
-                       FieldElement{-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259},
-                       FieldElement{-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426},
-                       FieldElement{-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072},
-               },
-               {
-                       FieldElement{-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305},
-                       FieldElement{13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832},
-                       FieldElement{28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943},
-               },
-               {
-                       FieldElement{-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011},
-                       FieldElement{24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447},
-                       FieldElement{17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494},
-               },
-               {
-                       FieldElement{-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245},
-                       FieldElement{-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859},
-                       FieldElement{28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915},
-               },
-               {
-                       FieldElement{16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707},
-                       FieldElement{10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848},
-                       FieldElement{-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224},
-               },
-       },
-       {
-               {
-                       FieldElement{-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391},
-                       FieldElement{15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215},
-                       FieldElement{-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101},
-               },
-               {
-                       FieldElement{23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713},
-                       FieldElement{21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849},
-                       FieldElement{-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930},
-               },
-               {
-                       FieldElement{-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940},
-                       FieldElement{-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031},
-                       FieldElement{-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404},
-               },
-               {
-                       FieldElement{-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243},
-                       FieldElement{-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116},
-                       FieldElement{-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525},
-               },
-               {
-                       FieldElement{-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509},
-                       FieldElement{-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883},
-                       FieldElement{15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865},
-               },
-               {
-                       FieldElement{-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660},
-                       FieldElement{4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273},
-                       FieldElement{-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138},
-               },
-               {
-                       FieldElement{-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560},
-                       FieldElement{-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135},
-                       FieldElement{2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941},
-               },
-               {
-                       FieldElement{-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739},
-                       FieldElement{18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756},
-                       FieldElement{-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819},
-               },
-       },
-       {
-               {
-                       FieldElement{-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347},
-                       FieldElement{-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028},
-                       FieldElement{21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075},
-               },
-               {
-                       FieldElement{16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799},
-                       FieldElement{-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609},
-                       FieldElement{-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817},
-               },
-               {
-                       FieldElement{-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989},
-                       FieldElement{-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523},
-                       FieldElement{4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278},
-               },
-               {
-                       FieldElement{31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045},
-                       FieldElement{19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377},
-                       FieldElement{24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480},
-               },
-               {
-                       FieldElement{17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016},
-                       FieldElement{510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426},
-                       FieldElement{18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525},
-               },
-               {
-                       FieldElement{13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396},
-                       FieldElement{9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080},
-                       FieldElement{12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892},
-               },
-               {
-                       FieldElement{15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275},
-                       FieldElement{11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074},
-                       FieldElement{20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140},
-               },
-               {
-                       FieldElement{-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717},
-                       FieldElement{-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101},
-                       FieldElement{24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127},
-               },
-       },
-       {
-               {
-                       FieldElement{-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632},
-                       FieldElement{-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415},
-                       FieldElement{-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160},
-               },
-               {
-                       FieldElement{31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876},
-                       FieldElement{22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625},
-                       FieldElement{-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478},
-               },
-               {
-                       FieldElement{27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164},
-                       FieldElement{26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595},
-                       FieldElement{-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248},
-               },
-               {
-                       FieldElement{-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858},
-                       FieldElement{15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193},
-                       FieldElement{8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184},
-               },
-               {
-                       FieldElement{-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942},
-                       FieldElement{-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635},
-                       FieldElement{21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948},
-               },
-               {
-                       FieldElement{11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935},
-                       FieldElement{-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415},
-                       FieldElement{-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416},
-               },
-               {
-                       FieldElement{-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018},
-                       FieldElement{4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778},
-                       FieldElement{366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659},
-               },
-               {
-                       FieldElement{-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385},
-                       FieldElement{18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503},
-                       FieldElement{476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329},
-               },
-       },
-       {
-               {
-                       FieldElement{20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056},
-                       FieldElement{-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838},
-                       FieldElement{24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948},
-               },
-               {
-                       FieldElement{-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691},
-                       FieldElement{-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118},
-                       FieldElement{-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517},
-               },
-               {
-                       FieldElement{-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269},
-                       FieldElement{-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904},
-                       FieldElement{-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589},
-               },
-               {
-                       FieldElement{-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193},
-                       FieldElement{-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910},
-                       FieldElement{-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930},
-               },
-               {
-                       FieldElement{-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667},
-                       FieldElement{25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481},
-                       FieldElement{-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876},
-               },
-               {
-                       FieldElement{22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640},
-                       FieldElement{-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278},
-                       FieldElement{-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112},
-               },
-               {
-                       FieldElement{26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272},
-                       FieldElement{17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012},
-                       FieldElement{-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221},
-               },
-               {
-                       FieldElement{30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046},
-                       FieldElement{13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345},
-                       FieldElement{-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310},
-               },
-       },
-       {
-               {
-                       FieldElement{19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937},
-                       FieldElement{31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636},
-                       FieldElement{-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008},
-               },
-               {
-                       FieldElement{-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429},
-                       FieldElement{-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576},
-                       FieldElement{31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066},
-               },
-               {
-                       FieldElement{-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490},
-                       FieldElement{-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104},
-                       FieldElement{33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053},
-               },
-               {
-                       FieldElement{31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275},
-                       FieldElement{-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511},
-                       FieldElement{22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095},
-               },
-               {
-                       FieldElement{-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439},
-                       FieldElement{23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939},
-                       FieldElement{-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424},
-               },
-               {
-                       FieldElement{2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310},
-                       FieldElement{3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608},
-                       FieldElement{-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079},
-               },
-               {
-                       FieldElement{-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101},
-                       FieldElement{21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418},
-                       FieldElement{18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576},
-               },
-               {
-                       FieldElement{30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356},
-                       FieldElement{9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996},
-                       FieldElement{-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099},
-               },
-       },
-       {
-               {
-                       FieldElement{-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728},
-                       FieldElement{-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658},
-                       FieldElement{-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242},
-               },
-               {
-                       FieldElement{-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001},
-                       FieldElement{-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766},
-                       FieldElement{18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373},
-               },
-               {
-                       FieldElement{26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458},
-                       FieldElement{-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628},
-                       FieldElement{-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657},
-               },
-               {
-                       FieldElement{-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062},
-                       FieldElement{25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616},
-                       FieldElement{31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014},
-               },
-               {
-                       FieldElement{24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383},
-                       FieldElement{-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814},
-                       FieldElement{-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718},
-               },
-               {
-                       FieldElement{30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417},
-                       FieldElement{2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222},
-                       FieldElement{33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444},
-               },
-               {
-                       FieldElement{-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597},
-                       FieldElement{23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970},
-                       FieldElement{1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799},
-               },
-               {
-                       FieldElement{-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647},
-                       FieldElement{13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511},
-                       FieldElement{-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032},
-               },
-       },
-       {
-               {
-                       FieldElement{9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834},
-                       FieldElement{-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461},
-                       FieldElement{29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062},
-               },
-               {
-                       FieldElement{-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516},
-                       FieldElement{-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547},
-                       FieldElement{-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240},
-               },
-               {
-                       FieldElement{-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038},
-                       FieldElement{-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741},
-                       FieldElement{16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103},
-               },
-               {
-                       FieldElement{-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747},
-                       FieldElement{-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323},
-                       FieldElement{31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016},
-               },
-               {
-                       FieldElement{-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373},
-                       FieldElement{15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228},
-                       FieldElement{-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141},
-               },
-               {
-                       FieldElement{16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399},
-                       FieldElement{11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831},
-                       FieldElement{-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376},
-               },
-               {
-                       FieldElement{-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313},
-                       FieldElement{-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958},
-                       FieldElement{-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577},
-               },
-               {
-                       FieldElement{-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743},
-                       FieldElement{29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684},
-                       FieldElement{-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476},
-               },
-       },
-}

diff --git a/vendor/github.com/tendermint/ed25519/edwards25519/edwards25519.go b/vendor/github.com/tendermint/ed25519/edwards25519/edwards25519.go
deleted file mode 100644 (file)
index 9079818..0000000
--- a/vendor/github.com/tendermint/ed25519/edwards25519/edwards25519.go
+++ /dev/null
@@ -1,1773 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package edwards25519 implements operations in GF(2**255-19) and on an
-// Edwards curve that is isomorphic to curve25519. See
-// http://ed25519.cr.yp.to/.
-package edwards25519
-
-// This code is a port of the public domain, "ref10" implementation of ed25519
-// from SUPERCOP.
-
-// FieldElement represents an element of the field GF(2^255 - 19).  An element
-// t, entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
-// t[3]+2^102 t[4]+...+2^230 t[9].  Bounds on each t[i] vary depending on
-// context.
-type FieldElement [10]int32
-
-var zero FieldElement
-
-func FeZero(fe *FieldElement) {
-       copy(fe[:], zero[:])
-}
-
-func FeOne(fe *FieldElement) {
-       FeZero(fe)
-       fe[0] = 1
-}
-
-func FeAdd(dst, a, b *FieldElement) {
-       dst[0] = a[0] + b[0]
-       dst[1] = a[1] + b[1]
-       dst[2] = a[2] + b[2]
-       dst[3] = a[3] + b[3]
-       dst[4] = a[4] + b[4]
-       dst[5] = a[5] + b[5]
-       dst[6] = a[6] + b[6]
-       dst[7] = a[7] + b[7]
-       dst[8] = a[8] + b[8]
-       dst[9] = a[9] + b[9]
-}
-
-func FeSub(dst, a, b *FieldElement) {
-       dst[0] = a[0] - b[0]
-       dst[1] = a[1] - b[1]
-       dst[2] = a[2] - b[2]
-       dst[3] = a[3] - b[3]
-       dst[4] = a[4] - b[4]
-       dst[5] = a[5] - b[5]
-       dst[6] = a[6] - b[6]
-       dst[7] = a[7] - b[7]
-       dst[8] = a[8] - b[8]
-       dst[9] = a[9] - b[9]
-}
-
-func FeCopy(dst, src *FieldElement) {
-       copy(dst[:], src[:])
-}
-
-// Replace (f,g) with (g,g) if b == 1;
-// replace (f,g) with (f,g) if b == 0.
-//
-// Preconditions: b in {0,1}.
-func FeCMove(f, g *FieldElement, b int32) {
-       b = -b
-       f[0] ^= b & (f[0] ^ g[0])
-       f[1] ^= b & (f[1] ^ g[1])
-       f[2] ^= b & (f[2] ^ g[2])
-       f[3] ^= b & (f[3] ^ g[3])
-       f[4] ^= b & (f[4] ^ g[4])
-       f[5] ^= b & (f[5] ^ g[5])
-       f[6] ^= b & (f[6] ^ g[6])
-       f[7] ^= b & (f[7] ^ g[7])
-       f[8] ^= b & (f[8] ^ g[8])
-       f[9] ^= b & (f[9] ^ g[9])
-}
-
-func load3(in []byte) int64 {
-       var r int64
-       r = int64(in[0])
-       r |= int64(in[1]) << 8
-       r |= int64(in[2]) << 16
-       return r
-}
-
-func load4(in []byte) int64 {
-       var r int64
-       r = int64(in[0])
-       r |= int64(in[1]) << 8
-       r |= int64(in[2]) << 16
-       r |= int64(in[3]) << 24
-       return r
-}
-
-func FeFromBytes(dst *FieldElement, src *[32]byte) {
-       h0 := load4(src[:])
-       h1 := load3(src[4:]) << 6
-       h2 := load3(src[7:]) << 5
-       h3 := load3(src[10:]) << 3
-       h4 := load3(src[13:]) << 2
-       h5 := load4(src[16:])
-       h6 := load3(src[20:]) << 7
-       h7 := load3(src[23:]) << 5
-       h8 := load3(src[26:]) << 4
-       h9 := (load3(src[29:]) & 8388607) << 2
-
-       FeCombine(dst, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-// FeToBytes marshals h to s.
-// Preconditions:
-//   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Write p=2^255-19; q=floor(h/p).
-// Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
-//
-// Proof:
-//   Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
-//   Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4.
-//
-//   Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
-//   Then 0<y<1.
-//
-//   Write r=h-pq.
-//   Have 0<=r<=p-1=2^255-20.
-//   Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
-//
-//   Write x=r+19(2^-255)r+y.
-//   Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
-//
-//   Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
-//   so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
-func FeToBytes(s *[32]byte, h *FieldElement) {
-       var carry [10]int32
-
-       q := (19*h[9] + (1 << 24)) >> 25
-       q = (h[0] + q) >> 26
-       q = (h[1] + q) >> 25
-       q = (h[2] + q) >> 26
-       q = (h[3] + q) >> 25
-       q = (h[4] + q) >> 26
-       q = (h[5] + q) >> 25
-       q = (h[6] + q) >> 26
-       q = (h[7] + q) >> 25
-       q = (h[8] + q) >> 26
-       q = (h[9] + q) >> 25
-
-       // Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20.
-       h[0] += 19 * q
-       // Goal: Output h-2^255 q, which is between 0 and 2^255-20.
-
-       carry[0] = h[0] >> 26
-       h[1] += carry[0]
-       h[0] -= carry[0] << 26
-       carry[1] = h[1] >> 25
-       h[2] += carry[1]
-       h[1] -= carry[1] << 25
-       carry[2] = h[2] >> 26
-       h[3] += carry[2]
-       h[2] -= carry[2] << 26
-       carry[3] = h[3] >> 25
-       h[4] += carry[3]
-       h[3] -= carry[3] << 25
-       carry[4] = h[4] >> 26
-       h[5] += carry[4]
-       h[4] -= carry[4] << 26
-       carry[5] = h[5] >> 25
-       h[6] += carry[5]
-       h[5] -= carry[5] << 25
-       carry[6] = h[6] >> 26
-       h[7] += carry[6]
-       h[6] -= carry[6] << 26
-       carry[7] = h[7] >> 25
-       h[8] += carry[7]
-       h[7] -= carry[7] << 25
-       carry[8] = h[8] >> 26
-       h[9] += carry[8]
-       h[8] -= carry[8] << 26
-       carry[9] = h[9] >> 25
-       h[9] -= carry[9] << 25
-       // h10 = carry9
-
-       // Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
-       // Have h[0]+...+2^230 h[9] between 0 and 2^255-1;
-       // evidently 2^255 h10-2^255 q = 0.
-       // Goal: Output h[0]+...+2^230 h[9].
-
-       s[0] = byte(h[0] >> 0)
-       s[1] = byte(h[0] >> 8)
-       s[2] = byte(h[0] >> 16)
-       s[3] = byte((h[0] >> 24) | (h[1] << 2))
-       s[4] = byte(h[1] >> 6)
-       s[5] = byte(h[1] >> 14)
-       s[6] = byte((h[1] >> 22) | (h[2] << 3))
-       s[7] = byte(h[2] >> 5)
-       s[8] = byte(h[2] >> 13)
-       s[9] = byte((h[2] >> 21) | (h[3] << 5))
-       s[10] = byte(h[3] >> 3)
-       s[11] = byte(h[3] >> 11)
-       s[12] = byte((h[3] >> 19) | (h[4] << 6))
-       s[13] = byte(h[4] >> 2)
-       s[14] = byte(h[4] >> 10)
-       s[15] = byte(h[4] >> 18)
-       s[16] = byte(h[5] >> 0)
-       s[17] = byte(h[5] >> 8)
-       s[18] = byte(h[5] >> 16)
-       s[19] = byte((h[5] >> 24) | (h[6] << 1))
-       s[20] = byte(h[6] >> 7)
-       s[21] = byte(h[6] >> 15)
-       s[22] = byte((h[6] >> 23) | (h[7] << 3))
-       s[23] = byte(h[7] >> 5)
-       s[24] = byte(h[7] >> 13)
-       s[25] = byte((h[7] >> 21) | (h[8] << 4))
-       s[26] = byte(h[8] >> 4)
-       s[27] = byte(h[8] >> 12)
-       s[28] = byte((h[8] >> 20) | (h[9] << 6))
-       s[29] = byte(h[9] >> 2)
-       s[30] = byte(h[9] >> 10)
-       s[31] = byte(h[9] >> 18)
-}
-
-func FeIsNegative(f *FieldElement) byte {
-       var s [32]byte
-       FeToBytes(&s, f)
-       return s[0] & 1
-}
-
-func FeIsNonZero(f *FieldElement) int32 {
-       var s [32]byte
-       FeToBytes(&s, f)
-       var x uint8
-       for _, b := range s {
-               x |= b
-       }
-       x |= x >> 4
-       x |= x >> 2
-       x |= x >> 1
-       return int32(x & 1)
-}
-
-// FeNeg sets h = -f
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func FeNeg(h, f *FieldElement) {
-       h[0] = -f[0]
-       h[1] = -f[1]
-       h[2] = -f[2]
-       h[3] = -f[3]
-       h[4] = -f[4]
-       h[5] = -f[5]
-       h[6] = -f[6]
-       h[7] = -f[7]
-       h[8] = -f[8]
-       h[9] = -f[9]
-}
-
-func FeCombine(h *FieldElement, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
-       var c0, c1, c2, c3, c4, c5, c6, c7, c8, c9 int64
-
-       /*
-         |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38))
-           i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8
-         |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19))
-           i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9
-       */
-
-       c0 = (h0 + (1 << 25)) >> 26
-       h1 += c0
-       h0 -= c0 << 26
-       c4 = (h4 + (1 << 25)) >> 26
-       h5 += c4
-       h4 -= c4 << 26
-       /* |h0| <= 2^25 */
-       /* |h4| <= 2^25 */
-       /* |h1| <= 1.51*2^58 */
-       /* |h5| <= 1.51*2^58 */
-
-       c1 = (h1 + (1 << 24)) >> 25
-       h2 += c1
-       h1 -= c1 << 25
-       c5 = (h5 + (1 << 24)) >> 25
-       h6 += c5
-       h5 -= c5 << 25
-       /* |h1| <= 2^24; from now on fits into int32 */
-       /* |h5| <= 2^24; from now on fits into int32 */
-       /* |h2| <= 1.21*2^59 */
-       /* |h6| <= 1.21*2^59 */
-
-       c2 = (h2 + (1 << 25)) >> 26
-       h3 += c2
-       h2 -= c2 << 26
-       c6 = (h6 + (1 << 25)) >> 26
-       h7 += c6
-       h6 -= c6 << 26
-       /* |h2| <= 2^25; from now on fits into int32 unchanged */
-       /* |h6| <= 2^25; from now on fits into int32 unchanged */
-       /* |h3| <= 1.51*2^58 */
-       /* |h7| <= 1.51*2^58 */
-
-       c3 = (h3 + (1 << 24)) >> 25
-       h4 += c3
-       h3 -= c3 << 25
-       c7 = (h7 + (1 << 24)) >> 25
-       h8 += c7
-       h7 -= c7 << 25
-       /* |h3| <= 2^24; from now on fits into int32 unchanged */
-       /* |h7| <= 2^24; from now on fits into int32 unchanged */
-       /* |h4| <= 1.52*2^33 */
-       /* |h8| <= 1.52*2^33 */
-
-       c4 = (h4 + (1 << 25)) >> 26
-       h5 += c4
-       h4 -= c4 << 26
-       c8 = (h8 + (1 << 25)) >> 26
-       h9 += c8
-       h8 -= c8 << 26
-       /* |h4| <= 2^25; from now on fits into int32 unchanged */
-       /* |h8| <= 2^25; from now on fits into int32 unchanged */
-       /* |h5| <= 1.01*2^24 */
-       /* |h9| <= 1.51*2^58 */
-
-       c9 = (h9 + (1 << 24)) >> 25
-       h0 += c9 * 19
-       h9 -= c9 << 25
-       /* |h9| <= 2^24; from now on fits into int32 unchanged */
-       /* |h0| <= 1.8*2^37 */
-
-       c0 = (h0 + (1 << 25)) >> 26
-       h1 += c0
-       h0 -= c0 << 26
-       /* |h0| <= 2^25; from now on fits into int32 unchanged */
-       /* |h1| <= 1.01*2^24 */
-
-       h[0] = int32(h0)
-       h[1] = int32(h1)
-       h[2] = int32(h2)
-       h[3] = int32(h3)
-       h[4] = int32(h4)
-       h[5] = int32(h5)
-       h[6] = int32(h6)
-       h[7] = int32(h7)
-       h[8] = int32(h8)
-       h[9] = int32(h9)
-}
-
-// FeMul calculates h = f * g
-// Can overlap h with f or g.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//    |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Notes on implementation strategy:
-//
-// Using schoolbook multiplication.
-// Karatsuba would save a little in some cost models.
-//
-// Most multiplications by 2 and 19 are 32-bit precomputations;
-// cheaper than 64-bit postcomputations.
-//
-// There is one remaining multiplication by 19 in the carry chain;
-// one *19 precomputation can be merged into this,
-// but the resulting data flow is considerably less clean.
-//
-// There are 12 carries below.
-// 10 of them are 2-way parallelizable and vectorizable.
-// Can get away with 11 carries, but then data flow is much deeper.
-//
-// With tighter constraints on inputs can squeeze carries into int32.
-func FeMul(h, f, g *FieldElement) {
-       f0 := int64(f[0])
-       f1 := int64(f[1])
-       f2 := int64(f[2])
-       f3 := int64(f[3])
-       f4 := int64(f[4])
-       f5 := int64(f[5])
-       f6 := int64(f[6])
-       f7 := int64(f[7])
-       f8 := int64(f[8])
-       f9 := int64(f[9])
-
-       f1_2 := int64(2 * f[1])
-       f3_2 := int64(2 * f[3])
-       f5_2 := int64(2 * f[5])
-       f7_2 := int64(2 * f[7])
-       f9_2 := int64(2 * f[9])
-
-       g0 := int64(g[0])
-       g1 := int64(g[1])
-       g2 := int64(g[2])
-       g3 := int64(g[3])
-       g4 := int64(g[4])
-       g5 := int64(g[5])
-       g6 := int64(g[6])
-       g7 := int64(g[7])
-       g8 := int64(g[8])
-       g9 := int64(g[9])
-
-       g1_19 := int64(19 * g[1]) /* 1.4*2^29 */
-       g2_19 := int64(19 * g[2]) /* 1.4*2^30; still ok */
-       g3_19 := int64(19 * g[3])
-       g4_19 := int64(19 * g[4])
-       g5_19 := int64(19 * g[5])
-       g6_19 := int64(19 * g[6])
-       g7_19 := int64(19 * g[7])
-       g8_19 := int64(19 * g[8])
-       g9_19 := int64(19 * g[9])
-
-       h0 := f0*g0 + f1_2*g9_19 + f2*g8_19 + f3_2*g7_19 + f4*g6_19 + f5_2*g5_19 + f6*g4_19 + f7_2*g3_19 + f8*g2_19 + f9_2*g1_19
-       h1 := f0*g1 + f1*g0 + f2*g9_19 + f3*g8_19 + f4*g7_19 + f5*g6_19 + f6*g5_19 + f7*g4_19 + f8*g3_19 + f9*g2_19
-       h2 := f0*g2 + f1_2*g1 + f2*g0 + f3_2*g9_19 + f4*g8_19 + f5_2*g7_19 + f6*g6_19 + f7_2*g5_19 + f8*g4_19 + f9_2*g3_19
-       h3 := f0*g3 + f1*g2 + f2*g1 + f3*g0 + f4*g9_19 + f5*g8_19 + f6*g7_19 + f7*g6_19 + f8*g5_19 + f9*g4_19
-       h4 := f0*g4 + f1_2*g3 + f2*g2 + f3_2*g1 + f4*g0 + f5_2*g9_19 + f6*g8_19 + f7_2*g7_19 + f8*g6_19 + f9_2*g5_19
-       h5 := f0*g5 + f1*g4 + f2*g3 + f3*g2 + f4*g1 + f5*g0 + f6*g9_19 + f7*g8_19 + f8*g7_19 + f9*g6_19
-       h6 := f0*g6 + f1_2*g5 + f2*g4 + f3_2*g3 + f4*g2 + f5_2*g1 + f6*g0 + f7_2*g9_19 + f8*g8_19 + f9_2*g7_19
-       h7 := f0*g7 + f1*g6 + f2*g5 + f3*g4 + f4*g3 + f5*g2 + f6*g1 + f7*g0 + f8*g9_19 + f9*g8_19
-       h8 := f0*g8 + f1_2*g7 + f2*g6 + f3_2*g5 + f4*g4 + f5_2*g3 + f6*g2 + f7_2*g1 + f8*g0 + f9_2*g9_19
-       h9 := f0*g9 + f1*g8 + f2*g7 + f3*g6 + f4*g5 + f5*g4 + f6*g3 + f7*g2 + f8*g1 + f9*g0
-
-       FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-func feSquare(f *FieldElement) (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
-       f0 := int64(f[0])
-       f1 := int64(f[1])
-       f2 := int64(f[2])
-       f3 := int64(f[3])
-       f4 := int64(f[4])
-       f5 := int64(f[5])
-       f6 := int64(f[6])
-       f7 := int64(f[7])
-       f8 := int64(f[8])
-       f9 := int64(f[9])
-       f0_2 := int64(2 * f[0])
-       f1_2 := int64(2 * f[1])
-       f2_2 := int64(2 * f[2])
-       f3_2 := int64(2 * f[3])
-       f4_2 := int64(2 * f[4])
-       f5_2 := int64(2 * f[5])
-       f6_2 := int64(2 * f[6])
-       f7_2 := int64(2 * f[7])
-       f5_38 := 38 * f5 // 1.31*2^30
-       f6_19 := 19 * f6 // 1.31*2^30
-       f7_38 := 38 * f7 // 1.31*2^30
-       f8_19 := 19 * f8 // 1.31*2^30
-       f9_38 := 38 * f9 // 1.31*2^30
-
-       h0 = f0*f0 + f1_2*f9_38 + f2_2*f8_19 + f3_2*f7_38 + f4_2*f6_19 + f5*f5_38
-       h1 = f0_2*f1 + f2*f9_38 + f3_2*f8_19 + f4*f7_38 + f5_2*f6_19
-       h2 = f0_2*f2 + f1_2*f1 + f3_2*f9_38 + f4_2*f8_19 + f5_2*f7_38 + f6*f6_19
-       h3 = f0_2*f3 + f1_2*f2 + f4*f9_38 + f5_2*f8_19 + f6*f7_38
-       h4 = f0_2*f4 + f1_2*f3_2 + f2*f2 + f5_2*f9_38 + f6_2*f8_19 + f7*f7_38
-       h5 = f0_2*f5 + f1_2*f4 + f2_2*f3 + f6*f9_38 + f7_2*f8_19
-       h6 = f0_2*f6 + f1_2*f5_2 + f2_2*f4 + f3_2*f3 + f7_2*f9_38 + f8*f8_19
-       h7 = f0_2*f7 + f1_2*f6 + f2_2*f5 + f3_2*f4 + f8*f9_38
-       h8 = f0_2*f8 + f1_2*f7_2 + f2_2*f6 + f3_2*f5_2 + f4*f4 + f9*f9_38
-       h9 = f0_2*f9 + f1_2*f8 + f2_2*f7 + f3_2*f6 + f4_2*f5
-
-       return
-}
-
-// FeSquare calculates h = f*f. Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func FeSquare(h, f *FieldElement) {
-       h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
-       FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-// FeSquare2 sets h = 2 * f * f
-//
-// Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
-// See fe_mul.c for discussion of implementation strategy.
-func FeSquare2(h, f *FieldElement) {
-       h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
-
-       h0 += h0
-       h1 += h1
-       h2 += h2
-       h3 += h3
-       h4 += h4
-       h5 += h5
-       h6 += h6
-       h7 += h7
-       h8 += h8
-       h9 += h9
-
-       FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-func FeInvert(out, z *FieldElement) {
-       var t0, t1, t2, t3 FieldElement
-       var i int
-
-       FeSquare(&t0, z)        // 2^1
-       FeSquare(&t1, &t0)      // 2^2
-       for i = 1; i < 2; i++ { // 2^3
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t1, z, &t1)      // 2^3 + 2^0
-       FeMul(&t0, &t0, &t1)    // 2^3 + 2^1 + 2^0
-       FeSquare(&t2, &t0)      // 2^4 + 2^2 + 2^1
-       FeMul(&t1, &t1, &t2)    // 2^4 + 2^3 + 2^2 + 2^1 + 2^0
-       FeSquare(&t2, &t1)      // 5,4,3,2,1
-       for i = 1; i < 5; i++ { // 9,8,7,6,5
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t1, &t2, &t1)     // 9,8,7,6,5,4,3,2,1,0
-       FeSquare(&t2, &t1)       // 10..1
-       for i = 1; i < 10; i++ { // 19..10
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t2, &t2, &t1)     // 19..0
-       FeSquare(&t3, &t2)       // 20..1
-       for i = 1; i < 20; i++ { // 39..20
-               FeSquare(&t3, &t3)
-       }
-       FeMul(&t2, &t3, &t2)     // 39..0
-       FeSquare(&t2, &t2)       // 40..1
-       for i = 1; i < 10; i++ { // 49..10
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t1, &t2, &t1)     // 49..0
-       FeSquare(&t2, &t1)       // 50..1
-       for i = 1; i < 50; i++ { // 99..50
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t2, &t2, &t1)      // 99..0
-       FeSquare(&t3, &t2)        // 100..1
-       for i = 1; i < 100; i++ { // 199..100
-               FeSquare(&t3, &t3)
-       }
-       FeMul(&t2, &t3, &t2)     // 199..0
-       FeSquare(&t2, &t2)       // 200..1
-       for i = 1; i < 50; i++ { // 249..50
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t1, &t2, &t1)    // 249..0
-       FeSquare(&t1, &t1)      // 250..1
-       for i = 1; i < 5; i++ { // 254..5
-               FeSquare(&t1, &t1)
-       }
-       FeMul(out, &t1, &t0) // 254..5,3,1,0
-}
-
-func fePow22523(out, z *FieldElement) {
-       var t0, t1, t2 FieldElement
-       var i int
-
-       FeSquare(&t0, z)
-       for i = 1; i < 1; i++ {
-               FeSquare(&t0, &t0)
-       }
-       FeSquare(&t1, &t0)
-       for i = 1; i < 2; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t1, z, &t1)
-       FeMul(&t0, &t0, &t1)
-       FeSquare(&t0, &t0)
-       for i = 1; i < 1; i++ {
-               FeSquare(&t0, &t0)
-       }
-       FeMul(&t0, &t1, &t0)
-       FeSquare(&t1, &t0)
-       for i = 1; i < 5; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t0, &t1, &t0)
-       FeSquare(&t1, &t0)
-       for i = 1; i < 10; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t1, &t1, &t0)
-       FeSquare(&t2, &t1)
-       for i = 1; i < 20; i++ {
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t1, &t2, &t1)
-       FeSquare(&t1, &t1)
-       for i = 1; i < 10; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t0, &t1, &t0)
-       FeSquare(&t1, &t0)
-       for i = 1; i < 50; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t1, &t1, &t0)
-       FeSquare(&t2, &t1)
-       for i = 1; i < 100; i++ {
-               FeSquare(&t2, &t2)
-       }
-       FeMul(&t1, &t2, &t1)
-       FeSquare(&t1, &t1)
-       for i = 1; i < 50; i++ {
-               FeSquare(&t1, &t1)
-       }
-       FeMul(&t0, &t1, &t0)
-       FeSquare(&t0, &t0)
-       for i = 1; i < 2; i++ {
-               FeSquare(&t0, &t0)
-       }
-       FeMul(out, &t0, z)
-}
-
-// Group elements are members of the elliptic curve -x^2 + y^2 = 1 + d * x^2 *
-// y^2 where d = -121665/121666.
-//
-// Several representations are used:
-//   ProjectiveGroupElement: (X:Y:Z) satisfying x=X/Z, y=Y/Z
-//   ExtendedGroupElement: (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
-//   CompletedGroupElement: ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
-//   PreComputedGroupElement: (y+x,y-x,2dxy)
-
-type ProjectiveGroupElement struct {
-       X, Y, Z FieldElement
-}
-
-type ExtendedGroupElement struct {
-       X, Y, Z, T FieldElement
-}
-
-type CompletedGroupElement struct {
-       X, Y, Z, T FieldElement
-}
-
-type PreComputedGroupElement struct {
-       yPlusX, yMinusX, xy2d FieldElement
-}
-
-type CachedGroupElement struct {
-       yPlusX, yMinusX, Z, T2d FieldElement
-}
-
-func (p *ProjectiveGroupElement) Zero() {
-       FeZero(&p.X)
-       FeOne(&p.Y)
-       FeOne(&p.Z)
-}
-
-func (p *ProjectiveGroupElement) Double(r *CompletedGroupElement) {
-       var t0 FieldElement
-
-       FeSquare(&r.X, &p.X)
-       FeSquare(&r.Z, &p.Y)
-       FeSquare2(&r.T, &p.Z)
-       FeAdd(&r.Y, &p.X, &p.Y)
-       FeSquare(&t0, &r.Y)
-       FeAdd(&r.Y, &r.Z, &r.X)
-       FeSub(&r.Z, &r.Z, &r.X)
-       FeSub(&r.X, &t0, &r.Y)
-       FeSub(&r.T, &r.T, &r.Z)
-}
-
-func (p *ProjectiveGroupElement) ToBytes(s *[32]byte) {
-       var recip, x, y FieldElement
-
-       FeInvert(&recip, &p.Z)
-       FeMul(&x, &p.X, &recip)
-       FeMul(&y, &p.Y, &recip)
-       FeToBytes(s, &y)
-       s[31] ^= FeIsNegative(&x) << 7
-}
-
-func (p *ExtendedGroupElement) Zero() {
-       FeZero(&p.X)
-       FeOne(&p.Y)
-       FeOne(&p.Z)
-       FeZero(&p.T)
-}
-
-func (p *ExtendedGroupElement) Double(r *CompletedGroupElement) {
-       var q ProjectiveGroupElement
-       p.ToProjective(&q)
-       q.Double(r)
-}
-
-func (p *ExtendedGroupElement) ToCached(r *CachedGroupElement) {
-       FeAdd(&r.yPlusX, &p.Y, &p.X)
-       FeSub(&r.yMinusX, &p.Y, &p.X)
-       FeCopy(&r.Z, &p.Z)
-       FeMul(&r.T2d, &p.T, &d2)
-}
-
-func (p *ExtendedGroupElement) ToProjective(r *ProjectiveGroupElement) {
-       FeCopy(&r.X, &p.X)
-       FeCopy(&r.Y, &p.Y)
-       FeCopy(&r.Z, &p.Z)
-}
-
-func (p *ExtendedGroupElement) ToBytes(s *[32]byte) {
-       var recip, x, y FieldElement
-
-       FeInvert(&recip, &p.Z)
-       FeMul(&x, &p.X, &recip)
-       FeMul(&y, &p.Y, &recip)
-       FeToBytes(s, &y)
-       s[31] ^= FeIsNegative(&x) << 7
-}
-
-func (p *ExtendedGroupElement) FromBytes(s *[32]byte) bool {
-       var u, v, v3, vxx, check FieldElement
-
-       FeFromBytes(&p.Y, s)
-       FeOne(&p.Z)
-       FeSquare(&u, &p.Y)
-       FeMul(&v, &u, &d)
-       FeSub(&u, &u, &p.Z) // y = y^2-1
-       FeAdd(&v, &v, &p.Z) // v = dy^2+1
-
-       FeSquare(&v3, &v)
-       FeMul(&v3, &v3, &v) // v3 = v^3
-       FeSquare(&p.X, &v3)
-       FeMul(&p.X, &p.X, &v)
-       FeMul(&p.X, &p.X, &u) // x = uv^7
-
-       fePow22523(&p.X, &p.X) // x = (uv^7)^((q-5)/8)
-       FeMul(&p.X, &p.X, &v3)
-       FeMul(&p.X, &p.X, &u) // x = uv^3(uv^7)^((q-5)/8)
-
-       var tmpX, tmp2 [32]byte
-
-       FeSquare(&vxx, &p.X)
-       FeMul(&vxx, &vxx, &v)
-       FeSub(&check, &vxx, &u) // vx^2-u
-       if FeIsNonZero(&check) == 1 {
-               FeAdd(&check, &vxx, &u) // vx^2+u
-               if FeIsNonZero(&check) == 1 {
-                       return false
-               }
-               FeMul(&p.X, &p.X, &SqrtM1)
-
-               FeToBytes(&tmpX, &p.X)
-               for i, v := range tmpX {
-                       tmp2[31-i] = v
-               }
-       }
-
-       if FeIsNegative(&p.X) != (s[31] >> 7) {
-               FeNeg(&p.X, &p.X)
-       }
-
-       FeMul(&p.T, &p.X, &p.Y)
-       return true
-}
-
-func (p *CompletedGroupElement) ToProjective(r *ProjectiveGroupElement) {
-       FeMul(&r.X, &p.X, &p.T)
-       FeMul(&r.Y, &p.Y, &p.Z)
-       FeMul(&r.Z, &p.Z, &p.T)
-}
-
-func (p *CompletedGroupElement) ToExtended(r *ExtendedGroupElement) {
-       FeMul(&r.X, &p.X, &p.T)
-       FeMul(&r.Y, &p.Y, &p.Z)
-       FeMul(&r.Z, &p.Z, &p.T)
-       FeMul(&r.T, &p.X, &p.Y)
-}
-
-func (p *PreComputedGroupElement) Zero() {
-       FeOne(&p.yPlusX)
-       FeOne(&p.yMinusX)
-       FeZero(&p.xy2d)
-}
-
-func geAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
-       var t0 FieldElement
-
-       FeAdd(&r.X, &p.Y, &p.X)
-       FeSub(&r.Y, &p.Y, &p.X)
-       FeMul(&r.Z, &r.X, &q.yPlusX)
-       FeMul(&r.Y, &r.Y, &q.yMinusX)
-       FeMul(&r.T, &q.T2d, &p.T)
-       FeMul(&r.X, &p.Z, &q.Z)
-       FeAdd(&t0, &r.X, &r.X)
-       FeSub(&r.X, &r.Z, &r.Y)
-       FeAdd(&r.Y, &r.Z, &r.Y)
-       FeAdd(&r.Z, &t0, &r.T)
-       FeSub(&r.T, &t0, &r.T)
-}
-
-func geSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
-       var t0 FieldElement
-
-       FeAdd(&r.X, &p.Y, &p.X)
-       FeSub(&r.Y, &p.Y, &p.X)
-       FeMul(&r.Z, &r.X, &q.yMinusX)
-       FeMul(&r.Y, &r.Y, &q.yPlusX)
-       FeMul(&r.T, &q.T2d, &p.T)
-       FeMul(&r.X, &p.Z, &q.Z)
-       FeAdd(&t0, &r.X, &r.X)
-       FeSub(&r.X, &r.Z, &r.Y)
-       FeAdd(&r.Y, &r.Z, &r.Y)
-       FeSub(&r.Z, &t0, &r.T)
-       FeAdd(&r.T, &t0, &r.T)
-}
-
-func geMixedAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
-       var t0 FieldElement
-
-       FeAdd(&r.X, &p.Y, &p.X)
-       FeSub(&r.Y, &p.Y, &p.X)
-       FeMul(&r.Z, &r.X, &q.yPlusX)
-       FeMul(&r.Y, &r.Y, &q.yMinusX)
-       FeMul(&r.T, &q.xy2d, &p.T)
-       FeAdd(&t0, &p.Z, &p.Z)
-       FeSub(&r.X, &r.Z, &r.Y)
-       FeAdd(&r.Y, &r.Z, &r.Y)
-       FeAdd(&r.Z, &t0, &r.T)
-       FeSub(&r.T, &t0, &r.T)
-}
-
-func geMixedSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
-       var t0 FieldElement
-
-       FeAdd(&r.X, &p.Y, &p.X)
-       FeSub(&r.Y, &p.Y, &p.X)
-       FeMul(&r.Z, &r.X, &q.yMinusX)
-       FeMul(&r.Y, &r.Y, &q.yPlusX)
-       FeMul(&r.T, &q.xy2d, &p.T)
-       FeAdd(&t0, &p.Z, &p.Z)
-       FeSub(&r.X, &r.Z, &r.Y)
-       FeAdd(&r.Y, &r.Z, &r.Y)
-       FeSub(&r.Z, &t0, &r.T)
-       FeAdd(&r.T, &t0, &r.T)
-}
-
-func slide(r *[256]int8, a *[32]byte) {
-       for i := range r {
-               r[i] = int8(1 & (a[i>>3] >> uint(i&7)))
-       }
-
-       for i := range r {
-               if r[i] != 0 {
-                       for b := 1; b <= 6 && i+b < 256; b++ {
-                               if r[i+b] != 0 {
-                                       if r[i]+(r[i+b]<<uint(b)) <= 15 {
-                                               r[i] += r[i+b] << uint(b)
-                                               r[i+b] = 0
-                                       } else if r[i]-(r[i+b]<<uint(b)) >= -15 {
-                                               r[i] -= r[i+b] << uint(b)
-                                               for k := i + b; k < 256; k++ {
-                                                       if r[k] == 0 {
-                                                               r[k] = 1
-                                                               break
-                                                       }
-                                                       r[k] = 0
-                                               }
-                                       } else {
-                                               break
-                                       }
-                               }
-                       }
-               }
-       }
-}
-
-// GeDoubleScalarMultVartime sets r = a*A + b*B
-// where a = a[0]+256*a[1]+...+256^31 a[31].
-// and b = b[0]+256*b[1]+...+256^31 b[31].
-// B is the Ed25519 base point (x,4/5) with x positive.
-func GeDoubleScalarMultVartime(r *ProjectiveGroupElement, a *[32]byte, A *ExtendedGroupElement, b *[32]byte) {
-       var aSlide, bSlide [256]int8
-       var Ai [8]CachedGroupElement // A,3A,5A,7A,9A,11A,13A,15A
-       var t CompletedGroupElement
-       var u, A2 ExtendedGroupElement
-       var i int
-
-       slide(&aSlide, a)
-       slide(&bSlide, b)
-
-       A.ToCached(&Ai[0])
-       A.Double(&t)
-       t.ToExtended(&A2)
-
-       for i := 0; i < 7; i++ {
-               geAdd(&t, &A2, &Ai[i])
-               t.ToExtended(&u)
-               u.ToCached(&Ai[i+1])
-       }
-
-       r.Zero()
-
-       for i = 255; i >= 0; i-- {
-               if aSlide[i] != 0 || bSlide[i] != 0 {
-                       break
-               }
-       }
-
-       for ; i >= 0; i-- {
-               r.Double(&t)
-
-               if aSlide[i] > 0 {
-                       t.ToExtended(&u)
-                       geAdd(&t, &u, &Ai[aSlide[i]/2])
-               } else if aSlide[i] < 0 {
-                       t.ToExtended(&u)
-                       geSub(&t, &u, &Ai[(-aSlide[i])/2])
-               }
-
-               if bSlide[i] > 0 {
-                       t.ToExtended(&u)
-                       geMixedAdd(&t, &u, &bi[bSlide[i]/2])
-               } else if bSlide[i] < 0 {
-                       t.ToExtended(&u)
-                       geMixedSub(&t, &u, &bi[(-bSlide[i])/2])
-               }
-
-               t.ToProjective(r)
-       }
-}
-
-// equal returns 1 if b == c and 0 otherwise.
-func equal(b, c int32) int32 {
-       x := uint32(b ^ c)
-       x--
-       return int32(x >> 31)
-}
-
-// negative returns 1 if b < 0 and 0 otherwise.
-func negative(b int32) int32 {
-       return (b >> 31) & 1
-}
-
-func PreComputedGroupElementCMove(t, u *PreComputedGroupElement, b int32) {
-       FeCMove(&t.yPlusX, &u.yPlusX, b)
-       FeCMove(&t.yMinusX, &u.yMinusX, b)
-       FeCMove(&t.xy2d, &u.xy2d, b)
-}
-
-func selectPoint(t *PreComputedGroupElement, pos int32, b int32) {
-       var minusT PreComputedGroupElement
-       bNegative := negative(b)
-       bAbs := b - (((-bNegative) & b) << 1)
-
-       t.Zero()
-       for i := int32(0); i < 8; i++ {
-               PreComputedGroupElementCMove(t, &base[pos][i], equal(bAbs, i+1))
-       }
-       FeCopy(&minusT.yPlusX, &t.yMinusX)
-       FeCopy(&minusT.yMinusX, &t.yPlusX)
-       FeNeg(&minusT.xy2d, &t.xy2d)
-       PreComputedGroupElementCMove(t, &minusT, bNegative)
-}
-
-// GeScalarMultBase computes h = a*B, where
-//   a = a[0]+256*a[1]+...+256^31 a[31]
-//   B is the Ed25519 base point (x,4/5) with x positive.
-//
-// Preconditions:
-//   a[31] <= 127
-func GeScalarMultBase(h *ExtendedGroupElement, a *[32]byte) {
-       var e [64]int8
-
-       for i, v := range a {
-               e[2*i] = int8(v & 15)
-               e[2*i+1] = int8((v >> 4) & 15)
-       }
-
-       // each e[i] is between 0 and 15 and e[63] is between 0 and 7.
-
-       carry := int8(0)
-       for i := 0; i < 63; i++ {
-               e[i] += carry
-               carry = (e[i] + 8) >> 4
-               e[i] -= carry << 4
-       }
-       e[63] += carry
-       // each e[i] is between -8 and 8.
-
-       h.Zero()
-       var t PreComputedGroupElement
-       var r CompletedGroupElement
-       for i := int32(1); i < 64; i += 2 {
-               selectPoint(&t, i/2, int32(e[i]))
-               geMixedAdd(&r, h, &t)
-               r.ToExtended(h)
-       }
-
-       var s ProjectiveGroupElement
-
-       h.Double(&r)
-       r.ToProjective(&s)
-       s.Double(&r)
-       r.ToProjective(&s)
-       s.Double(&r)
-       r.ToProjective(&s)
-       s.Double(&r)
-       r.ToExtended(h)
-
-       for i := int32(0); i < 64; i += 2 {
-               selectPoint(&t, i/2, int32(e[i]))
-               geMixedAdd(&r, h, &t)
-               r.ToExtended(h)
-       }
-}
-
-// The scalars are GF(2^252 + 27742317777372353535851937790883648493).
-
-// Input:
-//   a[0]+256*a[1]+...+256^31*a[31] = a
-//   b[0]+256*b[1]+...+256^31*b[31] = b
-//   c[0]+256*c[1]+...+256^31*c[31] = c
-//
-// Output:
-//   s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l
-//   where l = 2^252 + 27742317777372353535851937790883648493.
-func ScMulAdd(s, a, b, c *[32]byte) {
-       a0 := 2097151 & load3(a[:])
-       a1 := 2097151 & (load4(a[2:]) >> 5)
-       a2 := 2097151 & (load3(a[5:]) >> 2)
-       a3 := 2097151 & (load4(a[7:]) >> 7)
-       a4 := 2097151 & (load4(a[10:]) >> 4)
-       a5 := 2097151 & (load3(a[13:]) >> 1)
-       a6 := 2097151 & (load4(a[15:]) >> 6)
-       a7 := 2097151 & (load3(a[18:]) >> 3)
-       a8 := 2097151 & load3(a[21:])
-       a9 := 2097151 & (load4(a[23:]) >> 5)
-       a10 := 2097151 & (load3(a[26:]) >> 2)
-       a11 := (load4(a[28:]) >> 7)
-       b0 := 2097151 & load3(b[:])
-       b1 := 2097151 & (load4(b[2:]) >> 5)
-       b2 := 2097151 & (load3(b[5:]) >> 2)
-       b3 := 2097151 & (load4(b[7:]) >> 7)
-       b4 := 2097151 & (load4(b[10:]) >> 4)
-       b5 := 2097151 & (load3(b[13:]) >> 1)
-       b6 := 2097151 & (load4(b[15:]) >> 6)
-       b7 := 2097151 & (load3(b[18:]) >> 3)
-       b8 := 2097151 & load3(b[21:])
-       b9 := 2097151 & (load4(b[23:]) >> 5)
-       b10 := 2097151 & (load3(b[26:]) >> 2)
-       b11 := (load4(b[28:]) >> 7)
-       c0 := 2097151 & load3(c[:])
-       c1 := 2097151 & (load4(c[2:]) >> 5)
-       c2 := 2097151 & (load3(c[5:]) >> 2)
-       c3 := 2097151 & (load4(c[7:]) >> 7)
-       c4 := 2097151 & (load4(c[10:]) >> 4)
-       c5 := 2097151 & (load3(c[13:]) >> 1)
-       c6 := 2097151 & (load4(c[15:]) >> 6)
-       c7 := 2097151 & (load3(c[18:]) >> 3)
-       c8 := 2097151 & load3(c[21:])
-       c9 := 2097151 & (load4(c[23:]) >> 5)
-       c10 := 2097151 & (load3(c[26:]) >> 2)
-       c11 := (load4(c[28:]) >> 7)
-       var carry [23]int64
-
-       s0 := c0 + a0*b0
-       s1 := c1 + a0*b1 + a1*b0
-       s2 := c2 + a0*b2 + a1*b1 + a2*b0
-       s3 := c3 + a0*b3 + a1*b2 + a2*b1 + a3*b0
-       s4 := c4 + a0*b4 + a1*b3 + a2*b2 + a3*b1 + a4*b0
-       s5 := c5 + a0*b5 + a1*b4 + a2*b3 + a3*b2 + a4*b1 + a5*b0
-       s6 := c6 + a0*b6 + a1*b5 + a2*b4 + a3*b3 + a4*b2 + a5*b1 + a6*b0
-       s7 := c7 + a0*b7 + a1*b6 + a2*b5 + a3*b4 + a4*b3 + a5*b2 + a6*b1 + a7*b0
-       s8 := c8 + a0*b8 + a1*b7 + a2*b6 + a3*b5 + a4*b4 + a5*b3 + a6*b2 + a7*b1 + a8*b0
-       s9 := c9 + a0*b9 + a1*b8 + a2*b7 + a3*b6 + a4*b5 + a5*b4 + a6*b3 + a7*b2 + a8*b1 + a9*b0
-       s10 := c10 + a0*b10 + a1*b9 + a2*b8 + a3*b7 + a4*b6 + a5*b5 + a6*b4 + a7*b3 + a8*b2 + a9*b1 + a10*b0
-       s11 := c11 + a0*b11 + a1*b10 + a2*b9 + a3*b8 + a4*b7 + a5*b6 + a6*b5 + a7*b4 + a8*b3 + a9*b2 + a10*b1 + a11*b0
-       s12 := a1*b11 + a2*b10 + a3*b9 + a4*b8 + a5*b7 + a6*b6 + a7*b5 + a8*b4 + a9*b3 + a10*b2 + a11*b1
-       s13 := a2*b11 + a3*b10 + a4*b9 + a5*b8 + a6*b7 + a7*b6 + a8*b5 + a9*b4 + a10*b3 + a11*b2
-       s14 := a3*b11 + a4*b10 + a5*b9 + a6*b8 + a7*b7 + a8*b6 + a9*b5 + a10*b4 + a11*b3
-       s15 := a4*b11 + a5*b10 + a6*b9 + a7*b8 + a8*b7 + a9*b6 + a10*b5 + a11*b4
-       s16 := a5*b11 + a6*b10 + a7*b9 + a8*b8 + a9*b7 + a10*b6 + a11*b5
-       s17 := a6*b11 + a7*b10 + a8*b9 + a9*b8 + a10*b7 + a11*b6
-       s18 := a7*b11 + a8*b10 + a9*b9 + a10*b8 + a11*b7
-       s19 := a8*b11 + a9*b10 + a10*b9 + a11*b8
-       s20 := a9*b11 + a10*b10 + a11*b9
-       s21 := a10*b11 + a11*b10
-       s22 := a11 * b11
-       s23 := int64(0)
-
-       carry[0] = (s0 + (1 << 20)) >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[2] = (s2 + (1 << 20)) >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[4] = (s4 + (1 << 20)) >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[6] = (s6 + (1 << 20)) >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[8] = (s8 + (1 << 20)) >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[10] = (s10 + (1 << 20)) >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-       carry[12] = (s12 + (1 << 20)) >> 21
-       s13 += carry[12]
-       s12 -= carry[12] << 21
-       carry[14] = (s14 + (1 << 20)) >> 21
-       s15 += carry[14]
-       s14 -= carry[14] << 21
-       carry[16] = (s16 + (1 << 20)) >> 21
-       s17 += carry[16]
-       s16 -= carry[16] << 21
-       carry[18] = (s18 + (1 << 20)) >> 21
-       s19 += carry[18]
-       s18 -= carry[18] << 21
-       carry[20] = (s20 + (1 << 20)) >> 21
-       s21 += carry[20]
-       s20 -= carry[20] << 21
-       carry[22] = (s22 + (1 << 20)) >> 21
-       s23 += carry[22]
-       s22 -= carry[22] << 21
-
-       carry[1] = (s1 + (1 << 20)) >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[3] = (s3 + (1 << 20)) >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[5] = (s5 + (1 << 20)) >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[7] = (s7 + (1 << 20)) >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[9] = (s9 + (1 << 20)) >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[11] = (s11 + (1 << 20)) >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-       carry[13] = (s13 + (1 << 20)) >> 21
-       s14 += carry[13]
-       s13 -= carry[13] << 21
-       carry[15] = (s15 + (1 << 20)) >> 21
-       s16 += carry[15]
-       s15 -= carry[15] << 21
-       carry[17] = (s17 + (1 << 20)) >> 21
-       s18 += carry[17]
-       s17 -= carry[17] << 21
-       carry[19] = (s19 + (1 << 20)) >> 21
-       s20 += carry[19]
-       s19 -= carry[19] << 21
-       carry[21] = (s21 + (1 << 20)) >> 21
-       s22 += carry[21]
-       s21 -= carry[21] << 21
-
-       s11 += s23 * 666643
-       s12 += s23 * 470296
-       s13 += s23 * 654183
-       s14 -= s23 * 997805
-       s15 += s23 * 136657
-       s16 -= s23 * 683901
-       s23 = 0
-
-       s10 += s22 * 666643
-       s11 += s22 * 470296
-       s12 += s22 * 654183
-       s13 -= s22 * 997805
-       s14 += s22 * 136657
-       s15 -= s22 * 683901
-       s22 = 0
-
-       s9 += s21 * 666643
-       s10 += s21 * 470296
-       s11 += s21 * 654183
-       s12 -= s21 * 997805
-       s13 += s21 * 136657
-       s14 -= s21 * 683901
-       s21 = 0
-
-       s8 += s20 * 666643
-       s9 += s20 * 470296
-       s10 += s20 * 654183
-       s11 -= s20 * 997805
-       s12 += s20 * 136657
-       s13 -= s20 * 683901
-       s20 = 0
-
-       s7 += s19 * 666643
-       s8 += s19 * 470296
-       s9 += s19 * 654183
-       s10 -= s19 * 997805
-       s11 += s19 * 136657
-       s12 -= s19 * 683901
-       s19 = 0
-
-       s6 += s18 * 666643
-       s7 += s18 * 470296
-       s8 += s18 * 654183
-       s9 -= s18 * 997805
-       s10 += s18 * 136657
-       s11 -= s18 * 683901
-       s18 = 0
-
-       carry[6] = (s6 + (1 << 20)) >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[8] = (s8 + (1 << 20)) >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[10] = (s10 + (1 << 20)) >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-       carry[12] = (s12 + (1 << 20)) >> 21
-       s13 += carry[12]
-       s12 -= carry[12] << 21
-       carry[14] = (s14 + (1 << 20)) >> 21
-       s15 += carry[14]
-       s14 -= carry[14] << 21
-       carry[16] = (s16 + (1 << 20)) >> 21
-       s17 += carry[16]
-       s16 -= carry[16] << 21
-
-       carry[7] = (s7 + (1 << 20)) >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[9] = (s9 + (1 << 20)) >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[11] = (s11 + (1 << 20)) >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-       carry[13] = (s13 + (1 << 20)) >> 21
-       s14 += carry[13]
-       s13 -= carry[13] << 21
-       carry[15] = (s15 + (1 << 20)) >> 21
-       s16 += carry[15]
-       s15 -= carry[15] << 21
-
-       s5 += s17 * 666643
-       s6 += s17 * 470296
-       s7 += s17 * 654183
-       s8 -= s17 * 997805
-       s9 += s17 * 136657
-       s10 -= s17 * 683901
-       s17 = 0
-
-       s4 += s16 * 666643
-       s5 += s16 * 470296
-       s6 += s16 * 654183
-       s7 -= s16 * 997805
-       s8 += s16 * 136657
-       s9 -= s16 * 683901
-       s16 = 0
-
-       s3 += s15 * 666643
-       s4 += s15 * 470296
-       s5 += s15 * 654183
-       s6 -= s15 * 997805
-       s7 += s15 * 136657
-       s8 -= s15 * 683901
-       s15 = 0
-
-       s2 += s14 * 666643
-       s3 += s14 * 470296
-       s4 += s14 * 654183
-       s5 -= s14 * 997805
-       s6 += s14 * 136657
-       s7 -= s14 * 683901
-       s14 = 0
-
-       s1 += s13 * 666643
-       s2 += s13 * 470296
-       s3 += s13 * 654183
-       s4 -= s13 * 997805
-       s5 += s13 * 136657
-       s6 -= s13 * 683901
-       s13 = 0
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = (s0 + (1 << 20)) >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[2] = (s2 + (1 << 20)) >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[4] = (s4 + (1 << 20)) >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[6] = (s6 + (1 << 20)) >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[8] = (s8 + (1 << 20)) >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[10] = (s10 + (1 << 20)) >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-
-       carry[1] = (s1 + (1 << 20)) >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[3] = (s3 + (1 << 20)) >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[5] = (s5 + (1 << 20)) >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[7] = (s7 + (1 << 20)) >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[9] = (s9 + (1 << 20)) >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[11] = (s11 + (1 << 20)) >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = s0 >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[1] = s1 >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[2] = s2 >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[3] = s3 >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[4] = s4 >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[5] = s5 >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[6] = s6 >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[7] = s7 >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[8] = s8 >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[9] = s9 >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[10] = s10 >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-       carry[11] = s11 >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = s0 >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[1] = s1 >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[2] = s2 >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[3] = s3 >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[4] = s4 >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[5] = s5 >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[6] = s6 >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[7] = s7 >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[8] = s8 >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[9] = s9 >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[10] = s10 >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-
-       s[0] = byte(s0 >> 0)
-       s[1] = byte(s0 >> 8)
-       s[2] = byte((s0 >> 16) | (s1 << 5))
-       s[3] = byte(s1 >> 3)
-       s[4] = byte(s1 >> 11)
-       s[5] = byte((s1 >> 19) | (s2 << 2))
-       s[6] = byte(s2 >> 6)
-       s[7] = byte((s2 >> 14) | (s3 << 7))
-       s[8] = byte(s3 >> 1)
-       s[9] = byte(s3 >> 9)
-       s[10] = byte((s3 >> 17) | (s4 << 4))
-       s[11] = byte(s4 >> 4)
-       s[12] = byte(s4 >> 12)
-       s[13] = byte((s4 >> 20) | (s5 << 1))
-       s[14] = byte(s5 >> 7)
-       s[15] = byte((s5 >> 15) | (s6 << 6))
-       s[16] = byte(s6 >> 2)
-       s[17] = byte(s6 >> 10)
-       s[18] = byte((s6 >> 18) | (s7 << 3))
-       s[19] = byte(s7 >> 5)
-       s[20] = byte(s7 >> 13)
-       s[21] = byte(s8 >> 0)
-       s[22] = byte(s8 >> 8)
-       s[23] = byte((s8 >> 16) | (s9 << 5))
-       s[24] = byte(s9 >> 3)
-       s[25] = byte(s9 >> 11)
-       s[26] = byte((s9 >> 19) | (s10 << 2))
-       s[27] = byte(s10 >> 6)
-       s[28] = byte((s10 >> 14) | (s11 << 7))
-       s[29] = byte(s11 >> 1)
-       s[30] = byte(s11 >> 9)
-       s[31] = byte(s11 >> 17)
-}
-
-// Input:
-//   s[0]+256*s[1]+...+256^63*s[63] = s
-//
-// Output:
-//   s[0]+256*s[1]+...+256^31*s[31] = s mod l
-//   where l = 2^252 + 27742317777372353535851937790883648493.
-func ScReduce(out *[32]byte, s *[64]byte) {
-       s0 := 2097151 & load3(s[:])
-       s1 := 2097151 & (load4(s[2:]) >> 5)
-       s2 := 2097151 & (load3(s[5:]) >> 2)
-       s3 := 2097151 & (load4(s[7:]) >> 7)
-       s4 := 2097151 & (load4(s[10:]) >> 4)
-       s5 := 2097151 & (load3(s[13:]) >> 1)
-       s6 := 2097151 & (load4(s[15:]) >> 6)
-       s7 := 2097151 & (load3(s[18:]) >> 3)
-       s8 := 2097151 & load3(s[21:])
-       s9 := 2097151 & (load4(s[23:]) >> 5)
-       s10 := 2097151 & (load3(s[26:]) >> 2)
-       s11 := 2097151 & (load4(s[28:]) >> 7)
-       s12 := 2097151 & (load4(s[31:]) >> 4)
-       s13 := 2097151 & (load3(s[34:]) >> 1)
-       s14 := 2097151 & (load4(s[36:]) >> 6)
-       s15 := 2097151 & (load3(s[39:]) >> 3)
-       s16 := 2097151 & load3(s[42:])
-       s17 := 2097151 & (load4(s[44:]) >> 5)
-       s18 := 2097151 & (load3(s[47:]) >> 2)
-       s19 := 2097151 & (load4(s[49:]) >> 7)
-       s20 := 2097151 & (load4(s[52:]) >> 4)
-       s21 := 2097151 & (load3(s[55:]) >> 1)
-       s22 := 2097151 & (load4(s[57:]) >> 6)
-       s23 := (load4(s[60:]) >> 3)
-
-       s11 += s23 * 666643
-       s12 += s23 * 470296
-       s13 += s23 * 654183
-       s14 -= s23 * 997805
-       s15 += s23 * 136657
-       s16 -= s23 * 683901
-       s23 = 0
-
-       s10 += s22 * 666643
-       s11 += s22 * 470296
-       s12 += s22 * 654183
-       s13 -= s22 * 997805
-       s14 += s22 * 136657
-       s15 -= s22 * 683901
-       s22 = 0
-
-       s9 += s21 * 666643
-       s10 += s21 * 470296
-       s11 += s21 * 654183
-       s12 -= s21 * 997805
-       s13 += s21 * 136657
-       s14 -= s21 * 683901
-       s21 = 0
-
-       s8 += s20 * 666643
-       s9 += s20 * 470296
-       s10 += s20 * 654183
-       s11 -= s20 * 997805
-       s12 += s20 * 136657
-       s13 -= s20 * 683901
-       s20 = 0
-
-       s7 += s19 * 666643
-       s8 += s19 * 470296
-       s9 += s19 * 654183
-       s10 -= s19 * 997805
-       s11 += s19 * 136657
-       s12 -= s19 * 683901
-       s19 = 0
-
-       s6 += s18 * 666643
-       s7 += s18 * 470296
-       s8 += s18 * 654183
-       s9 -= s18 * 997805
-       s10 += s18 * 136657
-       s11 -= s18 * 683901
-       s18 = 0
-
-       var carry [17]int64
-
-       carry[6] = (s6 + (1 << 20)) >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[8] = (s8 + (1 << 20)) >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[10] = (s10 + (1 << 20)) >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-       carry[12] = (s12 + (1 << 20)) >> 21
-       s13 += carry[12]
-       s12 -= carry[12] << 21
-       carry[14] = (s14 + (1 << 20)) >> 21
-       s15 += carry[14]
-       s14 -= carry[14] << 21
-       carry[16] = (s16 + (1 << 20)) >> 21
-       s17 += carry[16]
-       s16 -= carry[16] << 21
-
-       carry[7] = (s7 + (1 << 20)) >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[9] = (s9 + (1 << 20)) >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[11] = (s11 + (1 << 20)) >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-       carry[13] = (s13 + (1 << 20)) >> 21
-       s14 += carry[13]
-       s13 -= carry[13] << 21
-       carry[15] = (s15 + (1 << 20)) >> 21
-       s16 += carry[15]
-       s15 -= carry[15] << 21
-
-       s5 += s17 * 666643
-       s6 += s17 * 470296
-       s7 += s17 * 654183
-       s8 -= s17 * 997805
-       s9 += s17 * 136657
-       s10 -= s17 * 683901
-       s17 = 0
-
-       s4 += s16 * 666643
-       s5 += s16 * 470296
-       s6 += s16 * 654183
-       s7 -= s16 * 997805
-       s8 += s16 * 136657
-       s9 -= s16 * 683901
-       s16 = 0
-
-       s3 += s15 * 666643
-       s4 += s15 * 470296
-       s5 += s15 * 654183
-       s6 -= s15 * 997805
-       s7 += s15 * 136657
-       s8 -= s15 * 683901
-       s15 = 0
-
-       s2 += s14 * 666643
-       s3 += s14 * 470296
-       s4 += s14 * 654183
-       s5 -= s14 * 997805
-       s6 += s14 * 136657
-       s7 -= s14 * 683901
-       s14 = 0
-
-       s1 += s13 * 666643
-       s2 += s13 * 470296
-       s3 += s13 * 654183
-       s4 -= s13 * 997805
-       s5 += s13 * 136657
-       s6 -= s13 * 683901
-       s13 = 0
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = (s0 + (1 << 20)) >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[2] = (s2 + (1 << 20)) >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[4] = (s4 + (1 << 20)) >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[6] = (s6 + (1 << 20)) >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[8] = (s8 + (1 << 20)) >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[10] = (s10 + (1 << 20)) >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-
-       carry[1] = (s1 + (1 << 20)) >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[3] = (s3 + (1 << 20)) >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[5] = (s5 + (1 << 20)) >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[7] = (s7 + (1 << 20)) >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[9] = (s9 + (1 << 20)) >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[11] = (s11 + (1 << 20)) >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = s0 >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[1] = s1 >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[2] = s2 >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[3] = s3 >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[4] = s4 >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[5] = s5 >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[6] = s6 >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[7] = s7 >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[8] = s8 >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[9] = s9 >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[10] = s10 >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-       carry[11] = s11 >> 21
-       s12 += carry[11]
-       s11 -= carry[11] << 21
-
-       s0 += s12 * 666643
-       s1 += s12 * 470296
-       s2 += s12 * 654183
-       s3 -= s12 * 997805
-       s4 += s12 * 136657
-       s5 -= s12 * 683901
-       s12 = 0
-
-       carry[0] = s0 >> 21
-       s1 += carry[0]
-       s0 -= carry[0] << 21
-       carry[1] = s1 >> 21
-       s2 += carry[1]
-       s1 -= carry[1] << 21
-       carry[2] = s2 >> 21
-       s3 += carry[2]
-       s2 -= carry[2] << 21
-       carry[3] = s3 >> 21
-       s4 += carry[3]
-       s3 -= carry[3] << 21
-       carry[4] = s4 >> 21
-       s5 += carry[4]
-       s4 -= carry[4] << 21
-       carry[5] = s5 >> 21
-       s6 += carry[5]
-       s5 -= carry[5] << 21
-       carry[6] = s6 >> 21
-       s7 += carry[6]
-       s6 -= carry[6] << 21
-       carry[7] = s7 >> 21
-       s8 += carry[7]
-       s7 -= carry[7] << 21
-       carry[8] = s8 >> 21
-       s9 += carry[8]
-       s8 -= carry[8] << 21
-       carry[9] = s9 >> 21
-       s10 += carry[9]
-       s9 -= carry[9] << 21
-       carry[10] = s10 >> 21
-       s11 += carry[10]
-       s10 -= carry[10] << 21
-
-       out[0] = byte(s0 >> 0)
-       out[1] = byte(s0 >> 8)
-       out[2] = byte((s0 >> 16) | (s1 << 5))
-       out[3] = byte(s1 >> 3)
-       out[4] = byte(s1 >> 11)
-       out[5] = byte((s1 >> 19) | (s2 << 2))
-       out[6] = byte(s2 >> 6)
-       out[7] = byte((s2 >> 14) | (s3 << 7))
-       out[8] = byte(s3 >> 1)
-       out[9] = byte(s3 >> 9)
-       out[10] = byte((s3 >> 17) | (s4 << 4))
-       out[11] = byte(s4 >> 4)
-       out[12] = byte(s4 >> 12)
-       out[13] = byte((s4 >> 20) | (s5 << 1))
-       out[14] = byte(s5 >> 7)
-       out[15] = byte((s5 >> 15) | (s6 << 6))
-       out[16] = byte(s6 >> 2)
-       out[17] = byte(s6 >> 10)
-       out[18] = byte((s6 >> 18) | (s7 << 3))
-       out[19] = byte(s7 >> 5)
-       out[20] = byte(s7 >> 13)
-       out[21] = byte(s8 >> 0)
-       out[22] = byte(s8 >> 8)
-       out[23] = byte((s8 >> 16) | (s9 << 5))
-       out[24] = byte(s9 >> 3)
-       out[25] = byte(s9 >> 11)
-       out[26] = byte((s9 >> 19) | (s10 << 2))
-       out[27] = byte(s10 >> 6)
-       out[28] = byte((s10 >> 14) | (s11 << 7))
-       out[29] = byte(s11 >> 1)
-       out[30] = byte(s11 >> 9)
-       out[31] = byte(s11 >> 17)
-}

diff --git a/vendor/github.com/tendermint/ed25519/testdata/sign.input.gz b/vendor/github.com/tendermint/ed25519/testdata/sign.input.gz
deleted file mode 100644 (file)
index 4103069..0000000
Binary files a/vendor/github.com/tendermint/ed25519/testdata/sign.input.gz and /dev/null differ

diff --git a/vendor/github.com/tendermint/go-crypto/.gitignore b/vendor/github.com/tendermint/go-crypto/.gitignore
deleted file mode 100644 (file)
index d19e645..0000000
--- a/vendor/github.com/tendermint/go-crypto/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.swp
-*.swo
-vendor
-shunit2

diff --git a/vendor/github.com/tendermint/go-crypto/embed_test.go b/vendor/github.com/tendermint/go-crypto/embed_test.go
deleted file mode 100644 (file)
index e5c37c0..0000000
--- a/vendor/github.com/tendermint/go-crypto/embed_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package crypto_test
-
-import (
-       "fmt"
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       data "github.com/tendermint/go-wire/data"
-)
-
-type PubName struct {
-       PubNameInner
-}
-
-type PubNameInner interface {
-       AssertIsPubNameInner()
-       String() string
-}
-
-func (p PubName) MarshalJSON() ([]byte, error) {
-       return pubNameMapper.ToJSON(p.PubNameInner)
-}
-
-func (p *PubName) UnmarshalJSON(data []byte) error {
-       parsed, err := pubNameMapper.FromJSON(data)
-       if err == nil && parsed != nil {
-               p.PubNameInner = parsed.(PubNameInner)
-       }
-       return err
-}
-
-var pubNameMapper = data.NewMapper(PubName{}).
-       RegisterImplementation(PubNameFoo{}, "foo", 1).
-       RegisterImplementation(PubNameBar{}, "bar", 2)
-
-func (f PubNameFoo) AssertIsPubNameInner() {}
-func (f PubNameBar) AssertIsPubNameInner() {}
-
-//----------------------------------------
-
-type PubNameFoo struct {
-       Name string
-}
-
-func (f PubNameFoo) String() string { return "Foo: " + f.Name }
-
-type PubNameBar struct {
-       Age int
-}
-
-func (b PubNameBar) String() string { return fmt.Sprintf("Bar #%d", b.Age) }
-
-//----------------------------------------
-
-// TestEncodeDemo tries the various strategies to encode the objects
-func TestEncodeDemo(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               in, out  PubNameInner
-               expected string
-       }{
-               {PubName{PubNameFoo{"pub-foo"}}, &PubName{}, "Foo: pub-foo"},
-               {PubName{PubNameBar{7}}, &PubName{}, "Bar #7"},
-       }
-
-       for i, tc := range cases {
-
-               // Make sure it is proper to start
-               require.Equal(tc.expected, tc.in.String())
-
-               // Try to encode as binary
-               b, err := data.ToWire(tc.in)
-               if assert.Nil(err, "%d: %#v", i, tc.in) {
-                       err2 := data.FromWire(b, tc.out)
-                       if assert.Nil(err2) {
-                               assert.Equal(tc.expected, tc.out.String())
-                       }
-               }
-
-               // Try to encode it as json
-               j, err := data.ToJSON(tc.in)
-               if assert.Nil(err, "%d: %#v", i, tc.in) {
-                       err2 := data.FromJSON(j, tc.out)
-                       if assert.Nil(err2) {
-                               assert.Equal(tc.expected, tc.out.String())
-                       }
-               }
-       }
-}

diff --git a/vendor/github.com/tendermint/go-crypto/example_test.go b/vendor/github.com/tendermint/go-crypto/example_test.go
deleted file mode 100644 (file)
index a4c07de..0000000
--- a/vendor/github.com/tendermint/go-crypto/example_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2017 Tendermint. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package crypto_test
-
-import (
-       "fmt"
-
-       "github.com/tendermint/go-crypto"
-)
-
-func ExampleSha256() {
-       sum := crypto.Sha256([]byte("This is Tendermint"))
-       fmt.Printf("%x\n", sum)
-       // Output:
-       // f91afb642f3d1c87c17eb01aae5cb65c242dfdbe7cf1066cc260f4ce5d33b94e
-}

diff --git a/vendor/github.com/tendermint/go-crypto/hash.go b/vendor/github.com/tendermint/go-crypto/hash.go
deleted file mode 100644 (file)
index e1d2252..0000000
--- a/vendor/github.com/tendermint/go-crypto/hash.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package crypto
-
-import (
-       "crypto/sha256"
-)
-
-func Sha256(bytes []byte) []byte {
-       hasher := sha256.New()
-       hasher.Write(bytes)
-       return hasher.Sum(nil)
-}

diff --git a/vendor/github.com/tendermint/go-crypto/priv_key.go b/vendor/github.com/tendermint/go-crypto/priv_key.go
deleted file mode 100644 (file)
index accc773..0000000
--- a/vendor/github.com/tendermint/go-crypto/priv_key.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package crypto
-
-import (
-       "encoding/hex"
-
-       "github.com/tendermint/ed25519"
-       "github.com/tendermint/go-wire"
-       "github.com/tendermint/go-wire/data"
-)
-
-func PrivKeyFromBytes(privKeyBytes []byte) (privKey PrivKey, err error) {
-       err = wire.ReadBinaryBytes(privKeyBytes, &privKey)
-       if err == nil {
-               // add support for a ValidateKey method on PrivKeys
-               // to make sure they load correctly
-               val, ok := privKey.Unwrap().(validatable)
-               if ok {
-                       err = val.ValidateKey()
-               }
-       }
-       return
-}
-
-// validatable is an optional interface for keys that want to
-// check integrity
-type validatable interface {
-       ValidateKey() error
-}
-
-//----------------------------------------
-
-// DO NOT USE THIS INTERFACE.
-// You probably want to use PrivKey
-// +gen wrapper:"PrivKey,Impl[PrivKeyEd25519,PrivKeySecp256k1],ed25519,secp256k1"
-type PrivKeyInner interface {
-       Sign(msg []byte) Signature
-       PubKey() PubKey
-       Wrap() PrivKey
-}
-
-//-------------------------------------
-
-var _ PrivKeyInner = PrivKeyEd25519{}
-
-// Implements PrivKey
-type PrivKeyEd25519 [64]byte
-
-func (privKey PrivKeyEd25519) Sign(msg []byte) Signature {
-       privKeyBytes := [64]byte(privKey)
-       signatureBytes := ed25519.Sign(&privKeyBytes, msg)
-       return SignatureEd25519(*signatureBytes).Wrap()
-}
-
-func (privKey PrivKeyEd25519) PubKey() PubKey {
-       privKeyBytes := [64]byte(privKey)
-       pubBytes := *ed25519.MakePublicKey(&privKeyBytes)
-       return PubKeyEd25519(pubBytes).Wrap()
-}
-
-func (p PrivKeyEd25519) MarshalJSON() ([]byte, error) {
-       return data.Encoder.Marshal(p[:])
-}
-
-func (p *PrivKeyEd25519) UnmarshalJSON(enc []byte) error {
-       var ref []byte
-       err := data.Encoder.Unmarshal(&ref, enc)
-       copy(p[:], ref)
-       return err
-}
-
-func (privKey PrivKeyEd25519) String() string {
-       return hex.EncodeToString(privKey[:])
-}
-
-func GenPrivKeyEd25519() PrivKeyEd25519 {
-       privKeyBytes := new([64]byte)
-       copy(privKeyBytes[:32], CRandBytes(32))
-       ed25519.MakePublicKey(privKeyBytes)
-       return PrivKeyEd25519(*privKeyBytes)
-}

diff --git a/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go
deleted file mode 100644 (file)
index 78b1754..0000000
--- a/vendor/github.com/tendermint/go-crypto/privkeyinner_wrapper.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by: main
-// TypeWriter: wrapper
-// Directive: +gen on PrivKeyInner
-
-package crypto
-
-import (
-       "github.com/tendermint/go-wire/data"
-)
-
-// Auto-generated adapters for happily unmarshaling interfaces
-// Apache License 2.0
-// Copyright (c) 2017 Ethan Frey (ethan.frey@tendermint.com)
-
-type PrivKey struct {
-       PrivKeyInner "json:\"unwrap\""
-}
-
-var PrivKeyMapper = data.NewMapper(PrivKey{})
-
-func (h PrivKey) MarshalJSON() ([]byte, error) {
-       return PrivKeyMapper.ToJSON(h.PrivKeyInner)
-}
-
-func (h *PrivKey) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := PrivKeyMapper.FromJSON(data)
-       if err == nil && parsed != nil {
-               h.PrivKeyInner = parsed.(PrivKeyInner)
-       }
-       return err
-}
-
-// Unwrap recovers the concrete interface safely (regardless of levels of embeds)
-func (h PrivKey) Unwrap() PrivKeyInner {
-       hi := h.PrivKeyInner
-       for wrap, ok := hi.(PrivKey); ok; wrap, ok = hi.(PrivKey) {
-               hi = wrap.PrivKeyInner
-       }
-       return hi
-}
-
-/*** below are bindings for each implementation ***/
-
-func init() {
-       PrivKeyMapper.RegisterImplementation(PrivKeyEd25519{}, "ed25519", 0x1)
-}
-
-func (hi PrivKeyEd25519) Wrap() PrivKey {
-       return PrivKey{hi}
-}

diff --git a/vendor/github.com/tendermint/go-crypto/pub_key.go b/vendor/github.com/tendermint/go-crypto/pub_key.go
deleted file mode 100644 (file)
index cebde0c..0000000
--- a/vendor/github.com/tendermint/go-crypto/pub_key.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package crypto
-
-import (
-       "bytes"
-
-       "github.com/tendermint/ed25519"
-       data "github.com/tendermint/go-wire/data"
-       . "github.com/tendermint/tmlibs/common"
-)
-
-//----------------------------------------
-
-// DO NOT USE THIS INTERFACE.
-// You probably want to use PubKey
-// +gen wrapper:"PubKey,Impl[PubKeyEd25519,PubKeySecp256k1],ed25519,secp256k1"
-type PubKeyInner interface {
-       KeyString() string
-       VerifyBytes(msg []byte, sig Signature) bool
-       Equals(PubKey) bool
-       Wrap() PubKey
-}
-
-//-------------------------------------
-
-var _ PubKeyInner = PubKeyEd25519{}
-
-// Implements PubKeyInner
-type PubKeyEd25519 [32]byte
-
-func (pubKey PubKeyEd25519) VerifyBytes(msg []byte, sig_ Signature) bool {
-       // make sure we use the same algorithm to sign
-       sig, ok := sig_.Unwrap().(SignatureEd25519)
-       if !ok {
-               return false
-       }
-       pubKeyBytes := [32]byte(pubKey)
-       sigBytes := [64]byte(sig)
-       return ed25519.Verify(&pubKeyBytes, msg, &sigBytes)
-}
-
-func (p PubKeyEd25519) MarshalJSON() ([]byte, error) {
-       return data.Encoder.Marshal(p[:])
-}
-
-func (p *PubKeyEd25519) UnmarshalJSON(enc []byte) error {
-       var ref []byte
-       err := data.Encoder.Unmarshal(&ref, enc)
-       copy(p[:], ref)
-       return err
-}
-
-func (pubKey PubKeyEd25519) String() string {
-       return Fmt("PubKeyEd25519{%X}", pubKey[:])
-}
-
-// Must return the full bytes in hex.
-// Used for map keying, etc.
-func (pubKey PubKeyEd25519) KeyString() string {
-       return Fmt("%X", pubKey[:])
-}
-
-func (pubKey PubKeyEd25519) Equals(other PubKey) bool {
-       if otherEd, ok := other.Unwrap().(PubKeyEd25519); ok {
-               return bytes.Equal(pubKey[:], otherEd[:])
-       } else {
-               return false
-       }
-}

diff --git a/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go
deleted file mode 100644 (file)
index c9c8156..0000000
--- a/vendor/github.com/tendermint/go-crypto/pubkeyinner_wrapper.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by: main
-// TypeWriter: wrapper
-// Directive: +gen on PubKeyInner
-
-package crypto
-
-import (
-       "github.com/tendermint/go-wire/data"
-)
-
-// Auto-generated adapters for happily unmarshaling interfaces
-// Apache License 2.0
-// Copyright (c) 2017 Ethan Frey (ethan.frey@tendermint.com)
-
-type PubKey struct {
-       PubKeyInner "json:\"unwrap\""
-}
-
-var PubKeyMapper = data.NewMapper(PubKey{})
-
-func (h PubKey) MarshalJSON() ([]byte, error) {
-       return PubKeyMapper.ToJSON(h.PubKeyInner)
-}
-
-func (h *PubKey) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := PubKeyMapper.FromJSON(data)
-       if err == nil && parsed != nil {
-               h.PubKeyInner = parsed.(PubKeyInner)
-       }
-       return err
-}
-
-// Unwrap recovers the concrete interface safely (regardless of levels of embeds)
-func (h PubKey) Unwrap() PubKeyInner {
-       hi := h.PubKeyInner
-       for wrap, ok := hi.(PubKey); ok; wrap, ok = hi.(PubKey) {
-               hi = wrap.PubKeyInner
-       }
-       return hi
-}
-
-/*** below are bindings for each implementation ***/
-
-func init() {
-       PubKeyMapper.RegisterImplementation(PubKeyEd25519{}, "ed25519", 0x1)
-}
-
-func (hi PubKeyEd25519) Wrap() PubKey {
-       return PubKey{hi}
-}

diff --git a/vendor/github.com/tendermint/go-crypto/random.go b/vendor/github.com/tendermint/go-crypto/random.go
deleted file mode 100644 (file)
index c329b80..0000000
--- a/vendor/github.com/tendermint/go-crypto/random.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package crypto
-
-import (
-       "crypto/aes"
-       "crypto/cipher"
-       crand "crypto/rand"
-       "io"
-       "sync"
-
-       . "github.com/tendermint/tmlibs/common"
-)
-
-var gRandInfo *randInfo
-
-func init() {
-       gRandInfo = &randInfo{}
-       gRandInfo.MixEntropy(randBytes(32)) // Init
-}
-
-// Mix additional bytes of randomness, e.g. from hardware, user-input, etc.
-// It is OK to call it multiple times.  It does not diminish security.
-func MixEntropy(seedBytes []byte) {
-       gRandInfo.MixEntropy(seedBytes)
-}
-
-// This only uses the OS's randomness
-func randBytes(numBytes int) []byte {
-       b := make([]byte, numBytes)
-       _, err := crand.Read(b)
-       if err != nil {
-               PanicCrisis(err)
-       }
-       return b
-}
-
-// This uses the OS and the Seed(s).
-func CRandBytes(numBytes int) []byte {
-       b := make([]byte, numBytes)
-       _, err := gRandInfo.Read(b)
-       if err != nil {
-               PanicCrisis(err)
-       }
-       return b
-}
-
-//--------------------------------------------------------------------------------
-
-type randInfo struct {
-       mtx          sync.Mutex
-       seedBytes    [32]byte
-       cipherAES256 cipher.Block
-       streamAES256 cipher.Stream
-       reader       io.Reader
-}
-
-// You can call this as many times as you'd like.
-// XXX TODO review
-func (ri *randInfo) MixEntropy(seedBytes []byte) {
-       ri.mtx.Lock()
-       defer ri.mtx.Unlock()
-       // Make new ri.seedBytes
-       hashBytes := Sha256(seedBytes)
-       hashBytes32 := [32]byte{}
-       copy(hashBytes32[:], hashBytes)
-       ri.seedBytes = xorBytes32(ri.seedBytes, hashBytes32)
-       // Create new cipher.Block
-       var err error
-       ri.cipherAES256, err = aes.NewCipher(ri.seedBytes[:])
-       if err != nil {
-               PanicSanity("Error creating AES256 cipher: " + err.Error())
-       }
-       // Create new stream
-       ri.streamAES256 = cipher.NewCTR(ri.cipherAES256, randBytes(aes.BlockSize))
-       // Create new reader
-       ri.reader = &cipher.StreamReader{S: ri.streamAES256, R: crand.Reader}
-}
-
-func (ri *randInfo) Read(b []byte) (n int, err error) {
-       ri.mtx.Lock()
-       defer ri.mtx.Unlock()
-       return ri.reader.Read(b)
-}
-
-func xorBytes32(bytesA [32]byte, bytesB [32]byte) (res [32]byte) {
-       for i, b := range bytesA {
-               res[i] = b ^ bytesB[i]
-       }
-       return res
-}

diff --git a/vendor/github.com/tendermint/go-crypto/signature.go b/vendor/github.com/tendermint/go-crypto/signature.go
deleted file mode 100644 (file)
index 0c9b32a..0000000
--- a/vendor/github.com/tendermint/go-crypto/signature.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package crypto
-
-import (
-       "github.com/tendermint/go-wire"
-       data "github.com/tendermint/go-wire/data"
-)
-
-func SignatureFromBytes(sigBytes []byte) (sig Signature, err error) {
-       err = wire.ReadBinaryBytes(sigBytes, &sig)
-       return
-}
-
-//----------------------------------------
-
-// DO NOT USE THIS INTERFACE.
-// You probably want to use Signature.
-// +gen wrapper:"Signature,Impl[SignatureEd25519,SignatureSecp256k1],ed25519,secp256k1"
-type SignatureInner interface {
-       Bytes() []byte
-       Wrap() Signature
-}
-
-//-------------------------------------
-
-var _ SignatureInner = SignatureEd25519{}
-
-// Implements Signature
-type SignatureEd25519 [64]byte
-
-func (sig SignatureEd25519) Bytes() []byte {
-       return wire.BinaryBytes(Signature{sig})
-}
-
-func (sig SignatureEd25519) MarshalJSON() ([]byte, error) {
-       return data.Encoder.Marshal(sig[:])
-}
-
-func (sig *SignatureEd25519) UnmarshalJSON(enc []byte) error {
-       var ref []byte
-       err := data.Encoder.Unmarshal(&ref, enc)
-       copy(sig[:], ref)
-       return err
-}

diff --git a/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go b/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go
deleted file mode 100644 (file)
index 917218d..0000000
--- a/vendor/github.com/tendermint/go-crypto/signatureinner_wrapper.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by: main
-// TypeWriter: wrapper
-// Directive: +gen on SignatureInner
-
-package crypto
-
-import (
-       "github.com/tendermint/go-wire/data"
-)
-
-// Auto-generated adapters for happily unmarshaling interfaces
-// Apache License 2.0
-// Copyright (c) 2017 Ethan Frey (ethan.frey@tendermint.com)
-
-type Signature struct {
-       SignatureInner "json:\"unwrap\""
-}
-
-var SignatureMapper = data.NewMapper(Signature{})
-
-func (h Signature) MarshalJSON() ([]byte, error) {
-       return SignatureMapper.ToJSON(h.SignatureInner)
-}
-
-func (h *Signature) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := SignatureMapper.FromJSON(data)
-       if err == nil && parsed != nil {
-               h.SignatureInner = parsed.(SignatureInner)
-       }
-       return err
-}
-
-// Unwrap recovers the concrete interface safely (regardless of levels of embeds)
-func (h Signature) Unwrap() SignatureInner {
-       hi := h.SignatureInner
-       for wrap, ok := hi.(Signature); ok; wrap, ok = hi.(Signature) {
-               hi = wrap.SignatureInner
-       }
-       return hi
-}
-
-/*** below are bindings for each implementation ***/
-
-func init() {
-       SignatureMapper.RegisterImplementation(SignatureEd25519{}, "ed25519", 0x1)
-}
-
-func (hi SignatureEd25519) Wrap() Signature {
-       return Signature{hi}
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/Makefile b/vendor/github.com/tendermint/go-wire/data/Makefile
deleted file mode 100644 (file)
index fb28a54..0000000
--- a/vendor/github.com/tendermint/go-wire/data/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-.PHONY: docs
-REPO:=github.com/tendermint/go-wire/data
-
-docs:
-       @go get github.com/davecheney/godoc2md
-       godoc2md $(REPO) > README.md
-
-test:
-       go test ./...

diff --git a/vendor/github.com/tendermint/go-wire/data/README.md b/vendor/github.com/tendermint/go-wire/data/README.md
deleted file mode 100644 (file)
index 8124993..0000000
--- a/vendor/github.com/tendermint/go-wire/data/README.md
+++ /dev/null
@@ -1,302 +0,0 @@
-
-
-# data
-`import "github.com/tendermint/go-wire/data"`
-
-* [Overview](#pkg-overview)
-* [Index](#pkg-index)
-
-## <a name="pkg-overview">Overview</a>
-Data is designed to provide a standard interface and helper functions to
-easily allow serialization and deserialization of your data structures
-in both binary and json representations.
-
-This is commonly needed for interpreting transactions or stored data in the
-abci app, as well as accepting json input in the light-client proxy. If we
-can standardize how we pass data around the app, we can also allow more
-extensions, like data storage that can interpret the meaning of the []byte
-passed in, and use that to index multiple fields for example.
-
-Serialization of data is pretty automatic using standard json and go-wire
-encoders.  The main issue is deserialization, especially when using interfaces
-where there are many possible concrete types.
-
-go-wire handles this by registering the types and providing a custom
-deserializer:
-
-
-       var _ = wire.RegisterInterface(
-         struct{ PubKey }{},
-         wire.ConcreteType{PubKeyEd25519{}, PubKeyTypeEd25519},
-         wire.ConcreteType{PubKeySecp256k1{}, PubKeyTypeSecp256k1},
-       )
-       
-       func PubKeyFromBytes(pubKeyBytes []byte) (pubKey PubKey, err error) {
-         err = wire.ReadBinaryBytes(pubKeyBytes, &pubKey)
-         return
-       }
-       
-       func (pubKey PubKeyEd25519) Bytes() []byte {
-         return wire.BinaryBytes(struct{ PubKey }{pubKey})
-       }
-
-This prepends a type-byte to the binary representation upon serialization and
-using that byte to switch between various representations on deserialization.
-go-wire also supports something similar in json, but it leads to kind of ugly
-mixed-types arrays, and requires using the go-wire json parser, which is
-limited relative to the standard library encoding/json library.
-
-In json, the typical idiom is to use a type string and message data:
-
-
-       {
-         "type": "this part tells you how to interpret the message",
-         "data": ...the actual message is here, in some kind of json...
-       }
-
-I took inspiration from two blog posts, that demonstrate how to use this
-to build (de)serialization in a go-wire like way.
-
-* <a href="http://eagain.net/articles/go-dynamic-json/">http://eagain.net/articles/go-dynamic-json/</a>
-* <a href="http://eagain.net/articles/go-json-kind/">http://eagain.net/articles/go-json-kind/</a>
-
-This package unifies these two in a single Mapper.
-
-You app needs to do three things to take full advantage of this:
-
-1. For every interface you wish to serialize, define a holder struct with some helper methods, like FooerS wraps Fooer in common_test.go
-2. In all structs that include this interface, include the wrapping struct instead.  Functionally, this also fulfills the interface, so except for setting it or casting it to a sub-type it works the same.
-3. Register the interface implementations as in the last init of common_test.go. If you are currently using go-wire, you should be doing this already
-
-The benefits here is you can now run any of the following methods, both for
-efficient storage in our go app, and a common format for rpc / humans.
-
-
-       orig := FooerS{foo}
-       
-       // read/write binary a la tendermint/go-wire
-       bparsed := FooerS{}
-       err := wire.ReadBinaryBytes(
-         wire.BinaryBytes(orig), &bparsed)
-       
-       // read/write json a la encoding/json
-       jparsed := FooerS{}
-       j, err := json.MarshalIndent(orig, "", "\t")
-       err = json.Unmarshal(j, &jparsed)
-
-See <a href="https://github.com/tendermint/go-wire/data/blob/master/common_test.go">https://github.com/tendermint/go-wire/data/blob/master/common_test.go</a> to see
-how to set up your code to use this.
-
-
-
-
-## <a name="pkg-index">Index</a>
-* [Variables](#pkg-variables)
-* [type ByteEncoder](#ByteEncoder)
-* [type Bytes](#Bytes)
-  * [func (b Bytes) MarshalJSON() ([]byte, error)](#Bytes.MarshalJSON)
-  * [func (b *Bytes) UnmarshalJSON(data []byte) error](#Bytes.UnmarshalJSON)
-* [type JSONMapper](#JSONMapper)
-  * [func (m *JSONMapper) FromJSON(data []byte) (interface{}, error)](#JSONMapper.FromJSON)
-  * [func (m *JSONMapper) ToJSON(data interface{}) ([]byte, error)](#JSONMapper.ToJSON)
-* [type Mapper](#Mapper)
-  * [func NewMapper(base interface{}) Mapper](#NewMapper)
-  * [func (m Mapper) RegisterInterface(kind string, b byte, data interface{}) Mapper](#Mapper.RegisterInterface)
-
-
-#### <a name="pkg-files">Package files</a>
-[binary.go](/src/github.com/tendermint/go-wire/data/binary.go) [bytes.go](/src/github.com/tendermint/go-wire/data/bytes.go) [docs.go](/src/github.com/tendermint/go-wire/data/docs.go) [json.go](/src/github.com/tendermint/go-wire/data/json.go) [wrapper.go](/src/github.com/tendermint/go-wire/data/wrapper.go) 
-
-
-
-## <a name="pkg-variables">Variables</a>
-``` go
-var (
-    Encoder       ByteEncoder = hexEncoder{}
-    HexEncoder                = hexEncoder{}
-    B64Encoder                = base64Encoder{base64.URLEncoding}
-    RawB64Encoder             = base64Encoder{base64.RawURLEncoding}
-)
-```
-Encoder is a global setting for all byte encoding
-This is the default.  Please override in the main()/init()
-of your program to change how byte slices are presented
-
-
-
-
-## <a name="ByteEncoder">type</a> [ByteEncoder](/src/target/bytes.go?s=1436:1547#L44)
-``` go
-type ByteEncoder interface {
-    Marshal(bytes []byte) ([]byte, error)
-    Unmarshal(dst *[]byte, src []byte) error
-}
-```
-ByteEncoder handles both the marshalling and unmarshalling of
-an arbitrary byte slice.
-
-All Bytes use the global Encoder set in this package.
-If you want to use this encoding for byte arrays, you can just
-implement a simple custom marshaller for your byte array
-
-
-       type Dings [64]byte
-       
-       func (d Dings) MarshalJSON() ([]byte, error) {
-         return data.Encoder.Marshal(d[:])
-       }
-       
-       func (d *Dings) UnmarshalJSON(data []byte) error {
-         ref := (*d)[:]
-         return data.Encoder.Unmarshal(&ref, data)
-       }
-
-
-
-
-
-
-
-
-
-
-## <a name="Bytes">type</a> [Bytes](/src/target/bytes.go?s=681:698#L16)
-``` go
-type Bytes []byte
-```
-Bytes is a special byte slice that allows us to control the
-serialization format per app.
-
-Thus, basecoin could use hex, another app base64, and a third
-app base58...
-
-
-
-
-
-
-
-
-
-
-### <a name="Bytes.MarshalJSON">func</a> (Bytes) [MarshalJSON](/src/target/bytes.go?s=700:744#L18)
-``` go
-func (b Bytes) MarshalJSON() ([]byte, error)
-```
-
-
-
-### <a name="Bytes.UnmarshalJSON">func</a> (\*Bytes) [UnmarshalJSON](/src/target/bytes.go?s=777:825#L22)
-``` go
-func (b *Bytes) UnmarshalJSON(data []byte) error
-```
-
-
-
-## <a name="JSONMapper">type</a> [JSONMapper](/src/target/json.go?s=80:178#L1)
-``` go
-type JSONMapper struct {
-    // contains filtered or unexported fields
-}
-```
-
-
-
-
-
-
-
-
-
-### <a name="JSONMapper.FromJSON">func</a> (\*JSONMapper) [FromJSON](/src/target/json.go?s=1202:1265#L41)
-``` go
-func (m *JSONMapper) FromJSON(data []byte) (interface{}, error)
-```
-FromJSON will deserialize the output of ToJSON for every registered
-implementation of the interface
-
-
-
-
-### <a name="JSONMapper.ToJSON">func</a> (\*JSONMapper) [ToJSON](/src/target/json.go?s=1814:1875#L67)
-``` go
-func (m *JSONMapper) ToJSON(data interface{}) ([]byte, error)
-```
-ToJson will serialize a registered implementation into a format like:
-
-
-       {
-         "type": "foo",
-         "data": {
-           "name": "dings"
-         }
-       }
-
-this allows us to properly deserialize with FromJSON
-
-
-
-
-## <a name="Mapper">type</a> [Mapper](/src/target/wrapper.go?s=485:535#L5)
-``` go
-type Mapper struct {
-    *JSONMapper
-    // contains filtered or unexported fields
-}
-```
-Mapper is the main entry point in the package.
-
-On init, you should call NewMapper() for each interface type you want
-to support flexible de-serialization, and then
-RegisterInterface() in the init() function for each implementation of these
-interfaces.
-
-Note that unlike go-wire, you can call RegisterInterface separately from
-different locations with each implementation, not all in one place.
-Just be careful not to use the same key or byte, of init will *panic*
-
-
-
-
-
-
-
-### <a name="NewMapper">func</a> [NewMapper](/src/target/wrapper.go?s=747:786#L17)
-``` go
-func NewMapper(base interface{}) Mapper
-```
-NewMapper creates a Mapper.
-
-If you have:
-
-
-       type Foo interface {....}
-       type FooS struct { Foo }
-
-then you should pass in FooS{} in NewMapper, and implementations of Foo
-in RegisterInterface
-
-
-
-
-
-### <a name="Mapper.RegisterInterface">func</a> (Mapper) [RegisterInterface](/src/target/wrapper.go?s=1184:1263#L30)
-``` go
-func (m Mapper) RegisterInterface(kind string, b byte, data interface{}) Mapper
-```
-RegisterInterface should be called once for each implementation of the
-interface that we wish to support.
-
-kind is the type string used in the json representation, while b is the
-type byte used in the go-wire representation. data is one instance of this
-concrete type, like Bar{}
-
-
-
-
-
-
-
-
-- - -
-Generated by [godoc2md](http://godoc.org/github.com/davecheney/godoc2md)

diff --git a/vendor/github.com/tendermint/go-wire/data/binary.go b/vendor/github.com/tendermint/go-wire/data/binary.go
deleted file mode 100644 (file)
index 1e221a4..0000000
--- a/vendor/github.com/tendermint/go-wire/data/binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package data
-
-import (
-       "github.com/pkg/errors"
-       wire "github.com/tendermint/go-wire"
-)
-
-type binaryMapper struct {
-       base  interface{}
-       impls []wire.ConcreteType
-}
-
-func newBinaryMapper(base interface{}) *binaryMapper {
-       return &binaryMapper{
-               base: base,
-       }
-}
-
-// registerImplementation allows you to register multiple concrete types.
-//
-// We call wire.RegisterInterface with the entire (growing list) each time,
-// as we do not know when the end is near.
-func (m *binaryMapper) registerImplementation(data interface{}, kind string, b byte) {
-       m.impls = append(m.impls, wire.ConcreteType{O: data, Byte: b})
-       wire.RegisterInterface(m.base, m.impls...)
-}
-
-// ToWire is a convenience method to serialize with go-wire
-// error is there to keep the same interface as json, but always nil
-func ToWire(o interface{}) ([]byte, error) {
-       return wire.BinaryBytes(o), nil
-}
-
-// FromWire is a convenience method to deserialize with go-wire
-func FromWire(d []byte, o interface{}) error {
-       return errors.WithStack(
-               wire.ReadBinaryBytes(d, o))
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/binary_test.go b/vendor/github.com/tendermint/go-wire/data/binary_test.go
deleted file mode 100644 (file)
index 5ec5933..0000000
--- a/vendor/github.com/tendermint/go-wire/data/binary_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package data_test
-
-import (
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       wire "github.com/tendermint/go-wire"
-)
-
-func TestSimpleBinary(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               foo Fooer
-       }{
-               {foo: Bar{Name: "Fly"}},
-               {foo: Baz{Name: "For Bar"}},
-       }
-
-       for _, tc := range cases {
-               assert.NotEmpty(tc.foo.Foo())
-               wrap := FooerS{tc.foo}
-               parsed := FooerS{}
-               d := wire.BinaryBytes(wrap)
-               require.NotEmpty(d)
-               err := wire.ReadBinaryBytes(d, &parsed)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.foo.Foo(), parsed.Foo())
-       }
-}
-
-func TestNestedBinary(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               expected string
-               foo      Fooer
-       }{
-               {"Bar Fly", Bar{Name: "Fly"}},
-               {"Foz Baz", Baz{Name: "For Bar"}},
-               {"My: Bar None", Nested{"My", FooerS{Bar{"None"}}}},
-       }
-
-       for _, tc := range cases {
-               assert.Equal(tc.expected, tc.foo.Foo())
-               wrap := FooerS{tc.foo}
-               parsed := FooerS{}
-               d := wire.BinaryBytes(wrap)
-               require.NotEmpty(d)
-               err := wire.ReadBinaryBytes(d, &parsed)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.expected, parsed.Foo())
-       }
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/bytes.go b/vendor/github.com/tendermint/go-wire/data/bytes.go
deleted file mode 100644 (file)
index c362c09..0000000
--- a/vendor/github.com/tendermint/go-wire/data/bytes.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package data
-
-import (
-       "encoding/base64"
-       "encoding/hex"
-       "encoding/json"
-       "strings"
-
-       "github.com/pkg/errors"
-)
-
-// Encoder is a global setting for all byte encoding
-// This is the default.  Please override in the main()/init()
-// of your program to change how byte slices are presented
-//
-// In addition to these implementation, you can also find
-// BTCEncoder and FlickrEncoder that use base58 variants in
-// github.com/tendermint/go-wire/data/base58
-var (
-       Encoder       ByteEncoder = hexEncoder{}
-       HexEncoder                = hexEncoder{}
-       B64Encoder                = base64Encoder{base64.URLEncoding}
-       RawB64Encoder             = base64Encoder{base64.RawURLEncoding}
-)
-
-// Bytes is a special byte slice that allows us to control the
-// serialization format per app.
-//
-// Thus, basecoin could use hex, another app base64, and a third
-// app base58...
-type Bytes []byte
-
-func (b Bytes) MarshalJSON() ([]byte, error) {
-       return Encoder.Marshal(b)
-}
-
-func (b *Bytes) UnmarshalJSON(data []byte) error {
-       ref := (*[]byte)(b)
-       return Encoder.Unmarshal(ref, data)
-}
-
-// Allow it to fulfill various interfaces in light-client, etc...
-func (b Bytes) Bytes() []byte {
-       return b
-}
-
-// String gets a simple string for printing (the json output minus quotes)
-func (b Bytes) String() string {
-       raw, err := Encoder.Marshal(b)
-       l := len(raw)
-       if err != nil || l < 2 {
-               return "Bytes<?????>"
-       }
-       return string(raw[1 : l-1])
-}
-
-// ByteEncoder handles both the marshalling and unmarshalling of
-// an arbitrary byte slice.
-//
-// All Bytes use the global Encoder set in this package.
-// If you want to use this encoding for byte arrays, you can just
-// implement a simple custom marshaller for your byte array
-//
-//   type Dings [64]byte
-//
-//   func (d Dings) MarshalJSON() ([]byte, error) {
-//     return data.Encoder.Marshal(d[:])
-//   }
-//
-//   func (d *Dings) UnmarshalJSON(enc []byte) error {
-//     var ref []byte
-//     err := data.Encoder.Unmarshal(&ref, enc)
-//     copy(d[:], ref)
-//     return err
-//   }
-type ByteEncoder interface {
-       Marshal(bytes []byte) ([]byte, error)
-       Unmarshal(dst *[]byte, src []byte) error
-}
-
-// hexEncoder implements ByteEncoder encoding the slice as a hexidecimal
-// string
-type hexEncoder struct{}
-
-var _ ByteEncoder = hexEncoder{}
-
-func (_ hexEncoder) Unmarshal(dst *[]byte, src []byte) (err error) {
-       var s string
-       err = json.Unmarshal(src, &s)
-       if err != nil {
-               return errors.Wrap(err, "parse string")
-       }
-       // and interpret that string as hex
-       *dst, err = hex.DecodeString(s)
-       return err
-}
-
-func (_ hexEncoder) Marshal(bytes []byte) ([]byte, error) {
-       s := strings.ToUpper(hex.EncodeToString(bytes))
-       return json.Marshal(s)
-}
-
-// base64Encoder implements ByteEncoder encoding the slice as
-// base64 url-safe encoding
-type base64Encoder struct {
-       *base64.Encoding
-}
-
-var _ ByteEncoder = base64Encoder{}
-
-func (e base64Encoder) Unmarshal(dst *[]byte, src []byte) (err error) {
-       var s string
-       err = json.Unmarshal(src, &s)
-       if err != nil {
-               return errors.Wrap(err, "parse string")
-       }
-       *dst, err = e.DecodeString(s)
-       return err
-}
-
-func (e base64Encoder) Marshal(bytes []byte) ([]byte, error) {
-       s := e.EncodeToString(bytes)
-       return json.Marshal(s)
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/bytes_test.go b/vendor/github.com/tendermint/go-wire/data/bytes_test.go
deleted file mode 100644 (file)
index 4b8cb8e..0000000
--- a/vendor/github.com/tendermint/go-wire/data/bytes_test.go
+++ /dev/null
@@ -1,243 +0,0 @@
-package data_test
-
-import (
-       "encoding/json"
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       data "github.com/tendermint/go-wire/data"
-)
-
-func TestEncoders(t *testing.T) {
-       assert := assert.New(t)
-
-       hex := data.HexEncoder
-       b64 := data.B64Encoder
-       rb64 := data.RawB64Encoder
-       cases := []struct {
-               encoder         data.ByteEncoder
-               input, expected []byte
-       }{
-               // hexidecimal
-               {hex, []byte(`"1A2B3C4D"`), []byte{0x1a, 0x2b, 0x3c, 0x4d}},
-               {hex, []byte(`"DE14"`), []byte{0xde, 0x14}},
-               // these are errors
-               {hex, []byte(`0123`), nil},     // not in quotes
-               {hex, []byte(`"dewq12"`), nil}, // invalid chars
-               {hex, []byte(`"abc"`), nil},    // uneven length
-
-               // base64
-               {b64, []byte(`"Zm9v"`), []byte("foo")},
-               {b64, []byte(`"RCEuM3M="`), []byte("D!.3s")},
-               // make sure url encoding!
-               {b64, []byte(`"D4_a--w="`), []byte{0x0f, 0x8f, 0xda, 0xfb, 0xec}},
-               // these are errors
-               {b64, []byte(`"D4/a++1="`), nil}, // non-url encoding
-               {b64, []byte(`0123`), nil},       // not in quotes
-               {b64, []byte(`"hey!"`), nil},     // invalid chars
-               {b64, []byte(`"abc"`), nil},      // length%4 != 0
-
-               // raw base64
-               {rb64, []byte(`"Zm9v"`), []byte("foo")},
-               {rb64, []byte(`"RCEuM3M"`), []byte("D!.3s")},
-               // make sure url encoding!
-               {rb64, []byte(`"D4_a--w"`), []byte{0x0f, 0x8f, 0xda, 0xfb, 0xec}},
-               // these are errors
-               {rb64, []byte(`"D4/a++1"`), nil}, // non-url encoding
-               {rb64, []byte(`0123`), nil},      // not in quotes
-               {rb64, []byte(`"hey!"`), nil},    // invalid chars
-               {rb64, []byte(`"abc="`), nil},    // with padding
-
-       }
-
-       for _, tc := range cases {
-               var output []byte
-               err := tc.encoder.Unmarshal(&output, tc.input)
-               if tc.expected == nil {
-                       assert.NotNil(err, tc.input)
-               } else if assert.Nil(err, "%s: %+v", tc.input, err) {
-                       assert.Equal(tc.expected, output, tc.input)
-                       rev, err := tc.encoder.Marshal(tc.expected)
-                       if assert.Nil(err, tc.input) {
-                               assert.Equal(tc.input, rev)
-                       }
-               }
-       }
-}
-
-func TestString(t *testing.T) {
-       assert := assert.New(t)
-
-       hex := data.HexEncoder
-       b64 := data.B64Encoder
-       rb64 := data.RawB64Encoder
-       cases := []struct {
-               encoder  data.ByteEncoder
-               expected string
-               input    []byte
-       }{
-               // hexidecimal
-               {hex, "1A2B3C4D", []byte{0x1a, 0x2b, 0x3c, 0x4d}},
-               {hex, "DE14", []byte{0xde, 0x14}},
-               {b64, "RCEuM3M=", []byte("D!.3s")},
-               {rb64, "D4_a--w", []byte{0x0f, 0x8f, 0xda, 0xfb, 0xec}},
-       }
-       for _, tc := range cases {
-               data.Encoder = tc.encoder
-               b := data.Bytes(tc.input)
-               assert.Equal(tc.expected, b.String())
-       }
-}
-
-// BData can be encoded/decoded
-type BData struct {
-       Count int
-       Data  data.Bytes
-}
-
-// BView is to unmarshall and check the encoding
-type BView struct {
-       Count int
-       Data  string
-}
-
-func TestBytes(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               encoder  data.ByteEncoder
-               data     data.Bytes
-               expected string
-       }{
-               {data.HexEncoder, []byte{0x1a, 0x2b, 0x3c, 0x4d}, "1A2B3C4D"},
-               {data.B64Encoder, []byte("D!.3s"), "RCEuM3M="},
-               {data.RawB64Encoder, []byte("D!.3s"), "RCEuM3M"},
-       }
-
-       for i, tc := range cases {
-               data.Encoder = tc.encoder
-               // encode the data
-               in := BData{Count: 15, Data: tc.data}
-               d, err := json.Marshal(in)
-               require.Nil(err, "%d: %+v", i, err)
-               // recover the data
-               out := BData{}
-               err = json.Unmarshal(d, &out)
-               require.Nil(err, "%d: %+v", i, err)
-               assert.Equal(in.Count, out.Count, "%d", i)
-               assert.Equal(in.Data, out.Data, "%d", i)
-               // check the encoding
-               view := BView{}
-               err = json.Unmarshal(d, &view)
-               require.Nil(err, "%d: %+v", i, err)
-               assert.Equal(tc.expected, view.Data)
-       }
-}
-
-/*** this is example code for the byte array ***/
-
-type Dings [5]byte
-
-func (d Dings) MarshalJSON() ([]byte, error) {
-       return data.Encoder.Marshal(d[:])
-}
-
-func (d *Dings) UnmarshalJSON(enc []byte) error {
-       var ref []byte
-       err := data.Encoder.Unmarshal(&ref, enc)
-       copy(d[:], ref)
-       return err
-}
-
-func TestByteArray(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       d := Dings{}
-       copy(d[:], []byte("D!.3s"))
-
-       cases := []struct {
-               encoder  data.ByteEncoder
-               data     Dings
-               expected string
-       }{
-               {data.HexEncoder, Dings{0x1a, 0x2b, 0x3c, 0x4d, 0x5e}, "1A2B3C4D5E"},
-               {data.B64Encoder, d, "RCEuM3M="},
-               {data.RawB64Encoder, d, "RCEuM3M"},
-       }
-
-       for i, tc := range cases {
-               data.Encoder = tc.encoder
-               // encode the data
-               d, err := json.Marshal(tc.data)
-               require.Nil(err, "%d: %+v", i, err)
-               // recover the data
-               out := Dings{}
-               err = json.Unmarshal(d, &out)
-               require.Nil(err, "%d: %+v", i, err)
-               assert.Equal(tc.data, out, "%d", i)
-               // check the encoding
-               view := ""
-               err = json.Unmarshal(d, &view)
-               require.Nil(err, "%d: %+v", i, err)
-               assert.Equal(tc.expected, view)
-       }
-
-       // Test invalid data
-       invalid := []byte(`"food"`)
-       data.Encoder = data.HexEncoder
-       ding := Dings{1, 2, 3, 4, 5}
-       parsed := ding
-       require.Equal(ding, parsed)
-       // on a failed parsing, we don't overwrite any data
-       err := json.Unmarshal(invalid, &parsed)
-       require.NotNil(err)
-       assert.Equal(ding, parsed)
-}
-
-// I guess this is "proper"?  Seems funny though...
-// echo -n "deadbQ==" | base64 -D | od -H
-// echo -n "deadb9==" | base64 -D | od -H
-// both ---> 6f9de675
-// func TestWTF(t *testing.T) {
-//     assert := assert.New(t)
-//     url := base64.URLEncoding
-//     std := base64.StdEncoding
-
-//     cases := []struct {
-//             s string
-//             e *base64.Encoding
-//     }{
-//             // these fail...
-//             {"D4_a--1=", url},
-//             {"D4_a0-1=", url},
-//             {"D4_a__1=", url},
-//             {"D4/a++1=", std},
-//             {"D4_a0-9=", url},
-//             {"Finey-1=", url},
-//             {"Finey41=", url},
-//             {"Finey+1=", std},
-//             {"Finey+1+", std},
-//             {"Fineyo1=", url},
-//             // these work
-//             {"D4_a0-A=", url},
-//             {"D4_a0BA=", url},
-//             // more random ending in [1-9]=
-//             {"deadbe7=", url},
-//             {"deadb7==", url},
-//             {"deadbe==", url},
-//             // wait, 0= is safe...
-//             {"deadbe0=", url},
-//             {"deadAA2=", std},
-//             {"deadAA9=", std},
-//             {"deadaa9=", url},
-//     }
-
-//     for _, tc := range cases {
-//             b, err := tc.e.DecodeString(tc.s)
-//             if assert.Nil(err, "%#v", err) {
-//                     s := tc.e.EncodeToString(b)
-//                     assert.Equal(tc.s, s)
-//             }
-//     }
-// }

diff --git a/vendor/github.com/tendermint/go-wire/data/common_test.go b/vendor/github.com/tendermint/go-wire/data/common_test.go
deleted file mode 100644 (file)
index c8f9a80..0000000
--- a/vendor/github.com/tendermint/go-wire/data/common_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package data_test
-
-import (
-       "strings"
-
-       data "github.com/tendermint/go-wire/data"
-)
-
-/** These are some sample types to test parsing **/
-
-type Fooer interface {
-       Foo() string
-}
-
-type Bar struct {
-       Name string `json:"name"`
-}
-
-func (b Bar) Foo() string {
-       return "Bar " + b.Name
-}
-
-type Baz struct {
-       Name string `json:"name"`
-}
-
-func (b Baz) Foo() string {
-       return strings.Replace(b.Name, "r", "z", -1)
-}
-
-type Nested struct {
-       Prefix string `json:"prefix"`
-       Sub    FooerS `json:"sub"`
-}
-
-func (n Nested) Foo() string {
-       return n.Prefix + ": " + n.Sub.Foo()
-}
-
-/** This is parse code: todo - autogenerate **/
-
-var fooersParser data.Mapper
-
-type FooerS struct {
-       Fooer
-}
-
-func (f FooerS) MarshalJSON() ([]byte, error) {
-       return fooersParser.ToJSON(f.Fooer)
-}
-
-func (f *FooerS) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := fooersParser.FromJSON(data)
-       if err == nil {
-               f.Fooer = parsed.(Fooer)
-       }
-       return
-}
-
-// Set is a helper to deal with wrapped interfaces
-func (f *FooerS) Set(foo Fooer) {
-       f.Fooer = foo
-}
-
-/** end TO-BE auto-generated code **/
-
-/** This connects our code with the auto-generated helpers **/
-
-// this init must come after the above init (which should be in a file from import)
-func init() {
-       fooersParser = data.NewMapper(FooerS{}).
-               RegisterImplementation(Bar{}, "bar", 0x01).
-               RegisterImplementation(Baz{}, "baz", 0x02).
-               RegisterImplementation(Nested{}, "nest", 0x03)
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/docs.go b/vendor/github.com/tendermint/go-wire/data/docs.go
deleted file mode 100644 (file)
index c687f47..0000000
--- a/vendor/github.com/tendermint/go-wire/data/docs.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Data is designed to provide a standard interface and helper functions to
-easily allow serialization and deserialization of your data structures
-in both binary and json representations.
-
-This is commonly needed for interpreting transactions or stored data in the
-abci app, as well as accepting json input in the light-client proxy. If we
-can standardize how we pass data around the app, we can also allow more
-extensions, like data storage that can interpret the meaning of the []byte
-passed in, and use that to index multiple fields for example.
-
-Serialization of data is pretty automatic using standard json and go-wire
-encoders.  The main issue is deserialization, especially when using interfaces
-where there are many possible concrete types.
-
-go-wire handles this by registering the types and providing a custom
-deserializer:
-
-  var _ = wire.RegisterInterface(
-    struct{ PubKey }{},
-    wire.ConcreteType{PubKeyEd25519{}, PubKeyTypeEd25519},
-    wire.ConcreteType{PubKeySecp256k1{}, PubKeyTypeSecp256k1},
-  )
-
-  func PubKeyFromBytes(pubKeyBytes []byte) (pubKey PubKey, err error) {
-    err = wire.ReadBinaryBytes(pubKeyBytes, &pubKey)
-    return
-  }
-
-  func (pubKey PubKeyEd25519) Bytes() []byte {
-    return wire.BinaryBytes(struct{ PubKey }{pubKey})
-  }
-
-This prepends a type-byte to the binary representation upon serialization and
-using that byte to switch between various representations on deserialization.
-go-wire also supports something similar in json, but it leads to kind of ugly
-mixed-types arrays, and requires using the go-wire json parser, which is
-limited relative to the standard library encoding/json library.
-
-In json, the typical idiom is to use a type string and message data:
-
-  {
-    "type": "this part tells you how to interpret the message",
-    "data": ...the actual message is here, in some kind of json...
-  }
-
-I took inspiration from two blog posts, that demonstrate how to use this
-to build (de)serialization in a go-wire like way.
-
-* http://eagain.net/articles/go-dynamic-json/
-* http://eagain.net/articles/go-json-kind/
-
-This package unifies these two in a single Mapper.
-
-You app needs to do three things to take full advantage of this:
-
-1. For every interface you wish to serialize, define a holder struct with some helper methods, like FooerS wraps Fooer in common_test.go
-2. In all structs that include this interface, include the wrapping struct instead.  Functionally, this also fulfills the interface, so except for setting it or casting it to a sub-type it works the same.
-3. Register the interface implementations as in the last init of common_test.go. If you are currently using go-wire, you should be doing this already
-
-The benefits here is you can now run any of the following methods, both for
-efficient storage in our go app, and a common format for rpc / humans.
-
-  orig := FooerS{foo}
-
-  // read/write binary a la tendermint/go-wire
-  bparsed := FooerS{}
-  err := wire.ReadBinaryBytes(
-    wire.BinaryBytes(orig), &bparsed)
-
-  // read/write json a la encoding/json
-  jparsed := FooerS{}
-  j, err := json.MarshalIndent(orig, "", "\t")
-  err = json.Unmarshal(j, &jparsed)
-
-See https://github.com/tendermint/go-wire/data/blob/master/common_test.go to see
-how to set up your code to use this.
-*/
-package data

diff --git a/vendor/github.com/tendermint/go-wire/data/json.go b/vendor/github.com/tendermint/go-wire/data/json.go
deleted file mode 100644 (file)
index 5e6c156..0000000
--- a/vendor/github.com/tendermint/go-wire/data/json.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package data
-
-import (
-       "bytes"
-       "encoding/json"
-       "reflect"
-
-       "github.com/pkg/errors"
-)
-
-type jsonMapper struct {
-       kindToType map[string]reflect.Type
-       typeToKind map[reflect.Type]string
-}
-
-func newJsonMapper(base interface{}) *jsonMapper {
-       return &jsonMapper{
-               kindToType: map[string]reflect.Type{},
-               typeToKind: map[reflect.Type]string{},
-       }
-}
-
-// ToJSON is a convenience method to serialize with encoding/json
-func ToJSON(o interface{}) ([]byte, error) {
-       d, err := json.MarshalIndent(o, "", "  ")
-       return d, errors.WithStack(err)
-}
-
-// FromJSON is a convenience method to deserialize with encoding/json
-func FromJSON(d []byte, o interface{}) error {
-       return errors.WithStack(
-               json.Unmarshal(d, o))
-}
-
-// registerImplementation allows you to register multiple concrete types.
-//
-// Returns itself to allow calls to be chained
-func (m *jsonMapper) registerImplementation(data interface{}, kind string, b byte) {
-       typ := reflect.TypeOf(data)
-       m.kindToType[kind] = typ
-       m.typeToKind[typ] = kind
-}
-
-// getTarget returns a pointer to an allocated object of the proper kind
-func (m *jsonMapper) getTarget(kind string) (interface{}, error) {
-       typ, ok := m.kindToType[kind]
-       if !ok {
-               return nil, errors.Errorf("Unmarshaling into unknown type: %s", kind)
-       }
-       target := reflect.New(typ).Interface()
-       return target, nil
-}
-
-func (m *jsonMapper) getKind(obj interface{}) (string, error) {
-       typ := reflect.TypeOf(obj)
-       kind, ok := m.typeToKind[typ]
-       if !ok {
-               return "", errors.Errorf("Marshalling from unknown type: %#v", obj)
-       }
-       return kind, nil
-}
-
-// FromJSON will deserialize the output of ToJSON for every registered
-// implementation of the interface
-func (m *jsonMapper) FromJSON(data []byte) (interface{}, error) {
-       // handle null specially
-       if bytes.Equal(data, []byte("null")) {
-               return nil, nil
-       }
-       e := envelope{
-               Data: &json.RawMessage{},
-       }
-       err := json.Unmarshal(data, &e)
-       if err != nil {
-               return nil, err
-       }
-       // switch on the type, then unmarshal into that
-       bytes := *e.Data.(*json.RawMessage)
-       res, err := m.getTarget(e.Kind)
-       if err != nil {
-               return nil, err
-       }
-       err = json.Unmarshal(bytes, &res)
-       // getTarget returned a pointer for Unmarshall, now dereference it
-       res = reflect.ValueOf(res).Elem().Interface()
-       return res, err
-}
-
-// ToJson will serialize a registered implementation into a format like:
-//   {
-//     "type": "foo",
-//     "data": {
-//       "name": "dings"
-//     }
-//   }
-// this allows us to properly deserialize with FromJSON
-func (m *jsonMapper) ToJSON(data interface{}) ([]byte, error) {
-       // handle null specially
-       if data == nil {
-               return []byte("null"), nil
-       }
-       raw, err := json.Marshal(data)
-       if err != nil {
-               return nil, errors.WithStack(err)
-       }
-       kind, err := m.getKind(data)
-       if err != nil {
-               return nil, err
-       }
-       msg := json.RawMessage(raw)
-       e := envelope{
-               Kind: kind,
-               Data: &msg,
-       }
-       return json.Marshal(e)
-}
-
-// envelope lets us switch on type
-type envelope struct {
-       Kind string      `json:"type"`
-       Data interface{} `json:"data"`
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/json_test.go b/vendor/github.com/tendermint/go-wire/data/json_test.go
deleted file mode 100644 (file)
index 0ecdeb6..0000000
--- a/vendor/github.com/tendermint/go-wire/data/json_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package data_test
-
-import (
-       "encoding/json"
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       data "github.com/tendermint/go-wire/data"
-)
-
-func TestSimpleJSON(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               foo Fooer
-       }{
-               {foo: Bar{Name: "Fly"}},
-               {foo: Baz{Name: "For Bar"}},
-       }
-
-       for _, tc := range cases {
-               assert.NotEmpty(tc.foo.Foo())
-               wrap := FooerS{tc.foo}
-               parsed := FooerS{}
-               d, err := json.Marshal(wrap)
-               require.Nil(err, "%+v", err)
-               err = json.Unmarshal(d, &parsed)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.foo.Foo(), parsed.Foo())
-       }
-}
-
-func TestNestedJSON(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       cases := []struct {
-               expected string
-               foo      Fooer
-       }{
-               {"Bar Fly", Bar{Name: "Fly"}},
-               {"Foz Baz", Baz{Name: "For Bar"}},
-               {"My: Bar None", Nested{"My", FooerS{Bar{"None"}}}},
-       }
-
-       for _, tc := range cases {
-               assert.Equal(tc.expected, tc.foo.Foo())
-               wrap := FooerS{tc.foo}
-               parsed := FooerS{}
-               // also works with indentation
-               d, err := data.ToJSON(wrap)
-               require.Nil(err, "%+v", err)
-               err = json.Unmarshal(d, &parsed)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.expected, parsed.Foo())
-       }
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/pointer_test.go b/vendor/github.com/tendermint/go-wire/data/pointer_test.go
deleted file mode 100644 (file)
index 5bc467d..0000000
--- a/vendor/github.com/tendermint/go-wire/data/pointer_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package data_test
-
-import (
-       "fmt"
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       data "github.com/tendermint/go-wire/data"
-)
-
-type Ptr interface {
-       Point() string
-}
-
-// implementations
-type PStr string
-type PInt int
-
-func (p *PStr) Point() string {
-       if p == nil {
-               return "snil"
-       }
-       return string(*p)
-}
-
-func (p *PInt) Point() string {
-       if p == nil {
-               return "inil"
-       }
-       return fmt.Sprintf("int: %d", int(*p))
-}
-
-var ptrMapper data.Mapper
-
-// we register pointers to those structs, as they fulfill the interface
-// but mainly so we can test how they handle nil values in the struct
-func init() {
-       ps, pi := PStr(""), PInt(0)
-       ptrMapper = data.NewMapper(KeyS{}).
-               RegisterImplementation(&ps, "str", 5).
-               RegisterImplementation(&pi, "int", 25)
-}
-
-// PtrS adds json serialization to Ptr
-type PtrS struct {
-       Ptr
-}
-
-func (p PtrS) MarshalJSON() ([]byte, error) {
-       return ptrMapper.ToJSON(p.Ptr)
-}
-
-func (p *PtrS) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := ptrMapper.FromJSON(data)
-       if err == nil && parsed != nil {
-               p.Ptr = parsed.(Ptr)
-       }
-       return
-}
-
-// TestEncodingNil happens when we have a nil inside the embedding struct
-func TestEncodingNil(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       s := PStr("foo")
-       i := PInt(567)
-       ptrs := []Ptr{&s, &i, nil}
-
-       for i, p := range ptrs {
-               wrap := PtrS{p}
-
-               js, err := data.ToJSON(wrap)
-               require.Nil(err, "%d: %+v", i, err)
-
-               parsed := PtrS{}
-               err = data.FromJSON(js, &parsed)
-               require.Nil(err, "%d: %+v", i, err)
-               if wrap.Ptr != nil {
-                       assert.Equal(parsed.Point(), wrap.Point())
-               }
-               assert.Equal(parsed.Ptr, wrap.Ptr)
-       }
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/text_test.go b/vendor/github.com/tendermint/go-wire/data/text_test.go
deleted file mode 100644 (file)
index dfe6f1b..0000000
--- a/vendor/github.com/tendermint/go-wire/data/text_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package data_test
-
-import (
-       "testing"
-
-       "github.com/stretchr/testify/assert"
-       "github.com/stretchr/testify/require"
-       data "github.com/tendermint/go-wire/data"
-)
-
-// Key
-type Key interface{}
-
-// implementations
-type Cool struct{ data.Bytes }
-type Lame struct{ data.Bytes }
-
-var keyMapper data.Mapper
-
-// register both private key types with go-wire/data (and thus go-wire)
-func init() {
-       keyMapper = data.NewMapper(KeyS{}).
-               RegisterImplementation(Cool{}, "cool", 1).
-               RegisterImplementation(Lame{}, "lame", 88)
-}
-
-// KeyS adds json serialization to Key
-type KeyS struct {
-       Key
-}
-
-func (p KeyS) MarshalJSON() ([]byte, error) {
-       return keyMapper.ToJSON(p.Key)
-}
-
-func (p *KeyS) UnmarshalJSON(data []byte) (err error) {
-       parsed, err := keyMapper.FromJSON(data)
-       if err == nil {
-               p.Key = parsed.(Key)
-       }
-       return
-}
-
-func TestSimpleText(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       data.Encoder = data.HexEncoder
-       cases := []struct {
-               key      Key
-               expected string
-       }{
-               {key: Cool{data.Bytes{0x42, 0x69}}, expected: "cool:4269"},
-               {key: Lame{data.Bytes{0x70, 0xA3, 0x1e}}, expected: "lame:70A31E"},
-       }
-
-       for _, tc := range cases {
-               wrap := KeyS{tc.key}
-               // check json
-               _, err := data.ToJSON(wrap)
-               require.Nil(err, "%+v", err)
-               // check text
-               text, err := data.ToText(wrap)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.expected, text)
-       }
-}
-
-func TestBytesTest(t *testing.T) {
-       assert, require := assert.New(t), require.New(t)
-
-       data.Encoder = data.HexEncoder
-       cases := []struct {
-               bytes    data.Bytes
-               expected string
-       }{
-               {data.Bytes{0x34, 0x54}, "3454"},
-               {data.Bytes{}, ""},
-               {data.Bytes{0xde, 0xad, 0xbe, 0x66}, "DEADBE66"},
-       }
-
-       for _, tc := range cases {
-               text, err := data.ToText(tc.bytes)
-               require.Nil(err, "%+v", err)
-               assert.Equal(tc.expected, text)
-       }
-}

diff --git a/vendor/github.com/tendermint/go-wire/data/wrapper.go b/vendor/github.com/tendermint/go-wire/data/wrapper.go
deleted file mode 100644 (file)
index 280ed89..0000000
--- a/vendor/github.com/tendermint/go-wire/data/wrapper.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package data
-
-import "fmt"
-
-/*
-Mapper is the main entry point in the package.
-
-On init, you should call NewMapper() for each interface type you want
-to support flexible de-serialization, and then
-RegisterImplementation() in the init() function for each implementation of these
-interfaces.
-
-Note that unlike go-wire, you can call RegisterImplementation separately from
-different locations with each implementation, not all in one place.
-Just be careful not to use the same key or byte, of init will *panic*
-*/
-type Mapper struct {
-       *jsonMapper
-       *binaryMapper
-}
-
-// NewMapper creates a Mapper.
-//
-// If you have:
-//   type Foo interface {....}
-//   type FooS struct { Foo }
-// then you should pass in FooS{} in NewMapper, and implementations of Foo
-// in RegisterImplementation
-func NewMapper(base interface{}) Mapper {
-       return Mapper{
-               jsonMapper:   newJsonMapper(base),
-               binaryMapper: newBinaryMapper(base),
-       }
-}
-
-// RegisterImplementation should be called once for each implementation of the
-// interface that we wish to support.
-//
-// kind is the type string used in the json representation, while b is the
-// type byte used in the go-wire representation. data is one instance of this
-// concrete type, like Bar{}
-func (m Mapper) RegisterImplementation(data interface{}, kind string, b byte) Mapper {
-       m.jsonMapper.registerImplementation(data, kind, b)
-       m.binaryMapper.registerImplementation(data, kind, b)
-       return m
-}
-
-// ToText is a rather special-case serialization for cli, especially for []byte
-// interfaces
-//
-// It tries to serialize as json, and the result looks like:
-//   { "type": "string", "data": "string" }
-// Then it will return "<type>:<data>"
-//
-// Main usecase is serializing eg. crypto.PubKeyS as "ed25119:a1b2c3d4..."
-// for displaying in cli tools.
-//
-// It also supports encoding data.Bytes to a string using the proper codec
-// (or anything else that has a marshals to a string)
-func ToText(o interface{}) (string, error) {
-       d, err := ToJSON(o)
-       if err != nil {
-               return "", err
-       }
-
-       // try to recover as a string (data.Bytes case)
-       var s string
-       err = FromJSON(d, &s)
-       if err == nil {
-               return s, nil
-       }
-
-       // if not, then try to recover as an interface (crypto.*S case)
-       text := textEnv{}
-       err = FromJSON(d, &text)
-       if err != nil {
-               return "", err
-       }
-       res := fmt.Sprintf("%s:%s", text.Kind, text.Data)
-       return res, nil
-}
-
-// textEnv lets us parse an envelope if the data was output as string
-// (either text, or a serialized []byte)
-type textEnv struct {
-       Kind string `json:"type"`
-       Data string `json:"data"`
-}