update vendored miekg/dns for Client.Dialer

diff --git a/vendor/github.com/miekg/dns/CONTRIBUTORS b/vendor/github.com/miekg/dns/CONTRIBUTORS
index f77e8a895f91bb1624ca2a8ede0d4961418822f4..5903779d81fa7f38363a21aa818e1c7c9086fa49 100644 (file)
--- a/vendor/github.com/miekg/dns/CONTRIBUTORS
+++ b/vendor/github.com/miekg/dns/CONTRIBUTORS
@@ -7,3 +7,4 @@ Marek Majkowski
 Peter van Dijk
 Omri Bahumi
 Alex Sergeyev
+James Hartig

diff --git a/vendor/github.com/miekg/dns/Gopkg.lock b/vendor/github.com/miekg/dns/Gopkg.lock
new file mode 100644 (file)
index 0000000..0c73a64
--- /dev/null
+++ b/vendor/github.com/miekg/dns/Gopkg.lock
@@ -0,0 +1,21 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["ed25519","ed25519/internal/edwards25519"]
+  revision = "b080dc9a8c480b08e698fb1219160d598526310f"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["bpf","internal/iana","internal/socket","ipv4","ipv6"]
+  revision = "894f8ed5849b15b810ae41e9590a0d05395bba27"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "c4abc38abaeeeeb9be92455c9c02cae32841122b8982aaa067ef25bb8e86ff9d"
+  solver-name = "gps-cdcl"
+  solver-version = 1

diff --git a/vendor/github.com/miekg/dns/Gopkg.toml b/vendor/github.com/miekg/dns/Gopkg.toml
new file mode 100644 (file)
index 0000000..2f655b2
--- /dev/null
+++ b/vendor/github.com/miekg/dns/Gopkg.toml
@@ -0,0 +1,26 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"

diff --git a/vendor/github.com/miekg/dns/Makefile.fuzz b/vendor/github.com/miekg/dns/Makefile.fuzz
new file mode 100644 (file)
index 0000000..dc158c4
--- /dev/null
+++ b/vendor/github.com/miekg/dns/Makefile.fuzz
@@ -0,0 +1,33 @@
+# Makefile for fuzzing
+#
+# Use go-fuzz and needs the tools installed.
+# See https://blog.cloudflare.com/dns-parser-meet-go-fuzzer/
+#
+# Installing go-fuzz:
+# $ make -f Makefile.fuzz get
+# Installs:
+# * github.com/dvyukov/go-fuzz/go-fuzz
+# * get github.com/dvyukov/go-fuzz/go-fuzz-build
+
+all: build
+
+.PHONY: build
+build:
+       go-fuzz-build -tags fuzz github.com/miekg/dns
+
+.PHONY: build-newrr
+build-newrr:
+       go-fuzz-build -func FuzzNewRR -tags fuzz github.com/miekg/dns
+
+.PHONY: fuzz
+fuzz:
+       go-fuzz -bin=dns-fuzz.zip -workdir=fuzz
+
+.PHONY: get
+get:
+       go get github.com/dvyukov/go-fuzz/go-fuzz
+       go get github.com/dvyukov/go-fuzz/go-fuzz-build
+
+.PHONY: clean
+clean:
+       rm *-fuzz.zip

diff --git a/vendor/github.com/miekg/dns/Makefile.release b/vendor/github.com/miekg/dns/Makefile.release
new file mode 100644 (file)
index 0000000..4069eb0
--- /dev/null
+++ b/vendor/github.com/miekg/dns/Makefile.release
@@ -0,0 +1,51 @@
+# Makefile for releasing.
+#
+# The release is controlled from version.go. The version found there is
+# used to tag the git repo, we're not building any artifects so there is nothing
+# to upload to github.
+#
+# * Up the version in version.go
+# * Run: make -f Makefile.release release
+#   * will *commit* your change with 'Release $VERSION'
+#   * push to github
+#
+
+define GO
+//+build ignore
+
+package main
+
+import (
+       "fmt"
+
+       "github.com/miekg/dns"
+)
+
+func main() {
+       fmt.Println(dns.Version.String())
+}
+endef
+
+$(file > version_release.go,$(GO))
+VERSION:=$(shell go run version_release.go)
+TAG="v$(VERSION)"
+
+all:
+       @echo Use the \'release\' target to start a release $(VERSION)
+       rm -f version_release.go
+
+.PHONY: release
+release: commit push
+       @echo Released $(VERSION)
+       rm -f version_release.go
+
+.PHONY: commit
+commit:
+       @echo Committing release $(VERSION)
+       git commit -am"Release $(VERSION)"
+       git tag $(TAG)
+
+.PHONY: push
+push:
+       @echo Pushing release $(VERSION) to master
+       git push --tags

diff --git a/vendor/github.com/miekg/dns/README.md b/vendor/github.com/miekg/dns/README.md
index 32a49cbf50c4e640e6a4505acd2ea00fda2f4675..e6dbad25d4c3caf335b682eea0eb3bd2bcb0d158 100644 (file)
--- a/vendor/github.com/miekg/dns/README.md
+++ b/vendor/github.com/miekg/dns/README.md
@@ -1,19 +1,19 @@
 [![Build Status](https://travis-ci.org/miekg/dns.svg?branch=master)](https://travis-ci.org/miekg/dns)
+[![Code Coverage](https://img.shields.io/codecov/c/github/miekg/dns/master.svg)](https://codecov.io/github/miekg/dns?branch=master)
+[![Go Report Card](https://goreportcard.com/badge/github.com/miekg/dns)](https://goreportcard.com/report/miekg/dns)
 [![](https://godoc.org/github.com/miekg/dns?status.svg)](https://godoc.org/github.com/miekg/dns)
 
 # Alternative (more granular) approach to a DNS library
 
 > Less is more.
 
-Complete and usable DNS library. All widely used Resource Records are
-supported, including the DNSSEC types. It follows a lean and mean philosophy.
-If there is stuff you should know as a DNS programmer there isn't a convenience
-function for it. Server side and client side programming is supported, i.e. you
-can build servers and resolvers with it.
+Complete and usable DNS library. All widely used Resource Records are supported, including the
+DNSSEC types. It follows a lean and mean philosophy. If there is stuff you should know as a DNS
+programmer there isn't a convenience function for it. Server side and client side programming is
+supported, i.e. you can build servers and resolvers with it.
 
-We try to keep the "master" branch as sane as possible and at the bleeding edge
-of standards, avoiding breaking changes wherever reasonable. We support the last
-two versions of Go, currently: 1.7 and 1.8.
+We try to keep the "master" branch as sane as possible and at the bleeding edge of standards,
+avoiding breaking changes wherever reasonable. We support the last two versions of Go.
 
 # Goals
 
@@ -55,11 +55,13 @@ A not-so-up-to-date-list-that-may-be-actually-current:
 * https://github.com/mehrdadrad/mylg
 * https://github.com/bamarni/dockness
 * https://github.com/fffaraz/microdns
-* http://quilt.io
+* http://kelda.io
 * https://github.com/ipdcode/hades (JD.COM)
 * https://github.com/StackExchange/dnscontrol/
 * https://www.dnsperf.com/
 * https://dnssectest.net/
+* https://dns.apebits.com
+* https://github.com/oif/apex
 
 Send pull request if you want to be listed here.
 
@@ -72,7 +74,7 @@ Send pull request if you want to be listed here.
     * Parsing RRs ~ 100K RR/s, that's 5M records in about 50 seconds;
 * Server side programming (mimicking the net/http package);
 * Client side programming;
-* DNSSEC: signing, validating and key generation for DSA, RSA and ECDSA;
+* DNSSEC: signing, validating and key generation for DSA, RSA, ECDSA and Ed25519;
 * EDNS0, NSID, Cookies;
 * AXFR/IXFR;
 * TSIG, SIG(0);
@@ -86,8 +88,8 @@ Miek Gieben  -  2010-2012  -  <miek@miek.nl>
 
 # Building
 
-Building is done with the `go` tool. If you have setup your GOPATH
-correctly, the following should work:
+Building is done with the `go` tool. If you have setup your GOPATH correctly, the following should
+work:
 
     go get github.com/miekg/dns
     go build github.com/miekg/dns
@@ -148,11 +150,13 @@ Example programs can be found in the `github.com/miekg/exdns` repository.
 * 6975 - Algorithm Understanding in DNSSEC
 * 7043 - EUI48/EUI64 records
 * 7314 - DNS (EDNS) EXPIRE Option
+* 7477 - CSYNC RR
 * 7828 - edns-tcp-keepalive EDNS0 Option
 * 7553 - URI record
-* 7858 - DNS over TLS: Initiation and Performance Considerations (draft)
+* 7858 - DNS over TLS: Initiation and Performance Considerations
+* 7871 - EDNS0 Client Subnet
 * 7873 - Domain Name System (DNS) Cookies (draft-ietf-dnsop-cookies)
-* xxxx - EDNS0 DNS Update Lease (draft)
+* 8080 - EdDSA for DNSSEC
 
 ## Loosely based upon
 

diff --git a/vendor/github.com/miekg/dns/client.go b/vendor/github.com/miekg/dns/client.go
index 1c14a19d893df1574af4c5705a2bba95f5dbd80a..856b1698d5b42e00f2a574804dac3c105e212d85 100644 (file)
--- a/vendor/github.com/miekg/dns/client.go
+++ b/vendor/github.com/miekg/dns/client.go
@@ -9,6 +9,7 @@ import (
        "encoding/binary"
        "io"
        "net"
+       "strings"
        "time"
 )
 
@@ -19,7 +20,7 @@ const tcpIdleTimeout time.Duration = 8 * time.Second
 type Conn struct {
        net.Conn                         // a net.Conn holding the connection
        UDPSize        uint16            // minimum receive buffer for UDP messages
-       TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+       TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
        rtt            time.Duration
        t              time.Time
        tsigRequestMAC string
@@ -27,14 +28,18 @@ type Conn struct {
 
 // A Client defines parameters for a DNS client.
 type Client struct {
-       Net            string            // if "tcp" or "tcp-tls" (DNS over TLS) a TCP query will be initiated, otherwise an UDP one (default is "" for UDP)
-       UDPSize        uint16            // minimum receive buffer for UDP messages
-       TLSConfig      *tls.Config       // TLS connection configuration
-       Timeout        time.Duration     // a cumulative timeout for dial, write and read, defaults to 0 (disabled) - overrides DialTimeout, ReadTimeout and WriteTimeout when non-zero
-       DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds - overridden by Timeout when that value is non-zero
+       Net       string      // if "tcp" or "tcp-tls" (DNS over TLS) a TCP query will be initiated, otherwise an UDP one (default is "" for UDP)
+       UDPSize   uint16      // minimum receive buffer for UDP messages
+       TLSConfig *tls.Config // TLS connection configuration
+       Dialer    *net.Dialer // a net.Dialer used to set local address, timeouts and more
+       // Timeout is a cumulative timeout for dial, write and read, defaults to 0 (disabled) - overrides DialTimeout, ReadTimeout,
+       // WriteTimeout when non-zero. Can be overridden with net.Dialer.Timeout (see Client.ExchangeWithDialer and
+       // Client.Dialer) or context.Context.Deadline (see the deprecated ExchangeContext)
+       Timeout        time.Duration
+       DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds, or net.Dialer.Timeout if expiring earlier - overridden by Timeout when that value is non-zero
        ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
        WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds - overridden by Timeout when that value is non-zero
-       TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+       TsigSecret     map[string]string // secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
        SingleInflight bool              // if true suppress multiple outstanding queries for the same Qname, Qtype and Qclass
        group          singleflight
 }
@@ -44,91 +49,75 @@ type Client struct {
 // will it fall back to TCP in case of truncation.
 // See client.Exchange for more information on setting larger buffer sizes.
 func Exchange(m *Msg, a string) (r *Msg, err error) {
-       var co *Conn
-       co, err = DialTimeout("udp", a, dnsTimeout)
-       if err != nil {
-               return nil, err
-       }
-
-       defer co.Close()
+       client := Client{Net: "udp"}
+       r, _, err = client.Exchange(m, a)
+       return r, err
+}
 
-       opt := m.IsEdns0()
-       // If EDNS0 is used use that for size.
-       if opt != nil && opt.UDPSize() >= MinMsgSize {
-               co.UDPSize = opt.UDPSize()
+func (c *Client) dialTimeout() time.Duration {
+       if c.Timeout != 0 {
+               return c.Timeout
        }
-
-       co.SetWriteDeadline(time.Now().Add(dnsTimeout))
-       if err = co.WriteMsg(m); err != nil {
-               return nil, err
+       if c.DialTimeout != 0 {
+               return c.DialTimeout
        }
+       return dnsTimeout
+}
 
-       co.SetReadDeadline(time.Now().Add(dnsTimeout))
-       r, err = co.ReadMsg()
-       if err == nil && r.Id != m.Id {
-               err = ErrId
+func (c *Client) readTimeout() time.Duration {
+       if c.ReadTimeout != 0 {
+               return c.ReadTimeout
        }
-       return r, err
+       return dnsTimeout
 }
 
-// ExchangeContext performs a synchronous UDP query, like Exchange. It
-// additionally obeys deadlines from the passed Context.
-func ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, err error) {
-       // Combine context deadline with built-in timeout. Context chooses whichever
-       // is sooner.
-       timeoutCtx, cancel := context.WithTimeout(ctx, dnsTimeout)
-       defer cancel()
-       deadline, _ := timeoutCtx.Deadline()
-
-       co := new(Conn)
-       dialer := net.Dialer{}
-       co.Conn, err = dialer.DialContext(timeoutCtx, "udp", a)
-       if err != nil {
-               return nil, err
+func (c *Client) writeTimeout() time.Duration {
+       if c.WriteTimeout != 0 {
+               return c.WriteTimeout
        }
+       return dnsTimeout
+}
 
-       defer co.Conn.Close()
-
-       opt := m.IsEdns0()
-       // If EDNS0 is used use that for size.
-       if opt != nil && opt.UDPSize() >= MinMsgSize {
-               co.UDPSize = opt.UDPSize()
+// Dial connects to the address on the named network.
+func (c *Client) Dial(address string) (conn *Conn, err error) {
+       // create a new dialer with the appropriate timeout
+       var d net.Dialer
+       if c.Dialer == nil {
+               d = net.Dialer{}
+       } else {
+               d = net.Dialer(*c.Dialer)
        }
+       d.Timeout = c.getTimeoutForRequest(c.writeTimeout())
 
-       co.SetWriteDeadline(deadline)
-       if err = co.WriteMsg(m); err != nil {
-               return nil, err
-       }
+       network := "udp"
+       useTLS := false
 
-       co.SetReadDeadline(deadline)
-       r, err = co.ReadMsg()
-       if err == nil && r.Id != m.Id {
-               err = ErrId
+       switch c.Net {
+       case "tcp-tls":
+               network = "tcp"
+               useTLS = true
+       case "tcp4-tls":
+               network = "tcp4"
+               useTLS = true
+       case "tcp6-tls":
+               network = "tcp6"
+               useTLS = true
+       default:
+               if c.Net != "" {
+                       network = c.Net
+               }
        }
-       return r, err
-}
 
-// ExchangeConn performs a synchronous query. It sends the message m via the connection
-// c and waits for a reply. The connection c is not closed by ExchangeConn.
-// This function is going away, but can easily be mimicked:
-//
-//     co := &dns.Conn{Conn: c} // c is your net.Conn
-//     co.WriteMsg(m)
-//     in, _  := co.ReadMsg()
-//     co.Close()
-//
-func ExchangeConn(c net.Conn, m *Msg) (r *Msg, err error) {
-       println("dns: this function is deprecated")
-       co := new(Conn)
-       co.Conn = c
-       if err = co.WriteMsg(m); err != nil {
-               return nil, err
+       conn = new(Conn)
+       if useTLS {
+               conn.Conn, err = tls.DialWithDialer(&d, network, address, c.TLSConfig)
+       } else {
+               conn.Conn, err = d.Dial(network, address)
        }
-       r, err = co.ReadMsg()
-       if err == nil && r.Id != m.Id {
-               err = ErrId
+       if err != nil {
+               return nil, err
        }
-       return r, err
+       return conn, nil
 }
 
 // Exchange performs a synchronous query. It sends the message m to the address
@@ -142,22 +131,14 @@ func ExchangeConn(c net.Conn, m *Msg) (r *Msg, err error) {
 // It is up to the caller to create a message that allows for larger responses to be
 // returned. Specifically this means adding an EDNS0 OPT RR that will advertise a larger
 // buffer, see SetEdns0. Messages without an OPT RR will fallback to the historic limit
-// of 512 bytes.
-func (c *Client) Exchange(m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
-       return c.ExchangeContext(context.Background(), m, a)
-}
-
-// ExchangeContext acts like Exchange, but honors the deadline on the provided
-// context, if present. If there is both a context deadline and a configured
-// timeout on the client, the earliest of the two takes effect.
-func (c *Client) ExchangeContext(ctx context.Context, m *Msg, a string) (
-       r *Msg,
-       rtt time.Duration,
-       err error) {
+// of 512 bytes
+// To specify a local address or a timeout, the caller has to set the `Client.Dialer`
+// attribute appropriately
+func (c *Client) Exchange(m *Msg, address string) (r *Msg, rtt time.Duration, err error) {
        if !c.SingleInflight {
-               return c.exchange(ctx, m, a)
+               return c.exchange(m, address)
        }
-       // This adds a bunch of garbage, TODO(miek).
+
        t := "nop"
        if t1, ok := TypeToString[m.Question[0].Qtype]; ok {
                t = t1
@@ -167,75 +148,18 @@ func (c *Client) ExchangeContext(ctx context.Context, m *Msg, a string) (
                cl = cl1
        }
        r, rtt, err, shared := c.group.Do(m.Question[0].Name+t+cl, func() (*Msg, time.Duration, error) {
-               return c.exchange(ctx, m, a)
+               return c.exchange(m, address)
        })
        if r != nil && shared {
                r = r.Copy()
        }
-       if err != nil {
-               return r, rtt, err
-       }
-       return r, rtt, nil
-}
-
-func (c *Client) dialTimeout() time.Duration {
-       if c.Timeout != 0 {
-               return c.Timeout
-       }
-       if c.DialTimeout != 0 {
-               return c.DialTimeout
-       }
-       return dnsTimeout
+       return r, rtt, err
 }
 
-func (c *Client) readTimeout() time.Duration {
-       if c.ReadTimeout != 0 {
-               return c.ReadTimeout
-       }
-       return dnsTimeout
-}
-
-func (c *Client) writeTimeout() time.Duration {
-       if c.WriteTimeout != 0 {
-               return c.WriteTimeout
-       }
-       return dnsTimeout
-}
-
-func (c *Client) exchange(ctx context.Context, m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
+func (c *Client) exchange(m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
        var co *Conn
-       network := "udp"
-       tls := false
-
-       switch c.Net {
-       case "tcp-tls":
-               network = "tcp"
-               tls = true
-       case "tcp4-tls":
-               network = "tcp4"
-               tls = true
-       case "tcp6-tls":
-               network = "tcp6"
-               tls = true
-       default:
-               if c.Net != "" {
-                       network = c.Net
-               }
-       }
-
-       var deadline time.Time
-       if c.Timeout != 0 {
-               deadline = time.Now().Add(c.Timeout)
-       }
-
-       dialDeadline := deadlineOrTimeoutOrCtx(ctx, deadline, c.dialTimeout())
-       dialTimeout := dialDeadline.Sub(time.Now())
 
-       if tls {
-               co, err = DialTimeoutWithTLS(network, a, c.TLSConfig, dialTimeout)
-       } else {
-               co, err = DialTimeout(network, a, dialTimeout)
-       }
+       co, err = c.Dial(a)
 
        if err != nil {
                return nil, 0, err
@@ -253,12 +177,13 @@ func (c *Client) exchange(ctx context.Context, m *Msg, a string) (r *Msg, rtt ti
        }
 
        co.TsigSecret = c.TsigSecret
-       co.SetWriteDeadline(deadlineOrTimeoutOrCtx(ctx, deadline, c.writeTimeout()))
+       // write with the appropriate write timeout
+       co.SetWriteDeadline(time.Now().Add(c.getTimeoutForRequest(c.writeTimeout())))
        if err = co.WriteMsg(m); err != nil {
                return nil, 0, err
        }
 
-       co.SetReadDeadline(deadlineOrTimeoutOrCtx(ctx, deadline, c.readTimeout()))
+       co.SetReadDeadline(time.Now().Add(c.getTimeoutForRequest(c.readTimeout())))
        r, err = co.ReadMsg()
        if err == nil && r.Id != m.Id {
                err = ErrId
@@ -267,8 +192,10 @@ func (c *Client) exchange(ctx context.Context, m *Msg, a string) (r *Msg, rtt ti
 }
 
 // ReadMsg reads a message from the connection co.
-// If the received message contains a TSIG record the transaction
-// signature is verified.
+// If the received message contains a TSIG record the transaction signature
+// is verified. This method always tries to return the message, however if an
+// error is returned there are no guarantees that the returned message is a
+// valid representation of the packet read.
 func (co *Conn) ReadMsg() (*Msg, error) {
        p, err := co.ReadMsgHeader(nil)
        if err != nil {
@@ -277,13 +204,10 @@ func (co *Conn) ReadMsg() (*Msg, error) {
 
        m := new(Msg)
        if err := m.Unpack(p); err != nil {
-               // If ErrTruncated was returned, we still want to allow the user to use
+               // If an error was returned, we still want to allow the user to use
                // the message, but naively they can just check err if they don't want
-               // to use a truncated message
-               if err == ErrTruncated {
-                       return m, err
-               }
-               return nil, err
+               // to use an erroneous message
+               return m, err
        }
        if t := m.IsTsig(); t != nil {
                if _, ok := co.TsigSecret[t.Hdr.Name]; !ok {
@@ -352,7 +276,7 @@ func tcpMsgLen(t io.Reader) (int, error) {
                return 0, err
        }
 
-       // As seen with my local router/switch, retursn 1 byte on the above read,
+       // As seen with my local router/switch, returns 1 byte on the above read,
        // resulting a a ShortRead. Just write it out (instead of loop) and read the
        // other byte.
        if n == 1 {
@@ -467,6 +391,24 @@ func (co *Conn) Write(p []byte) (n int, err error) {
        return n, err
 }
 
+// Return the appropriate timeout for a specific request
+func (c *Client) getTimeoutForRequest(timeout time.Duration) time.Duration {
+       var requestTimeout time.Duration
+       if c.Timeout != 0 {
+               requestTimeout = c.Timeout
+       } else {
+               requestTimeout = timeout
+       }
+       // net.Dialer.Timeout has priority if smaller than the timeouts computed so
+       // far
+       if c.Dialer != nil && c.Dialer.Timeout != 0 {
+               if c.Dialer.Timeout < requestTimeout {
+                       requestTimeout = c.Dialer.Timeout
+               }
+       }
+       return requestTimeout
+}
+
 // Dial connects to the address on the named network.
 func Dial(network, address string) (conn *Conn, err error) {
        conn = new(Conn)
@@ -477,10 +419,43 @@ func Dial(network, address string) (conn *Conn, err error) {
        return conn, nil
 }
 
+// ExchangeContext performs a synchronous UDP query, like Exchange. It
+// additionally obeys deadlines from the passed Context.
+func ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, err error) {
+       client := Client{Net: "udp"}
+       r, _, err = client.ExchangeContext(ctx, m, a)
+       // ignorint rtt to leave the original ExchangeContext API unchanged, but
+       // this function will go away
+       return r, err
+}
+
+// ExchangeConn performs a synchronous query. It sends the message m via the connection
+// c and waits for a reply. The connection c is not closed by ExchangeConn.
+// This function is going away, but can easily be mimicked:
+//
+//     co := &dns.Conn{Conn: c} // c is your net.Conn
+//     co.WriteMsg(m)
+//     in, _  := co.ReadMsg()
+//     co.Close()
+//
+func ExchangeConn(c net.Conn, m *Msg) (r *Msg, err error) {
+       println("dns: ExchangeConn: this function is deprecated")
+       co := new(Conn)
+       co.Conn = c
+       if err = co.WriteMsg(m); err != nil {
+               return nil, err
+       }
+       r, err = co.ReadMsg()
+       if err == nil && r.Id != m.Id {
+               err = ErrId
+       }
+       return r, err
+}
+
 // DialTimeout acts like Dial but takes a timeout.
 func DialTimeout(network, address string, timeout time.Duration) (conn *Conn, err error) {
-       conn = new(Conn)
-       conn.Conn, err = net.DialTimeout(network, address, timeout)
+       client := Client{Net: network, Dialer: &net.Dialer{Timeout: timeout}}
+       conn, err = client.Dial(address)
        if err != nil {
                return nil, err
        }
@@ -489,8 +464,12 @@ func DialTimeout(network, address string, timeout time.Duration) (conn *Conn, er
 
 // DialWithTLS connects to the address on the named network with TLS.
 func DialWithTLS(network, address string, tlsConfig *tls.Config) (conn *Conn, err error) {
-       conn = new(Conn)
-       conn.Conn, err = tls.Dial(network, address, tlsConfig)
+       if !strings.HasSuffix(network, "-tls") {
+               network += "-tls"
+       }
+       client := Client{Net: network, TLSConfig: tlsConfig}
+       conn, err = client.Dial(address)
+
        if err != nil {
                return nil, err
        }
@@ -499,33 +478,29 @@ func DialWithTLS(network, address string, tlsConfig *tls.Config) (conn *Conn, er
 
 // DialTimeoutWithTLS acts like DialWithTLS but takes a timeout.
 func DialTimeoutWithTLS(network, address string, tlsConfig *tls.Config, timeout time.Duration) (conn *Conn, err error) {
-       var dialer net.Dialer
-       dialer.Timeout = timeout
-
-       conn = new(Conn)
-       conn.Conn, err = tls.DialWithDialer(&dialer, network, address, tlsConfig)
+       if !strings.HasSuffix(network, "-tls") {
+               network += "-tls"
+       }
+       client := Client{Net: network, Dialer: &net.Dialer{Timeout: timeout}, TLSConfig: tlsConfig}
+       conn, err = client.Dial(address)
        if err != nil {
                return nil, err
        }
        return conn, nil
 }
 
-// deadlineOrTimeout chooses between the provided deadline and timeout
-// by always preferring the deadline so long as it's non-zero (regardless
-// of which is bigger), and returns the equivalent deadline value.
-func deadlineOrTimeout(deadline time.Time, timeout time.Duration) time.Time {
-       if deadline.IsZero() {
-               return time.Now().Add(timeout)
-       }
-       return deadline
-}
-
-// deadlineOrTimeoutOrCtx returns the earliest of: a context deadline, or the
-// output of deadlineOrtimeout.
-func deadlineOrTimeoutOrCtx(ctx context.Context, deadline time.Time, timeout time.Duration) time.Time {
-       result := deadlineOrTimeout(deadline, timeout)
-       if ctxDeadline, ok := ctx.Deadline(); ok && ctxDeadline.Before(result) {
-               result = ctxDeadline
+// ExchangeContext acts like Exchange, but honors the deadline on the provided
+// context, if present. If there is both a context deadline and a configured
+// timeout on the client, the earliest of the two takes effect.
+func (c *Client) ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, rtt time.Duration, err error) {
+       var timeout time.Duration
+       if deadline, ok := ctx.Deadline(); !ok {
+               timeout = 0
+       } else {
+               timeout = deadline.Sub(time.Now())
        }
-       return result
+       // not passing the context to the underlying calls, as the API does not support
+       // context. For timeouts you should set up Client.Dialer and call Client.Exchange.
+       c.Dialer = &net.Dialer{Timeout: timeout}
+       return c.Exchange(m, a)
 }

diff --git a/vendor/github.com/miekg/dns/clientconfig.go b/vendor/github.com/miekg/dns/clientconfig.go
index 0a1f5a92c57616ccc877a0a20d1b183f01d05c62..a606ef696ef8e9e72ef53643d129041e1481fcdc 100644 (file)
--- a/vendor/github.com/miekg/dns/clientconfig.go
+++ b/vendor/github.com/miekg/dns/clientconfig.go
@@ -2,6 +2,7 @@ package dns
 
 import (
        "bufio"
+       "io"
        "os"
        "strconv"
        "strings"
@@ -25,8 +26,13 @@ func ClientConfigFromFile(resolvconf string) (*ClientConfig, error) {
                return nil, err
        }
        defer file.Close()
+       return ClientConfigFromReader(file)
+}
+
+// ClientConfigFromReader works like ClientConfigFromFile but takes an io.Reader as argument
+func ClientConfigFromReader(resolvconf io.Reader) (*ClientConfig, error) {
        c := new(ClientConfig)
-       scanner := bufio.NewScanner(file)
+       scanner := bufio.NewScanner(resolvconf)
        c.Servers = make([]string, 0)
        c.Search = make([]string, 0)
        c.Port = "53"
@@ -73,8 +79,10 @@ func ClientConfigFromFile(resolvconf string) (*ClientConfig, error) {
                                switch {
                                case len(s) >= 6 && s[:6] == "ndots:":
                                        n, _ := strconv.Atoi(s[6:])
-                                       if n < 1 {
-                                               n = 1
+                                       if n < 0 {
+                                               n = 0
+                                       } else if n > 15 {
+                                               n = 15
                                        }
                                        c.Ndots = n
                                case len(s) >= 8 && s[:8] == "timeout:":

diff --git a/vendor/github.com/miekg/dns/compress_generate.go b/vendor/github.com/miekg/dns/compress_generate.go
index 1a301e9f3916b38e613eb917644393950d1f3570..87fb36f68cf58dc6441b32d36fb05baf76b53a7d 100644 (file)
--- a/vendor/github.com/miekg/dns/compress_generate.go
+++ b/vendor/github.com/miekg/dns/compress_generate.go
@@ -18,8 +18,7 @@ import (
 )
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from compress_generate.go
+// Code generated by "go run compress_generate.go"; DO NOT EDIT.
 
 package dns
 
@@ -51,8 +50,9 @@ func main() {
        fatalIfErr(err)
        scope := pkg.Scope()
 
-       domainTypes := map[string]bool{}  // Types that have a domain name in them (either comressible or not).
-       cdomainTypes := map[string]bool{} // Types that have a compressible domain name in them (subset of domainType)
+       var domainTypes []string  // Types that have a domain name in them (either compressible or not).
+       var cdomainTypes []string // Types that have a compressible domain name in them (subset of domainType)
+Names:
        for _, name := range scope.Names() {
                o := scope.Lookup(name)
                if o == nil || !o.Exported() {
@@ -73,21 +73,25 @@ func main() {
                for i := 1; i < st.NumFields(); i++ {
                        if _, ok := st.Field(i).Type().(*types.Slice); ok {
                                if st.Tag(i) == `dns:"domain-name"` {
-                                       domainTypes[o.Name()] = true
+                                       domainTypes = append(domainTypes, o.Name())
+                                       continue Names
                                }
                                if st.Tag(i) == `dns:"cdomain-name"` {
-                                       cdomainTypes[o.Name()] = true
-                                       domainTypes[o.Name()] = true
+                                       cdomainTypes = append(cdomainTypes, o.Name())
+                                       domainTypes = append(domainTypes, o.Name())
+                                       continue Names
                                }
                                continue
                        }
 
                        switch {
                        case st.Tag(i) == `dns:"domain-name"`:
-                               domainTypes[o.Name()] = true
+                               domainTypes = append(domainTypes, o.Name())
+                               continue Names
                        case st.Tag(i) == `dns:"cdomain-name"`:
-                               cdomainTypes[o.Name()] = true
-                               domainTypes[o.Name()] = true
+                               cdomainTypes = append(cdomainTypes, o.Name())
+                               domainTypes = append(domainTypes, o.Name())
+                               continue Names
                        }
                }
        }
@@ -99,7 +103,7 @@ func main() {
 
        fmt.Fprint(b, "func compressionLenHelperType(c map[string]int, r RR) {\n")
        fmt.Fprint(b, "switch x := r.(type) {\n")
-       for name, _ := range domainTypes {
+       for _, name := range domainTypes {
                o := scope.Lookup(name)
                st, _ := getTypeStruct(o.Type(), scope)
 
@@ -135,7 +139,7 @@ func main() {
 
        fmt.Fprint(b, "func compressionLenSearchType(c map[string]int, r RR) (int, bool) {\n")
        fmt.Fprint(b, "switch x := r.(type) {\n")
-       for name, _ := range cdomainTypes {
+       for _, name := range cdomainTypes {
                o := scope.Lookup(name)
                st, _ := getTypeStruct(o.Type(), scope)
 

diff --git a/vendor/github.com/miekg/dns/dns.go b/vendor/github.com/miekg/dns/dns.go
index b3292287ce75020597a9e82d18a2bd2084e5bbe9..5133eac72743f0f8c57224b26a7d223f1dcce287 100644 (file)
--- a/vendor/github.com/miekg/dns/dns.go
+++ b/vendor/github.com/miekg/dns/dns.go
@@ -6,9 +6,12 @@ const (
        year68     = 1 << 31 // For RFC1982 (Serial Arithmetic) calculations in 32 bits.
        defaultTtl = 3600    // Default internal TTL.
 
-       DefaultMsgSize = 4096  // DefaultMsgSize is the standard default for messages larger than 512 bytes.
-       MinMsgSize     = 512   // MinMsgSize is the minimal size of a DNS packet.
-       MaxMsgSize     = 65535 // MaxMsgSize is the largest possible DNS packet.
+       // DefaultMsgSize is the standard default for messages larger than 512 bytes.
+       DefaultMsgSize = 4096
+       // MinMsgSize is the minimal size of a DNS packet.
+       MinMsgSize = 512
+       // MaxMsgSize is the largest possible DNS packet.
+       MaxMsgSize = 65535
 )
 
 // Error represents a DNS error.

diff --git a/vendor/github.com/miekg/dns/dnssec.go b/vendor/github.com/miekg/dns/dnssec.go
index 3bd55388d8133644b3a1d545e48e99a39a1fba8c..ac9fdd45ee5fcb12982142c31839e79818f5a779 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec.go
+++ b/vendor/github.com/miekg/dns/dnssec.go
@@ -19,6 +19,8 @@ import (
        "sort"
        "strings"
        "time"
+
+       "golang.org/x/crypto/ed25519"
 )
 
 // DNSSEC encryption algorithm codes.
@@ -38,6 +40,8 @@ const (
        ECCGOST
        ECDSAP256SHA256
        ECDSAP384SHA384
+       ED25519
+       ED448
        INDIRECT   uint8 = 252
        PRIVATEDNS uint8 = 253 // Private (experimental keys)
        PRIVATEOID uint8 = 254
@@ -56,6 +60,8 @@ var AlgorithmToString = map[uint8]string{
        ECCGOST:          "ECC-GOST",
        ECDSAP256SHA256:  "ECDSAP256SHA256",
        ECDSAP384SHA384:  "ECDSAP384SHA384",
+       ED25519:          "ED25519",
+       ED448:            "ED448",
        INDIRECT:         "INDIRECT",
        PRIVATEDNS:       "PRIVATEDNS",
        PRIVATEOID:       "PRIVATEOID",
@@ -73,6 +79,7 @@ var AlgorithmToHash = map[uint8]crypto.Hash{
        ECDSAP256SHA256:  crypto.SHA256,
        ECDSAP384SHA384:  crypto.SHA384,
        RSASHA512:        crypto.SHA512,
+       ED25519:          crypto.Hash(0),
 }
 
 // DNSSEC hashing algorithm codes.
@@ -301,16 +308,32 @@ func (rr *RRSIG) Sign(k crypto.Signer, rrset []RR) error {
                return ErrAlg
        }
 
-       h := hash.New()
-       h.Write(signdata)
-       h.Write(wire)
+       switch rr.Algorithm {
+       case ED25519:
+               // ed25519 signs the raw message and performs hashing internally.
+               // All other supported signature schemes operate over the pre-hashed
+               // message, and thus ed25519 must be handled separately here.
+               //
+               // The raw message is passed directly into sign and crypto.Hash(0) is
+               // used to signal to the crypto.Signer that the data has not been hashed.
+               signature, err := sign(k, append(signdata, wire...), crypto.Hash(0), rr.Algorithm)
+               if err != nil {
+                       return err
+               }
 
-       signature, err := sign(k, h.Sum(nil), hash, rr.Algorithm)
-       if err != nil {
-               return err
-       }
+               rr.Signature = toBase64(signature)
+       default:
+               h := hash.New()
+               h.Write(signdata)
+               h.Write(wire)
+
+               signature, err := sign(k, h.Sum(nil), hash, rr.Algorithm)
+               if err != nil {
+                       return err
+               }
 
-       rr.Signature = toBase64(signature)
+               rr.Signature = toBase64(signature)
+       }
 
        return nil
 }
@@ -352,6 +375,9 @@ func sign(k crypto.Signer, hashed []byte, hash crypto.Hash, alg uint8) ([]byte,
                //      signature = append(signature, intToBytes(r1, 20)...)
                //      signature = append(signature, intToBytes(s1, 20)...)
                //      rr.Signature = signature
+
+       case ED25519:
+               return signature, nil
        }
 
        return nil, ErrAlg
@@ -456,6 +482,17 @@ func (rr *RRSIG) Verify(k *DNSKEY, rrset []RR) error {
                }
                return ErrSig
 
+       case ED25519:
+               pubkey := k.publicKeyED25519()
+               if pubkey == nil {
+                       return ErrKey
+               }
+
+               if ed25519.Verify(pubkey, append(signeddata, wire...), sigbuf) {
+                       return nil
+               }
+               return ErrSig
+
        default:
                return ErrAlg
        }
@@ -578,6 +615,17 @@ func (k *DNSKEY) publicKeyDSA() *dsa.PublicKey {
        return pubkey
 }
 
+func (k *DNSKEY) publicKeyED25519() ed25519.PublicKey {
+       keybuf, err := fromBase64([]byte(k.PublicKey))
+       if err != nil {
+               return nil
+       }
+       if len(keybuf) != ed25519.PublicKeySize {
+               return nil
+       }
+       return keybuf
+}
+
 type wireSlice [][]byte
 
 func (p wireSlice) Len() int      { return len(p) }
@@ -615,6 +663,10 @@ func rawSignatureData(rrset []RR, s *RRSIG) (buf []byte, err error) {
                switch x := r1.(type) {
                case *NS:
                        x.Ns = strings.ToLower(x.Ns)
+               case *MD:
+                       x.Md = strings.ToLower(x.Md)
+               case *MF:
+                       x.Mf = strings.ToLower(x.Mf)
                case *CNAME:
                        x.Target = strings.ToLower(x.Target)
                case *SOA:
@@ -633,6 +685,18 @@ func rawSignatureData(rrset []RR, s *RRSIG) (buf []byte, err error) {
                        x.Email = strings.ToLower(x.Email)
                case *MX:
                        x.Mx = strings.ToLower(x.Mx)
+               case *RP:
+                       x.Mbox = strings.ToLower(x.Mbox)
+                       x.Txt = strings.ToLower(x.Txt)
+               case *AFSDB:
+                       x.Hostname = strings.ToLower(x.Hostname)
+               case *RT:
+                       x.Host = strings.ToLower(x.Host)
+               case *SIG:
+                       x.SignerName = strings.ToLower(x.SignerName)
+               case *PX:
+                       x.Map822 = strings.ToLower(x.Map822)
+                       x.Mapx400 = strings.ToLower(x.Mapx400)
                case *NAPTR:
                        x.Replacement = strings.ToLower(x.Replacement)
                case *KX:

diff --git a/vendor/github.com/miekg/dns/dnssec_keygen.go b/vendor/github.com/miekg/dns/dnssec_keygen.go
index 5e4b7741a69dbf1551bfaa1e8464c9002e8965cd..33e913ac527d8166f2aee23f94199741bae2dd5e 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec_keygen.go
+++ b/vendor/github.com/miekg/dns/dnssec_keygen.go
@@ -8,6 +8,8 @@ import (
        "crypto/rand"
        "crypto/rsa"
        "math/big"
+
+       "golang.org/x/crypto/ed25519"
 )
 
 // Generate generates a DNSKEY of the given bit size.
@@ -38,6 +40,10 @@ func (k *DNSKEY) Generate(bits int) (crypto.PrivateKey, error) {
                if bits != 384 {
                        return nil, ErrKeySize
                }
+       case ED25519:
+               if bits != 256 {
+                       return nil, ErrKeySize
+               }
        }
 
        switch k.Algorithm {
@@ -75,6 +81,13 @@ func (k *DNSKEY) Generate(bits int) (crypto.PrivateKey, error) {
                }
                k.setPublicKeyECDSA(priv.PublicKey.X, priv.PublicKey.Y)
                return priv, nil
+       case ED25519:
+               pub, priv, err := ed25519.GenerateKey(rand.Reader)
+               if err != nil {
+                       return nil, err
+               }
+               k.setPublicKeyED25519(pub)
+               return priv, nil
        default:
                return nil, ErrAlg
        }
@@ -117,6 +130,15 @@ func (k *DNSKEY) setPublicKeyDSA(_Q, _P, _G, _Y *big.Int) bool {
        return true
 }
 
+// Set the public key for Ed25519
+func (k *DNSKEY) setPublicKeyED25519(_K ed25519.PublicKey) bool {
+       if _K == nil {
+               return false
+       }
+       k.PublicKey = toBase64(_K)
+       return true
+}
+
 // Set the public key (the values E and N) for RSA
 // RFC 3110: Section 2. RSA Public KEY Resource Records
 func exponentToBuf(_E int) []byte {

diff --git a/vendor/github.com/miekg/dns/dnssec_keyscan.go b/vendor/github.com/miekg/dns/dnssec_keyscan.go
index 4f8d830b85899461e0173f98e0d6847c7cba59d2..e2d9d8f924f345b55754e37a3b295b75714f719f 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec_keyscan.go
+++ b/vendor/github.com/miekg/dns/dnssec_keyscan.go
@@ -1,6 +1,7 @@
 package dns
 
 import (
+       "bytes"
        "crypto"
        "crypto/dsa"
        "crypto/ecdsa"
@@ -9,6 +10,8 @@ import (
        "math/big"
        "strconv"
        "strings"
+
+       "golang.org/x/crypto/ed25519"
 )
 
 // NewPrivateKey returns a PrivateKey by parsing the string s.
@@ -86,6 +89,8 @@ func (k *DNSKEY) ReadPrivateKey(q io.Reader, file string) (crypto.PrivateKey, er
                }
                priv.PublicKey = *pub
                return priv, nil
+       case ED25519:
+               return readPrivateKeyED25519(m)
        default:
                return nil, ErrPrivKey
        }
@@ -166,13 +171,56 @@ func readPrivateKeyECDSA(m map[string]string) (*ecdsa.PrivateKey, error) {
        return p, nil
 }
 
+func readPrivateKeyED25519(m map[string]string) (ed25519.PrivateKey, error) {
+       var p ed25519.PrivateKey
+       // TODO: validate that the required flags are present
+       for k, v := range m {
+               switch k {
+               case "privatekey":
+                       p1, err := fromBase64([]byte(v))
+                       if err != nil {
+                               return nil, err
+                       }
+                       if len(p1) != 32 {
+                               return nil, ErrPrivKey
+                       }
+                       // RFC 8080 and Golang's x/crypto/ed25519 differ as to how the
+                       // private keys are represented. RFC 8080 specifies that private
+                       // keys be stored solely as the seed value (p1 above) while the
+                       // ed25519 package represents them as the seed value concatenated
+                       // to the public key, which is derived from the seed value.
+                       //
+                       // ed25519.GenerateKey reads exactly 32 bytes from the passed in
+                       // io.Reader and uses them as the seed. It also derives the
+                       // public key and produces a compatible private key.
+                       _, p, err = ed25519.GenerateKey(bytes.NewReader(p1))
+                       if err != nil {
+                               return nil, err
+                       }
+               case "created", "publish", "activate":
+                       /* not used in Go (yet) */
+               }
+       }
+       return p, nil
+}
+
 // parseKey reads a private key from r. It returns a map[string]string,
 // with the key-value pairs, or an error when the file is not correct.
 func parseKey(r io.Reader, file string) (map[string]string, error) {
-       s := scanInit(r)
+       s, cancel := scanInit(r)
        m := make(map[string]string)
        c := make(chan lex)
        k := ""
+       defer func() {
+               cancel()
+               // zlexer can send up to two tokens, the next one and possibly 1 remainders.
+               // Do a non-blocking read.
+               _, ok := <-c
+               _, ok = <-c
+               if !ok {
+                       // too bad
+               }
+       }()
        // Start the lexer
        go klexer(s, c)
        for l := range c {

diff --git a/vendor/github.com/miekg/dns/dnssec_privkey.go b/vendor/github.com/miekg/dns/dnssec_privkey.go
index 56f3ea934f63f731de101a729d40350006bc1956..46f3215c8fb4b02ddd7f421d81ce7057550061b4 100644 (file)
--- a/vendor/github.com/miekg/dns/dnssec_privkey.go
+++ b/vendor/github.com/miekg/dns/dnssec_privkey.go
@@ -7,6 +7,8 @@ import (
        "crypto/rsa"
        "math/big"
        "strconv"
+
+       "golang.org/x/crypto/ed25519"
 )
 
 const format = "Private-key-format: v1.3\n"
@@ -79,6 +81,12 @@ func (r *DNSKEY) PrivateKeyString(p crypto.PrivateKey) string {
                        "Private_value(x): " + priv + "\n" +
                        "Public_value(y): " + pub + "\n"
 
+       case ed25519.PrivateKey:
+               private := toBase64(p[:32])
+               return format +
+                       "Algorithm: " + algorithm + "\n" +
+                       "PrivateKey: " + private + "\n"
+
        default:
                return ""
        }

diff --git a/vendor/github.com/miekg/dns/doc.go b/vendor/github.com/miekg/dns/doc.go
index e38753d7d8a7ab1a94ab8e0475f745304641130f..1d8114744f47ee1997a99cfd8b9bb42ba37d6796 100644 (file)
--- a/vendor/github.com/miekg/dns/doc.go
+++ b/vendor/github.com/miekg/dns/doc.go
@@ -1,7 +1,7 @@
 /*
 Package dns implements a full featured interface to the Domain Name System.
 Server- and client-side programming is supported.
-The package allows complete control over what is send out to the DNS. The package
+The package allows complete control over what is sent out to the DNS. The package
 API follows the less-is-more principle, by presenting a small, clean interface.
 
 The package dns supports (asynchronous) querying/replying, incoming/outgoing zone transfers,
@@ -14,7 +14,7 @@ Basic usage pattern for creating a new resource record:
 
      r := new(dns.MX)
      r.Hdr = dns.RR_Header{Name: "miek.nl.", Rrtype: dns.TypeMX,
-       Class: dns.ClassINET, Ttl: 3600}
+     Class: dns.ClassINET, Ttl: 3600}
      r.Preference = 10
      r.Mx = "mx.miek.nl."
 
@@ -22,16 +22,16 @@ Or directly from a string:
 
      mx, err := dns.NewRR("miek.nl. 3600 IN MX 10 mx.miek.nl.")
 
-Or when the default TTL (3600) and class (IN) suit you:
+Or when the default origin (.) and TTL (3600) and class (IN) suit you:
 
-     mx, err := dns.NewRR("miek.nl. MX 10 mx.miek.nl.")
+     mx, err := dns.NewRR("miek.nl MX 10 mx.miek.nl")
 
 Or even:
 
      mx, err := dns.NewRR("$ORIGIN nl.\nmiek 1H IN MX 10 mx.miek")
 
 In the DNS messages are exchanged, these messages contain resource
-records (sets).  Use pattern for creating a message:
+records (sets). Use pattern for creating a message:
 
      m := new(dns.Msg)
      m.SetQuestion("miek.nl.", dns.TypeMX)
@@ -51,7 +51,7 @@ The following is slightly more verbose, but more flexible:
      m1.Question = make([]dns.Question, 1)
      m1.Question[0] = dns.Question{"miek.nl.", dns.TypeMX, dns.ClassINET}
 
-After creating a message it can be send.
+After creating a message it can be sent.
 Basic use pattern for synchronous querying the DNS at a
 server configured on 127.0.0.1 and port 53:
 
@@ -63,7 +63,23 @@ class) is as easy as setting:
 
        c.SingleInflight = true
 
-If these "advanced" features are not needed, a simple UDP query can be send,
+More advanced options are available using a net.Dialer and the corresponding API.
+For example it is possible to set a timeout, or to specify a source IP address
+and port to use for the connection:
+
+       c := new(dns.Client)
+       laddr := net.UDPAddr{
+               IP: net.ParseIP("[::1]"),
+               Port: 12345,
+               Zone: "",
+       }
+       d := net.Dialer{
+               Timeout: 200 * time.Millisecond,
+               LocalAddr: &laddr,
+       }
+       in, rtt, err := c.ExchangeWithDialer(&d, m1, "8.8.8.8:53")
+
+If these "advanced" features are not needed, a simple UDP query can be sent,
 with:
 
        in, err := dns.Exchange(m1, "127.0.0.1:53")
@@ -152,6 +168,11 @@ Basic use pattern when querying with a TSIG name "axfr." (note that these key na
 must be fully qualified - as they are domain names) and the base64 secret
 "so6ZGir4GPAqINNh9U5c3A==":
 
+If an incoming message contains a TSIG record it MUST be the last record in
+the additional section (RFC2845 3.2).  This means that you should make the
+call to SetTsig last, right before executing the query.  If you make any
+changes to the RRset after calling SetTsig() the signature will be incorrect.
+
        c := new(dns.Client)
        c.TsigSecret = map[string]string{"axfr.": "so6ZGir4GPAqINNh9U5c3A=="}
        m := new(dns.Msg)

diff --git a/vendor/github.com/miekg/dns/edns.go b/vendor/github.com/miekg/dns/edns.go
index dbff3714cf5626f5e7aee30987f44582e5c24af9..6f9d2ea3936b37ecb8252f03b56cccbeb4b1d983 100644 (file)
--- a/vendor/github.com/miekg/dns/edns.go
+++ b/vendor/github.com/miekg/dns/edns.go
@@ -13,18 +13,18 @@ import (
 const (
        EDNS0LLQ          = 0x1     // long lived queries: http://tools.ietf.org/html/draft-sekar-dns-llq-01
        EDNS0UL           = 0x2     // update lease draft: http://files.dns-sd.org/draft-sekar-dns-ul.txt
-       EDNS0NSID         = 0x3     // nsid (RFC5001)
+       EDNS0NSID         = 0x3     // nsid (See RFC 5001)
        EDNS0DAU          = 0x5     // DNSSEC Algorithm Understood
        EDNS0DHU          = 0x6     // DS Hash Understood
        EDNS0N3U          = 0x7     // NSEC3 Hash Understood
-       EDNS0SUBNET       = 0x8     // client-subnet (RFC6891)
+       EDNS0SUBNET       = 0x8     // client-subnet (See RFC 7871)
        EDNS0EXPIRE       = 0x9     // EDNS0 expire
        EDNS0COOKIE       = 0xa     // EDNS0 Cookie
-       EDNS0TCPKEEPALIVE = 0xb     // EDNS0 tcp keep alive (RFC7828)
-       EDNS0SUBNETDRAFT  = 0x50fa  // Don't use! Use EDNS0SUBNET
-       EDNS0LOCALSTART   = 0xFDE9  // Beginning of range reserved for local/experimental use (RFC6891)
-       EDNS0LOCALEND     = 0xFFFE  // End of range reserved for local/experimental use (RFC6891)
-       _DO               = 1 << 15 // dnssec ok
+       EDNS0TCPKEEPALIVE = 0xb     // EDNS0 tcp keep alive (See RFC 7828)
+       EDNS0PADDING      = 0xc     // EDNS0 padding (See RFC 7830)
+       EDNS0LOCALSTART   = 0xFDE9  // Beginning of range reserved for local/experimental use (See RFC 6891)
+       EDNS0LOCALEND     = 0xFFFE  // End of range reserved for local/experimental use (See RFC 6891)
+       _DO               = 1 << 15 // DNSSEC OK
 )
 
 // OPT is the EDNS0 RR appended to messages to convey extra (meta) information.
@@ -57,9 +57,6 @@ func (rr *OPT) String() string {
                        }
                case *EDNS0_SUBNET:
                        s += "\n; SUBNET: " + o.String()
-                       if o.(*EDNS0_SUBNET).DraftOption {
-                               s += " (draft)"
-                       }
                case *EDNS0_COOKIE:
                        s += "\n; COOKIE: " + o.String()
                case *EDNS0_UL:
@@ -74,6 +71,8 @@ func (rr *OPT) String() string {
                        s += "\n; NSEC3 HASH UNDERSTOOD: " + o.String()
                case *EDNS0_LOCAL:
                        s += "\n; LOCAL OPT: " + o.String()
+               case *EDNS0_PADDING:
+                       s += "\n; PADDING: " + o.String()
                }
        }
        return s
@@ -103,15 +102,12 @@ func (rr *OPT) SetVersion(v uint8) {
 
 // ExtendedRcode returns the EDNS extended RCODE field (the upper 8 bits of the TTL).
 func (rr *OPT) ExtendedRcode() int {
-       return int((rr.Hdr.Ttl&0xFF000000)>>24) + 15
+       return int((rr.Hdr.Ttl & 0xFF000000) >> 24)
 }
 
 // SetExtendedRcode sets the EDNS extended RCODE field.
 func (rr *OPT) SetExtendedRcode(v uint8) {
-       if v < RcodeBadVers { // Smaller than 16.. Use the 4 bits you have!
-               return
-       }
-       rr.Hdr.Ttl = rr.Hdr.Ttl&0x00FFFFFF | (uint32(v-15) << 24)
+       rr.Hdr.Ttl = rr.Hdr.Ttl&0x00FFFFFF | (uint32(v) << 24)
 }
 
 // UDPSize returns the UDP buffer size.
@@ -182,12 +178,13 @@ func (e *EDNS0_NSID) pack() ([]byte, error) {
        return h, nil
 }
 
-func (e *EDNS0_NSID) Option() uint16        { return EDNS0NSID }
+// Option implements the EDNS0 interface.
+func (e *EDNS0_NSID) Option() uint16        { return EDNS0NSID } // Option returns the option code.
 func (e *EDNS0_NSID) unpack(b []byte) error { e.Nsid = hex.EncodeToString(b); return nil }
 func (e *EDNS0_NSID) String() string        { return string(e.Nsid) }
 
 // EDNS0_SUBNET is the subnet option that is used to give the remote nameserver
-// an idea of where the client lives. It can then give back a different
+// an idea of where the client lives. See RFC 7871. It can then give back a different
 // answer depending on the location or network topology.
 // Basic use pattern for creating an subnet option:
 //
@@ -203,25 +200,19 @@ func (e *EDNS0_NSID) String() string        { return string(e.Nsid) }
 //     // e.Address = net.ParseIP("2001:7b8:32a::2")   // for IPV6
 //     o.Option = append(o.Option, e)
 //
-// Note: the spec (draft-ietf-dnsop-edns-client-subnet-00) has some insane logic
-// for which netmask applies to the address. This code will parse all the
-// available bits when unpacking (up to optlen). When packing it will apply
-// SourceNetmask. If you need more advanced logic, patches welcome and good luck.
+// This code will parse all the available bits when unpacking (up to optlen).
+// When packing it will apply SourceNetmask. If you need more advanced logic,
+// patches welcome and good luck.
 type EDNS0_SUBNET struct {
        Code          uint16 // Always EDNS0SUBNET
        Family        uint16 // 1 for IP, 2 for IP6
        SourceNetmask uint8
        SourceScope   uint8
        Address       net.IP
-       DraftOption   bool // Set to true if using the old (0x50fa) option code
 }
 
-func (e *EDNS0_SUBNET) Option() uint16 {
-       if e.DraftOption {
-               return EDNS0SUBNETDRAFT
-       }
-       return EDNS0SUBNET
-}
+// Option implements the EDNS0 interface.
+func (e *EDNS0_SUBNET) Option() uint16 { return EDNS0SUBNET }
 
 func (e *EDNS0_SUBNET) pack() ([]byte, error) {
        b := make([]byte, 4)
@@ -229,6 +220,12 @@ func (e *EDNS0_SUBNET) pack() ([]byte, error) {
        b[2] = e.SourceNetmask
        b[3] = e.SourceScope
        switch e.Family {
+       case 0:
+               // "dig" sets AddressFamily to 0 if SourceNetmask is also 0
+               // We might don't need to complain either
+               if e.SourceNetmask != 0 {
+                       return nil, errors.New("dns: bad address family")
+               }
        case 1:
                if e.SourceNetmask > net.IPv4len*8 {
                        return nil, errors.New("dns: bad netmask")
@@ -263,6 +260,13 @@ func (e *EDNS0_SUBNET) unpack(b []byte) error {
        e.SourceNetmask = b[2]
        e.SourceScope = b[3]
        switch e.Family {
+       case 0:
+               // "dig" sets AddressFamily to 0 if SourceNetmask is also 0
+               // It's okay to accept such a packet
+               if e.SourceNetmask != 0 {
+                       return errors.New("dns: bad address family")
+               }
+               e.Address = net.IPv4(0, 0, 0, 0)
        case 1:
                if e.SourceNetmask > net.IPv4len*8 || e.SourceScope > net.IPv4len*8 {
                        return errors.New("dns: bad netmask")
@@ -332,6 +336,7 @@ func (e *EDNS0_COOKIE) pack() ([]byte, error) {
        return h, nil
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_COOKIE) Option() uint16        { return EDNS0COOKIE }
 func (e *EDNS0_COOKIE) unpack(b []byte) error { e.Cookie = hex.EncodeToString(b); return nil }
 func (e *EDNS0_COOKIE) String() string        { return e.Cookie }
@@ -353,6 +358,7 @@ type EDNS0_UL struct {
        Lease uint32
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_UL) Option() uint16 { return EDNS0UL }
 func (e *EDNS0_UL) String() string { return strconv.FormatUint(uint64(e.Lease), 10) }
 
@@ -382,6 +388,7 @@ type EDNS0_LLQ struct {
        LeaseLife uint32
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_LLQ) Option() uint16 { return EDNS0LLQ }
 
 func (e *EDNS0_LLQ) pack() ([]byte, error) {
@@ -413,11 +420,13 @@ func (e *EDNS0_LLQ) String() string {
        return s
 }
 
+// EDNS0_DUA implements the EDNS0 "DNSSEC Algorithm Understood" option. See RFC 6975.
 type EDNS0_DAU struct {
        Code    uint16 // Always EDNS0DAU
        AlgCode []uint8
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_DAU) Option() uint16        { return EDNS0DAU }
 func (e *EDNS0_DAU) pack() ([]byte, error) { return e.AlgCode, nil }
 func (e *EDNS0_DAU) unpack(b []byte) error { e.AlgCode = b; return nil }
@@ -434,11 +443,13 @@ func (e *EDNS0_DAU) String() string {
        return s
 }
 
+// EDNS0_DHU implements the EDNS0 "DS Hash Understood" option. See RFC 6975.
 type EDNS0_DHU struct {
        Code    uint16 // Always EDNS0DHU
        AlgCode []uint8
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_DHU) Option() uint16        { return EDNS0DHU }
 func (e *EDNS0_DHU) pack() ([]byte, error) { return e.AlgCode, nil }
 func (e *EDNS0_DHU) unpack(b []byte) error { e.AlgCode = b; return nil }
@@ -455,11 +466,13 @@ func (e *EDNS0_DHU) String() string {
        return s
 }
 
+// EDNS0_N3U implements the EDNS0 "NSEC3 Hash Understood" option. See RFC 6975.
 type EDNS0_N3U struct {
        Code    uint16 // Always EDNS0N3U
        AlgCode []uint8
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_N3U) Option() uint16        { return EDNS0N3U }
 func (e *EDNS0_N3U) pack() ([]byte, error) { return e.AlgCode, nil }
 func (e *EDNS0_N3U) unpack(b []byte) error { e.AlgCode = b; return nil }
@@ -477,11 +490,13 @@ func (e *EDNS0_N3U) String() string {
        return s
 }
 
+// EDNS0_EXPIRE implementes the EDNS0 option as described in RFC 7314.
 type EDNS0_EXPIRE struct {
        Code   uint16 // Always EDNS0EXPIRE
        Expire uint32
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_EXPIRE) Option() uint16 { return EDNS0EXPIRE }
 func (e *EDNS0_EXPIRE) String() string { return strconv.FormatUint(uint64(e.Expire), 10) }
 
@@ -520,6 +535,7 @@ type EDNS0_LOCAL struct {
        Data []byte
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_LOCAL) Option() uint16 { return e.Code }
 func (e *EDNS0_LOCAL) String() string {
        return strconv.FormatInt(int64(e.Code), 10) + ":0x" + hex.EncodeToString(e.Data)
@@ -551,6 +567,7 @@ type EDNS0_TCP_KEEPALIVE struct {
        Timeout uint16 // an idle timeout value for the TCP connection, specified in units of 100 milliseconds, encoded in network byte order.
 }
 
+// Option implements the EDNS0 interface.
 func (e *EDNS0_TCP_KEEPALIVE) Option() uint16 { return EDNS0TCPKEEPALIVE }
 
 func (e *EDNS0_TCP_KEEPALIVE) pack() ([]byte, error) {
@@ -595,3 +612,16 @@ func (e *EDNS0_TCP_KEEPALIVE) String() (s string) {
        }
        return
 }
+
+// EDNS0_PADDING option is used to add padding to a request/response. The default
+// value of padding SHOULD be 0x0 but other values MAY be used, for instance if
+// compression is applied before encryption which may break signatures.
+type EDNS0_PADDING struct {
+       Padding []byte
+}
+
+// Option implements the EDNS0 interface.
+func (e *EDNS0_PADDING) Option() uint16        { return EDNS0PADDING }
+func (e *EDNS0_PADDING) pack() ([]byte, error) { return e.Padding, nil }
+func (e *EDNS0_PADDING) unpack(b []byte) error { e.Padding = b; return nil }
+func (e *EDNS0_PADDING) String() string        { return fmt.Sprintf("%0X", e.Padding) }

diff --git a/vendor/github.com/miekg/dns/fuzz.go b/vendor/github.com/miekg/dns/fuzz.go
new file mode 100644 (file)
index 0000000..a8a0918
--- /dev/null
+++ b/vendor/github.com/miekg/dns/fuzz.go
@@ -0,0 +1,23 @@
+// +build fuzz
+
+package dns
+
+func Fuzz(data []byte) int {
+       msg := new(Msg)
+
+       if err := msg.Unpack(data); err != nil {
+               return 0
+       }
+       if _, err := msg.Pack(); err != nil {
+               return 0
+       }
+
+       return 1
+}
+
+func FuzzNewRR(data []byte) int {
+       if _, err := NewRR(string(data)); err != nil {
+               return 0
+       }
+       return 1
+}

diff --git a/vendor/github.com/miekg/dns/labels.go b/vendor/github.com/miekg/dns/labels.go
index 9538d9c3a63de8f137d4b9c9e7bbd0d9e51bd262..760b89e7114f3ddd420e75509a588a9e03557697 100644 (file)
--- a/vendor/github.com/miekg/dns/labels.go
+++ b/vendor/github.com/miekg/dns/labels.go
@@ -1,7 +1,5 @@
 package dns
 
-import "strings"
-
 // Holds a bunch of helper functions for dealing with labels.
 
 // SplitDomainName splits a name string into it's labels.
@@ -44,7 +42,7 @@ func SplitDomainName(s string) (labels []string) {
 
 // CompareDomainName compares the names s1 and s2 and
 // returns how many labels they have in common starting from the *right*.
-// The comparison stops at the first inequality. The names are not downcased
+// The comparison stops at the first inequality. The names are downcased
 // before the comparison.
 //
 // www.miek.nl. and miek.nl. have two labels in common: miek and nl
@@ -52,24 +50,21 @@ func SplitDomainName(s string) (labels []string) {
 //
 // s1 and s2 must be syntactically valid domain names.
 func CompareDomainName(s1, s2 string) (n int) {
-       s1, s2 = strings.ToLower(s1), strings.ToLower(s2)
-       s1 = Fqdn(s1)
-       s2 = Fqdn(s2)
-       l1 := Split(s1)
-       l2 := Split(s2)
-
        // the first check: root label
-       if l1 == nil || l2 == nil {
-               return
+       if s1 == "." || s2 == "." {
+               return 0
        }
 
+       l1 := Split(s1)
+       l2 := Split(s2)
+
        j1 := len(l1) - 1 // end
        i1 := len(l1) - 2 // start
        j2 := len(l2) - 1
        i2 := len(l2) - 2
        // the second check can be done here: last/only label
        // before we fall through into the for-loop below
-       if s1[l1[j1]:] == s2[l2[j2]:] {
+       if equal(s1[l1[j1]:], s2[l2[j2]:]) {
                n++
        } else {
                return
@@ -78,7 +73,7 @@ func CompareDomainName(s1, s2 string) (n int) {
                if i1 < 0 || i2 < 0 {
                        break
                }
-               if s1[l1[i1]:l1[j1]] == s2[l2[i2]:l2[j2]] {
+               if equal(s1[l1[i1]:l1[j1]], s2[l2[i2]:l2[j2]]) {
                        n++
                } else {
                        break
@@ -169,3 +164,28 @@ func PrevLabel(s string, n int) (i int, start bool) {
        }
        return lab[len(lab)-n], false
 }
+
+// equal compares a and b while ignoring case. It returns true when equal otherwise false.
+func equal(a, b string) bool {
+       // might be lifted into API function.
+       la := len(a)
+       lb := len(b)
+       if la != lb {
+               return false
+       }
+
+       for i := la - 1; i >= 0; i-- {
+               ai := a[i]
+               bi := b[i]
+               if ai >= 'A' && ai <= 'Z' {
+                       ai |= ('a' - 'A')
+               }
+               if bi >= 'A' && bi <= 'Z' {
+                       bi |= ('a' - 'A')
+               }
+               if ai != bi {
+                       return false
+               }
+       }
+       return true
+}

diff --git a/vendor/github.com/miekg/dns/msg.go b/vendor/github.com/miekg/dns/msg.go
index 605fe6c5c35c7cb3e31392fc65b783863d1fb510..975dde781c0941920a0ed52f77a1b683923b9c65 100644 (file)
--- a/vendor/github.com/miekg/dns/msg.go
+++ b/vendor/github.com/miekg/dns/msg.go
@@ -26,6 +26,7 @@ const (
        maxDomainNameWireOctets = 255     // See RFC 1035 section 2.3.4
 )
 
+// Errors defined in this package.
 var (
        ErrAlg           error = &Error{err: "bad algorithm"}                  // ErrAlg indicates an error with the (DNSSEC) algorithm.
        ErrAuth          error = &Error{err: "bad authentication"}             // ErrAuth indicates an error in the TSIG authentication.
@@ -57,7 +58,7 @@ var (
 // For instance, to make it return a static value:
 //
 //     dns.Id = func() uint16 { return 3 }
-var Id func() uint16 = id
+var Id = id
 
 var (
        idLock sync.Mutex
@@ -360,7 +361,7 @@ Loop:
                                case '"', '\\':
                                        s = append(s, '\\', b)
                                        // presentation-format \X escapes add an extra byte
-                                       maxLen += 1
+                                       maxLen++
                                default:
                                        if b < 32 || b >= 127 { // unprintable, use \DDD
                                                var buf [3]byte
@@ -611,8 +612,8 @@ func UnpackRR(msg []byte, off int) (rr RR, off1 int, err error) {
 // If we cannot unpack the whole array, then it will return nil
 func unpackRRslice(l int, msg []byte, off int) (dst1 []RR, off1 int, err error) {
        var r RR
-       // Optimistically make dst be the length that was sent
-       dst := make([]RR, 0, l)
+       // Don't pre-allocate, l may be under attacker control
+       var dst []RR
        for i := 0; i < l; i++ {
                off1 := off
                r, off, err = UnpackRR(msg, off)
@@ -810,13 +811,19 @@ func (dns *Msg) Unpack(msg []byte) (err error) {
        dns.CheckingDisabled = (dh.Bits & _CD) != 0
        dns.Rcode = int(dh.Bits & 0xF)
 
+       // If we are at the end of the message we should return *just* the
+       // header. This can still be useful to the caller. 9.9.9.9 sends these
+       // when responding with REFUSED for instance.
        if off == len(msg) {
-               return ErrTruncated
+               // reset sections before returning
+               dns.Question, dns.Answer, dns.Ns, dns.Extra = nil, nil, nil, nil
+               return nil
        }
 
-       // Optimistically use the count given to us in the header
-       dns.Question = make([]Question, 0, int(dh.Qdcount))
-
+       // Qdcount, Ancount, Nscount, Arcount can't be trusted, as they are
+       // attacker controlled. This means we can't use them to pre-allocate
+       // slices.
+       dns.Question = nil
        for i := 0; i < int(dh.Qdcount); i++ {
                off1 := off
                var q Question
@@ -913,67 +920,55 @@ func (dns *Msg) Len() int { return compressedLen(dns, dns.Compress) }
 func compressedLen(dns *Msg, compress bool) int {
        // We always return one more than needed.
        l := 12 // Message header is always 12 bytes
-       compression := map[string]int{}
-
-       for i := 0; i < len(dns.Question); i++ {
-               l += dns.Question[i].len()
-               if compress {
-                       compressionLenHelper(compression, dns.Question[i].Name)
+       if compress {
+               compression := map[string]int{}
+               for _, r := range dns.Question {
+                       l += r.len()
+                       compressionLenHelper(compression, r.Name)
                }
-       }
-       for i := 0; i < len(dns.Answer); i++ {
-               if dns.Answer[i] == nil {
-                       continue
+               l += compressionLenSlice(compression, dns.Answer)
+               l += compressionLenSlice(compression, dns.Ns)
+               l += compressionLenSlice(compression, dns.Extra)
+       } else {
+               for _, r := range dns.Question {
+                       l += r.len()
                }
-               l += dns.Answer[i].len()
-               if compress {
-                       k, ok := compressionLenSearch(compression, dns.Answer[i].Header().Name)
-                       if ok {
-                               l += 1 - k
-                       }
-                       compressionLenHelper(compression, dns.Answer[i].Header().Name)
-                       k, ok = compressionLenSearchType(compression, dns.Answer[i])
-                       if ok {
-                               l += 1 - k
+               for _, r := range dns.Answer {
+                       if r != nil {
+                               l += r.len()
                        }
-                       compressionLenHelperType(compression, dns.Answer[i])
-               }
-       }
-       for i := 0; i < len(dns.Ns); i++ {
-               if dns.Ns[i] == nil {
-                       continue
                }
-               l += dns.Ns[i].len()
-               if compress {
-                       k, ok := compressionLenSearch(compression, dns.Ns[i].Header().Name)
-                       if ok {
-                               l += 1 - k
+               for _, r := range dns.Ns {
+                       if r != nil {
+                               l += r.len()
                        }
-                       compressionLenHelper(compression, dns.Ns[i].Header().Name)
-                       k, ok = compressionLenSearchType(compression, dns.Ns[i])
-                       if ok {
-                               l += 1 - k
+               }
+               for _, r := range dns.Extra {
+                       if r != nil {
+                               l += r.len()
                        }
-                       compressionLenHelperType(compression, dns.Ns[i])
                }
        }
-       for i := 0; i < len(dns.Extra); i++ {
-               if dns.Extra[i] == nil {
+       return l
+}
+
+func compressionLenSlice(c map[string]int, rs []RR) int {
+       var l int
+       for _, r := range rs {
+               if r == nil {
                        continue
                }
-               l += dns.Extra[i].len()
-               if compress {
-                       k, ok := compressionLenSearch(compression, dns.Extra[i].Header().Name)
-                       if ok {
-                               l += 1 - k
-                       }
-                       compressionLenHelper(compression, dns.Extra[i].Header().Name)
-                       k, ok = compressionLenSearchType(compression, dns.Extra[i])
-                       if ok {
-                               l += 1 - k
-                       }
-                       compressionLenHelperType(compression, dns.Extra[i])
+               l += r.len()
+               k, ok := compressionLenSearch(c, r.Header().Name)
+               if ok {
+                       l += 1 - k
+               }
+               compressionLenHelper(c, r.Header().Name)
+               k, ok = compressionLenSearchType(c, r)
+               if ok {
+                       l += 1 - k
                }
+               compressionLenHelperType(c, r)
        }
        return l
 }

diff --git a/vendor/github.com/miekg/dns/msg_generate.go b/vendor/github.com/miekg/dns/msg_generate.go
index 4d9f81d4329a3b68d9ca32fa24e8da0047bf900a..8ba609f7269e8669a07512e2abe3056a6dd68bec 100644 (file)
--- a/vendor/github.com/miekg/dns/msg_generate.go
+++ b/vendor/github.com/miekg/dns/msg_generate.go
@@ -18,8 +18,7 @@ import (
 )
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from msg_generate.go
+// Code generated by "go run msg_generate.go"; DO NOT EDIT.
 
 package dns
 

diff --git a/vendor/github.com/miekg/dns/msg_helpers.go b/vendor/github.com/miekg/dns/msg_helpers.go
index 8d415c92a376f9edf9a14e0f44f2c5f178b5e95c..946d5acbf02646ef520447070b00a5277d69a916 100644 (file)
--- a/vendor/github.com/miekg/dns/msg_helpers.go
+++ b/vendor/github.com/miekg/dns/msg_helpers.go
@@ -406,16 +406,13 @@ Option:
                }
                edns = append(edns, e)
                off += int(optlen)
-       case EDNS0SUBNET, EDNS0SUBNETDRAFT:
+       case EDNS0SUBNET:
                e := new(EDNS0_SUBNET)
                if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
                        return nil, len(msg), err
                }
                edns = append(edns, e)
                off += int(optlen)
-               if code == EDNS0SUBNETDRAFT {
-                       e.DraftOption = true
-               }
        case EDNS0COOKIE:
                e := new(EDNS0_COOKIE)
                if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
@@ -458,6 +455,13 @@ Option:
                }
                edns = append(edns, e)
                off += int(optlen)
+       case EDNS0PADDING:
+               e := new(EDNS0_PADDING)
+               if err := e.unpack(msg[off : off+int(optlen)]); err != nil {
+                       return nil, len(msg), err
+               }
+               edns = append(edns, e)
+               off += int(optlen)
        default:
                e := new(EDNS0_LOCAL)
                e.Code = code

diff --git a/vendor/github.com/miekg/dns/sanitize.go b/vendor/github.com/miekg/dns/sanitize.go
index b489f3f050bfa9b2d3a0a1bd1928660e65c56d39..c415bdd6c36a6b3123e965eace54d9ecf4ee3fbc 100644 (file)
--- a/vendor/github.com/miekg/dns/sanitize.go
+++ b/vendor/github.com/miekg/dns/sanitize.go
@@ -3,7 +3,7 @@ package dns
 // Dedup removes identical RRs from rrs. It preserves the original ordering.
 // The lowest TTL of any duplicates is used in the remaining one. Dedup modifies
 // rrs.
-// m is used to store the RRs temporay. If it is nil a new map will be allocated.
+// m is used to store the RRs temporary. If it is nil a new map will be allocated.
 func Dedup(rrs []RR, m map[string]RR) []RR {
        if m == nil {
                m = make(map[string]RR)

diff --git a/vendor/github.com/miekg/dns/scan.go b/vendor/github.com/miekg/dns/scan.go
index a76f1d83fc0a3049432104216c891b83f22f6cb0..77542caab63882d8c5d813c05409380f454280f7 100644 (file)
--- a/vendor/github.com/miekg/dns/scan.go
+++ b/vendor/github.com/miekg/dns/scan.go
@@ -1,23 +1,14 @@
 package dns
 
 import (
+       "fmt"
        "io"
-       "log"
        "os"
+       "path/filepath"
        "strconv"
        "strings"
 )
 
-type debugging bool
-
-const debug debugging = false
-
-func (d debugging) Printf(format string, args ...interface{}) {
-       if d {
-               log.Printf(format, args...)
-       }
-}
-
 const maxTok = 2048 // Largest token we can return.
 const maxUint16 = 1<<16 - 1
 
@@ -38,7 +29,7 @@ const (
        zOwner
        zClass
        zDirOrigin   // $ORIGIN
-       zDirTtl      // $TTL
+       zDirTTL      // $TTL
        zDirInclude  // $INCLUDE
        zDirGenerate // $GENERATE
 
@@ -51,13 +42,13 @@ const (
        zExpectAny           // Expect rrtype, ttl or class
        zExpectAnyNoClass    // Expect rrtype or ttl
        zExpectAnyNoClassBl  // The whitespace after _EXPECT_ANY_NOCLASS
-       zExpectAnyNoTtl      // Expect rrtype or class
-       zExpectAnyNoTtlBl    // Whitespace after _EXPECT_ANY_NOTTL
+       zExpectAnyNoTTL      // Expect rrtype or class
+       zExpectAnyNoTTLBl    // Whitespace after _EXPECT_ANY_NOTTL
        zExpectRrtype        // Expect rrtype
        zExpectRrtypeBl      // Whitespace BEFORE rrtype
        zExpectRdata         // The first element of the rdata
-       zExpectDirTtlBl      // Space after directive $TTL
-       zExpectDirTtl        // Directive $TTL
+       zExpectDirTTLBl      // Space after directive $TTL
+       zExpectDirTTL        // Directive $TTL
        zExpectDirOriginBl   // Space after directive $ORIGIN
        zExpectDirOrigin     // Directive $ORIGIN
        zExpectDirIncludeBl  // Space after directive $INCLUDE
@@ -105,6 +96,12 @@ type Token struct {
        Comment string
 }
 
+// ttlState describes the state necessary to fill in an omitted RR TTL
+type ttlState struct {
+       ttl           uint32 // ttl is the current default TTL
+       isByDirective bool   // isByDirective indicates whether ttl was set by a $TTL directive
+}
+
 // NewRR reads the RR contained in the string s. Only the first RR is
 // returned. If s contains no RR, return nil with no error. The class
 // defaults to IN and TTL defaults to 3600. The full zone file syntax
@@ -120,7 +117,8 @@ func NewRR(s string) (RR, error) {
 // ReadRR reads the RR contained in q.
 // See NewRR for more documentation.
 func ReadRR(q io.Reader, filename string) (RR, error) {
-       r := <-parseZoneHelper(q, ".", filename, 1)
+       defttl := &ttlState{defaultTtl, false}
+       r := <-parseZoneHelper(q, ".", filename, defttl, 1)
        if r == nil {
                return nil, nil
        }
@@ -132,10 +130,10 @@ func ReadRR(q io.Reader, filename string) (RR, error) {
 }
 
 // ParseZone reads a RFC 1035 style zonefile from r. It returns *Tokens on the
-// returned channel, which consist out the parsed RR, a potential comment or an error.
-// If there is an error the RR is nil. The string file is only used
+// returned channel, each consisting of either a parsed RR and optional comment
+// or a nil RR and an error. The string file is only used
 // in error reporting. The string origin is used as the initial origin, as
-// if the file would start with: $ORIGIN origin .
+// if the file would start with an $ORIGIN directive.
 // The directives $INCLUDE, $ORIGIN, $TTL and $GENERATE are supported.
 // The channel t is closed by ParseZone when the end of r is reached.
 //
@@ -157,25 +155,37 @@ func ReadRR(q io.Reader, filename string) (RR, error) {
 // The text "; this is comment" is returned in Token.Comment. Comments inside the
 // RR are discarded. Comments on a line by themselves are discarded too.
 func ParseZone(r io.Reader, origin, file string) chan *Token {
-       return parseZoneHelper(r, origin, file, 10000)
+       return parseZoneHelper(r, origin, file, nil, 10000)
 }
 
-func parseZoneHelper(r io.Reader, origin, file string, chansize int) chan *Token {
+func parseZoneHelper(r io.Reader, origin, file string, defttl *ttlState, chansize int) chan *Token {
        t := make(chan *Token, chansize)
-       go parseZone(r, origin, file, t, 0)
+       go parseZone(r, origin, file, defttl, t, 0)
        return t
 }
 
-func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
+func parseZone(r io.Reader, origin, f string, defttl *ttlState, t chan *Token, include int) {
        defer func() {
                if include == 0 {
                        close(t)
                }
        }()
-       s := scanInit(r)
+       s, cancel := scanInit(r)
        c := make(chan lex)
        // Start the lexer
        go zlexer(s, c)
+
+       defer func() {
+               cancel()
+               // zlexer can send up to three tokens, the next one and possibly 2 remainders.
+               // Do a non-blocking read.
+               _, ok := <-c
+               _, ok = <-c
+               _, ok = <-c
+               if !ok {
+                       // too bad
+               }
+       }()
        // 6 possible beginnings of a line, _ is a space
        // 0. zRRTYPE                              -> all omitted until the rrtype
        // 1. zOwner _ zRrtype                     -> class/ttl omitted
@@ -186,18 +196,16 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
        // After detecting these, we know the zRrtype so we can jump to functions
        // handling the rdata for each of these types.
 
-       if origin == "" {
-               origin = "."
-       }
-       origin = Fqdn(origin)
-       if _, ok := IsDomainName(origin); !ok {
-               t <- &Token{Error: &ParseError{f, "bad initial origin name", lex{}}}
-               return
+       if origin != "" {
+               origin = Fqdn(origin)
+               if _, ok := IsDomainName(origin); !ok {
+                       t <- &Token{Error: &ParseError{f, "bad initial origin name", lex{}}}
+                       return
+               }
        }
 
        st := zExpectOwnerDir // initial state
        var h RR_Header
-       var defttl uint32 = defaultTtl
        var prevName string
        for l := range c {
                // Lexer spotted an error already
@@ -209,31 +217,25 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                switch st {
                case zExpectOwnerDir:
                        // We can also expect a directive, like $TTL or $ORIGIN
-                       h.Ttl = defttl
+                       if defttl != nil {
+                               h.Ttl = defttl.ttl
+                       }
                        h.Class = ClassINET
                        switch l.value {
                        case zNewline:
                                st = zExpectOwnerDir
                        case zOwner:
                                h.Name = l.token
-                               if l.token[0] == '@' {
-                                       h.Name = origin
-                                       prevName = h.Name
-                                       st = zExpectOwnerBl
-                                       break
-                               }
-                               if h.Name[l.length-1] != '.' {
-                                       h.Name = appendOrigin(h.Name, origin)
-                               }
-                               _, ok := IsDomainName(l.token)
+                               name, ok := toAbsoluteName(l.token, origin)
                                if !ok {
                                        t <- &Token{Error: &ParseError{f, "bad owner name", l}}
                                        return
                                }
+                               h.Name = name
                                prevName = h.Name
                                st = zExpectOwnerBl
-                       case zDirTtl:
-                               st = zExpectDirTtlBl
+                       case zDirTTL:
+                               st = zExpectDirTTLBl
                        case zDirOrigin:
                                st = zExpectDirOriginBl
                        case zDirInclude:
@@ -252,15 +254,16 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                                // Discard, can happen when there is nothing on the
                                // line except the RR type
                        case zString:
-                               ttl, ok := stringToTtl(l.token)
+                               ttl, ok := stringToTTL(l.token)
                                if !ok {
                                        t <- &Token{Error: &ParseError{f, "not a TTL", l}}
                                        return
                                }
                                h.Ttl = ttl
-                               // Don't about the defttl, we should take the $TTL value
-                               // defttl = ttl
-                               st = zExpectAnyNoTtlBl
+                               if defttl == nil || !defttl.isByDirective {
+                                       defttl = &ttlState{ttl, false}
+                               }
+                               st = zExpectAnyNoTTLBl
 
                        default:
                                t <- &Token{Error: &ParseError{f, "syntax error at beginning", l}}
@@ -282,20 +285,12 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                        case zBlank:
                                l := <-c
                                if l.value == zString {
-                                       if _, ok := IsDomainName(l.token); !ok || l.length == 0 || l.err {
+                                       name, ok := toAbsoluteName(l.token, origin)
+                                       if !ok {
                                                t <- &Token{Error: &ParseError{f, "bad origin name", l}}
                                                return
                                        }
-                                       // a new origin is specified.
-                                       if l.token[l.length-1] != '.' {
-                                               if origin != "." { // Prevent .. endings
-                                                       neworigin = l.token + "." + origin
-                                               } else {
-                                                       neworigin = l.token + origin
-                                               }
-                                       } else {
-                                               neworigin = l.token
-                                       }
+                                       neworigin = name
                                }
                        case zNewline, zEOF:
                                // Ok
@@ -304,24 +299,32 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                                return
                        }
                        // Start with the new file
-                       r1, e1 := os.Open(l.token)
+                       includePath := l.token
+                       if !filepath.IsAbs(includePath) {
+                               includePath = filepath.Join(filepath.Dir(f), includePath)
+                       }
+                       r1, e1 := os.Open(includePath)
                        if e1 != nil {
-                               t <- &Token{Error: &ParseError{f, "failed to open `" + l.token + "'", l}}
+                               msg := fmt.Sprintf("failed to open `%s'", l.token)
+                               if !filepath.IsAbs(l.token) {
+                                       msg += fmt.Sprintf(" as `%s'", includePath)
+                               }
+                               t <- &Token{Error: &ParseError{f, msg, l}}
                                return
                        }
                        if include+1 > 7 {
                                t <- &Token{Error: &ParseError{f, "too deeply nested $INCLUDE", l}}
                                return
                        }
-                       parseZone(r1, neworigin, l.token, t, include+1)
+                       parseZone(r1, neworigin, includePath, defttl, t, include+1)
                        st = zExpectOwnerDir
-               case zExpectDirTtlBl:
+               case zExpectDirTTLBl:
                        if l.value != zBlank {
                                t <- &Token{Error: &ParseError{f, "no blank after $TTL-directive", l}}
                                return
                        }
-                       st = zExpectDirTtl
-               case zExpectDirTtl:
+                       st = zExpectDirTTL
+               case zExpectDirTTL:
                        if l.value != zString {
                                t <- &Token{Error: &ParseError{f, "expecting $TTL value, not this...", l}}
                                return
@@ -330,12 +333,12 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                                t <- &Token{Error: e}
                                return
                        }
-                       ttl, ok := stringToTtl(l.token)
+                       ttl, ok := stringToTTL(l.token)
                        if !ok {
                                t <- &Token{Error: &ParseError{f, "expecting $TTL value, not this...", l}}
                                return
                        }
-                       defttl = ttl
+                       defttl = &ttlState{ttl, true}
                        st = zExpectOwnerDir
                case zExpectDirOriginBl:
                        if l.value != zBlank {
@@ -351,19 +354,12 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                        if e, _ := slurpRemainder(c, f); e != nil {
                                t <- &Token{Error: e}
                        }
-                       if _, ok := IsDomainName(l.token); !ok {
+                       name, ok := toAbsoluteName(l.token, origin)
+                       if !ok {
                                t <- &Token{Error: &ParseError{f, "bad origin name", l}}
                                return
                        }
-                       if l.token[l.length-1] != '.' {
-                               if origin != "." { // Prevent .. endings
-                                       origin = l.token + "." + origin
-                               } else {
-                                       origin = l.token + origin
-                               }
-                       } else {
-                               origin = l.token
-                       }
+                       origin = name
                        st = zExpectOwnerDir
                case zExpectDirGenerateBl:
                        if l.value != zBlank {
@@ -390,20 +386,26 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                case zExpectAny:
                        switch l.value {
                        case zRrtpe:
+                               if defttl == nil {
+                                       t <- &Token{Error: &ParseError{f, "missing TTL with no previous value", l}}
+                                       return
+                               }
                                h.Rrtype = l.torc
                                st = zExpectRdata
                        case zClass:
                                h.Class = l.torc
                                st = zExpectAnyNoClassBl
                        case zString:
-                               ttl, ok := stringToTtl(l.token)
+                               ttl, ok := stringToTTL(l.token)
                                if !ok {
                                        t <- &Token{Error: &ParseError{f, "not a TTL", l}}
                                        return
                                }
                                h.Ttl = ttl
-                               // defttl = ttl // don't set the defttl here
-                               st = zExpectAnyNoTtlBl
+                               if defttl == nil || !defttl.isByDirective {
+                                       defttl = &ttlState{ttl, false}
+                               }
+                               st = zExpectAnyNoTTLBl
                        default:
                                t <- &Token{Error: &ParseError{f, "expecting RR type, TTL or class, not this...", l}}
                                return
@@ -414,13 +416,13 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                                return
                        }
                        st = zExpectAnyNoClass
-               case zExpectAnyNoTtlBl:
+               case zExpectAnyNoTTLBl:
                        if l.value != zBlank {
                                t <- &Token{Error: &ParseError{f, "no blank before TTL", l}}
                                return
                        }
-                       st = zExpectAnyNoTtl
-               case zExpectAnyNoTtl:
+                       st = zExpectAnyNoTTL
+               case zExpectAnyNoTTL:
                        switch l.value {
                        case zClass:
                                h.Class = l.torc
@@ -435,13 +437,15 @@ func parseZone(r io.Reader, origin, f string, t chan *Token, include int) {
                case zExpectAnyNoClass:
                        switch l.value {
                        case zString:
-                               ttl, ok := stringToTtl(l.token)
+                               ttl, ok := stringToTTL(l.token)
                                if !ok {
                                        t <- &Token{Error: &ParseError{f, "not a TTL", l}}
                                        return
                                }
                                h.Ttl = ttl
-                               // defttl = ttl // don't set the def ttl anymore
+                               if defttl == nil || !defttl.isByDirective {
+                                       defttl = &ttlState{ttl, false}
+                               }
                                st = zExpectRrtypeBl
                        case zRrtpe:
                                h.Rrtype = l.torc
@@ -504,14 +508,12 @@ func zlexer(s *scan, c chan lex) {
                if stri >= maxTok {
                        l.token = "token length insufficient for parsing"
                        l.err = true
-                       debug.Printf("[%+v]", l.token)
                        c <- l
                        return
                }
                if comi >= maxTok {
                        l.token = "comment length insufficient for parsing"
                        l.err = true
-                       debug.Printf("[%+v]", l.token)
                        c <- l
                        return
                }
@@ -546,7 +548,7 @@ func zlexer(s *scan, c chan lex) {
                                // escape $... start with a \ not a $, so this will work
                                switch l.tokenUpper {
                                case "$TTL":
-                                       l.value = zDirTtl
+                                       l.value = zDirTTL
                                case "$ORIGIN":
                                        l.value = zDirOrigin
                                case "$INCLUDE":
@@ -554,7 +556,6 @@ func zlexer(s *scan, c chan lex) {
                                case "$GENERATE":
                                        l.value = zDirGenerate
                                }
-                               debug.Printf("[7 %+v]", l.token)
                                c <- l
                        } else {
                                l.value = zString
@@ -596,7 +597,6 @@ func zlexer(s *scan, c chan lex) {
                                                }
                                        }
                                }
-                               debug.Printf("[6 %+v]", l.token)
                                c <- l
                        }
                        stri = 0
@@ -605,7 +605,6 @@ func zlexer(s *scan, c chan lex) {
                                l.value = zBlank
                                l.token = " "
                                l.length = 1
-                               debug.Printf("[5 %+v]", l.token)
                                c <- l
                        }
                        owner = false
@@ -628,7 +627,6 @@ func zlexer(s *scan, c chan lex) {
                                l.token = string(str[:stri])
                                l.tokenUpper = strings.ToUpper(l.token)
                                l.length = stri
-                               debug.Printf("[4 %+v]", l.token)
                                c <- l
                                stri = 0
                        }
@@ -666,7 +664,6 @@ func zlexer(s *scan, c chan lex) {
                                        l.tokenUpper = l.token
                                        l.length = 1
                                        l.comment = string(com[:comi])
-                                       debug.Printf("[3 %+v %+v]", l.token, l.comment)
                                        c <- l
                                        l.comment = ""
                                        comi = 0
@@ -692,14 +689,12 @@ func zlexer(s *scan, c chan lex) {
                                                        rrtype = true
                                                }
                                        }
-                                       debug.Printf("[2 %+v]", l.token)
                                        c <- l
                                }
                                l.value = zNewline
                                l.token = "\n"
                                l.tokenUpper = l.token
                                l.length = 1
-                               debug.Printf("[1 %+v]", l.token)
                                c <- l
                                stri = 0
                                commt = false
@@ -745,7 +740,6 @@ func zlexer(s *scan, c chan lex) {
                                l.tokenUpper = strings.ToUpper(l.token)
                                l.length = stri
 
-                               debug.Printf("[%+v]", l.token)
                                c <- l
                                stri = 0
                        }
@@ -781,7 +775,6 @@ func zlexer(s *scan, c chan lex) {
                                        l.token = "extra closing brace"
                                        l.tokenUpper = l.token
                                        l.err = true
-                                       debug.Printf("[%+v]", l.token)
                                        c <- l
                                        return
                                }
@@ -807,7 +800,6 @@ func zlexer(s *scan, c chan lex) {
                l.tokenUpper = strings.ToUpper(l.token)
                l.length = stri
                l.value = zString
-               debug.Printf("[%+v]", l.token)
                c <- l
        }
        if brace != 0 {
@@ -844,8 +836,8 @@ func typeToInt(token string) (uint16, bool) {
        return uint16(typ), true
 }
 
-// Parse things like 2w, 2m, etc, Return the time in seconds.
-func stringToTtl(token string) (uint32, bool) {
+// stringToTTL parses things like 2w, 2m, etc, and returns the time in seconds.
+func stringToTTL(token string) (uint32, bool) {
        s := uint32(0)
        i := uint32(0)
        for _, c := range token {
@@ -918,6 +910,34 @@ func stringToCm(token string) (e, m uint8, ok bool) {
        return
 }
 
+func toAbsoluteName(name, origin string) (absolute string, ok bool) {
+       // check for an explicit origin reference
+       if name == "@" {
+               // require a nonempty origin
+               if origin == "" {
+                       return "", false
+               }
+               return origin, true
+       }
+
+       // require a valid domain name
+       _, ok = IsDomainName(name)
+       if !ok || name == "" {
+               return "", false
+       }
+
+       // check if name is already absolute
+       if name[len(name)-1] == '.' {
+               return name, true
+       }
+
+       // require a nonempty origin
+       if origin == "" {
+               return "", false
+       }
+       return appendOrigin(name, origin), true
+}
+
 func appendOrigin(name, origin string) string {
        if origin == "." {
                return name + origin

diff --git a/vendor/github.com/miekg/dns/scan_rr.go b/vendor/github.com/miekg/dns/scan_rr.go
index b8b18fd776dd0a4d651353d820dba68fef48818e..f4ccc84246c59583bdbc662dd68b3ba799c4fe67 100644 (file)
--- a/vendor/github.com/miekg/dns/scan_rr.go
+++ b/vendor/github.com/miekg/dns/scan_rr.go
@@ -130,9 +130,10 @@ func setA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 { // Dynamic updates.
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        rr.A = net.ParseIP(l.token)
        if rr.A == nil || l.err {
                return nil, &ParseError{f, "bad A A", l}, ""
@@ -145,9 +146,10 @@ func setAAAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        rr.AAAA = net.ParseIP(l.token)
        if rr.AAAA == nil || l.err {
                return nil, &ParseError{f, "bad AAAA AAAA", l}, ""
@@ -161,20 +163,15 @@ func setNS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Ns = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Ns = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad NS Ns", l}, ""
        }
-       if rr.Ns[l.length-1] != '.' {
-               rr.Ns = appendOrigin(rr.Ns, o)
-       }
+       rr.Ns = name
        return rr, nil, ""
 }
 
@@ -187,17 +184,12 @@ func setPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       if l.token == "@" {
-               rr.Ptr = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad PTR Ptr", l}, ""
        }
-       if rr.Ptr[l.length-1] != '.' {
-               rr.Ptr = appendOrigin(rr.Ptr, o)
-       }
+       rr.Ptr = name
        return rr, nil, ""
 }
 
@@ -207,20 +199,15 @@ func setNSAPPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string)
 
        l := <-c
        rr.Ptr = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Ptr = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad NSAP-PTR Ptr", l}, ""
        }
-       if rr.Ptr[l.length-1] != '.' {
-               rr.Ptr = appendOrigin(rr.Ptr, o)
-       }
+       rr.Ptr = name
        return rr, nil, ""
 }
 
@@ -230,34 +217,26 @@ func setRP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Mbox = l.token
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       if l.token == "@" {
-               rr.Mbox = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad RP Mbox", l}, ""
-               }
-               if rr.Mbox[l.length-1] != '.' {
-                       rr.Mbox = appendOrigin(rr.Mbox, o)
-               }
+
+       mbox, mboxOk := toAbsoluteName(l.token, o)
+       if l.err || !mboxOk {
+               return nil, &ParseError{f, "bad RP Mbox", l}, ""
        }
+       rr.Mbox = mbox
+
        <-c // zBlank
        l = <-c
        rr.Txt = l.token
-       if l.token == "@" {
-               rr.Txt = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       txt, txtOk := toAbsoluteName(l.token, o)
+       if l.err || !txtOk {
                return nil, &ParseError{f, "bad RP Txt", l}, ""
        }
-       if rr.Txt[l.length-1] != '.' {
-               rr.Txt = appendOrigin(rr.Txt, o)
-       }
+       rr.Txt = txt
+
        return rr, nil, ""
 }
 
@@ -267,20 +246,15 @@ func setMR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Mr = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Mr = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MR Mr", l}, ""
        }
-       if rr.Mr[l.length-1] != '.' {
-               rr.Mr = appendOrigin(rr.Mr, o)
-       }
+       rr.Mr = name
        return rr, nil, ""
 }
 
@@ -290,20 +264,15 @@ func setMB(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Mb = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Mb = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MB Mb", l}, ""
        }
-       if rr.Mb[l.length-1] != '.' {
-               rr.Mb = appendOrigin(rr.Mb, o)
-       }
+       rr.Mb = name
        return rr, nil, ""
 }
 
@@ -313,20 +282,15 @@ func setMG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Mg = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Mg = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MG Mg", l}, ""
        }
-       if rr.Mg[l.length-1] != '.' {
-               rr.Mg = appendOrigin(rr.Mg, o)
-       }
+       rr.Mg = name
        return rr, nil, ""
 }
 
@@ -362,34 +326,26 @@ func setMINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Rmail = l.token
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       if l.token == "@" {
-               rr.Rmail = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad MINFO Rmail", l}, ""
-               }
-               if rr.Rmail[l.length-1] != '.' {
-                       rr.Rmail = appendOrigin(rr.Rmail, o)
-               }
+
+       rmail, rmailOk := toAbsoluteName(l.token, o)
+       if l.err || !rmailOk {
+               return nil, &ParseError{f, "bad MINFO Rmail", l}, ""
        }
+       rr.Rmail = rmail
+
        <-c // zBlank
        l = <-c
        rr.Email = l.token
-       if l.token == "@" {
-               rr.Email = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       email, emailOk := toAbsoluteName(l.token, o)
+       if l.err || !emailOk {
                return nil, &ParseError{f, "bad MINFO Email", l}, ""
        }
-       if rr.Email[l.length-1] != '.' {
-               rr.Email = appendOrigin(rr.Email, o)
-       }
+       rr.Email = email
+
        return rr, nil, ""
 }
 
@@ -399,20 +355,15 @@ func setMF(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Mf = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Mf = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MF Mf", l}, ""
        }
-       if rr.Mf[l.length-1] != '.' {
-               rr.Mf = appendOrigin(rr.Mf, o)
-       }
+       rr.Mf = name
        return rr, nil, ""
 }
 
@@ -422,20 +373,15 @@ func setMD(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Md = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Md = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MD Md", l}, ""
        }
-       if rr.Md[l.length-1] != '.' {
-               rr.Md = appendOrigin(rr.Md, o)
-       }
+       rr.Md = name
        return rr, nil, ""
 }
 
@@ -444,57 +390,54 @@ func setMX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad MX Pref", l}, ""
        }
        rr.Preference = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Mx = l.token
-       if l.token == "@" {
-               rr.Mx = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad MX Mx", l}, ""
        }
-       if rr.Mx[l.length-1] != '.' {
-               rr.Mx = appendOrigin(rr.Mx, o)
-       }
+       rr.Mx = name
+
        return rr, nil, ""
 }
 
 func setRT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(RT)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil {
                return nil, &ParseError{f, "bad RT Preference", l}, ""
        }
        rr.Preference = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Host = l.token
-       if l.token == "@" {
-               rr.Host = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad RT Host", l}, ""
        }
-       if rr.Host[l.length-1] != '.' {
-               rr.Host = appendOrigin(rr.Host, o)
-       }
+       rr.Host = name
+
        return rr, nil, ""
 }
 
@@ -503,28 +446,25 @@ func setAFSDB(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad AFSDB Subtype", l}, ""
        }
        rr.Subtype = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Hostname = l.token
-       if l.token == "@" {
-               rr.Hostname = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad AFSDB Hostname", l}, ""
        }
-       if rr.Hostname[l.length-1] != '.' {
-               rr.Hostname = appendOrigin(rr.Hostname, o)
-       }
+       rr.Hostname = name
        return rr, nil, ""
 }
 
@@ -533,9 +473,10 @@ func setX25(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        if l.err {
                return nil, &ParseError{f, "bad X25 PSDNAddress", l}, ""
        }
@@ -548,28 +489,25 @@ func setKX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad KX Pref", l}, ""
        }
        rr.Preference = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Exchanger = l.token
-       if l.token == "@" {
-               rr.Exchanger = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad KX Exchanger", l}, ""
        }
-       if rr.Exchanger[l.length-1] != '.' {
-               rr.Exchanger = appendOrigin(rr.Exchanger, o)
-       }
+       rr.Exchanger = name
        return rr, nil, ""
 }
 
@@ -579,20 +517,15 @@ func setCNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Target = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Target = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad CNAME Target", l}, ""
        }
-       if rr.Target[l.length-1] != '.' {
-               rr.Target = appendOrigin(rr.Target, o)
-       }
+       rr.Target = name
        return rr, nil, ""
 }
 
@@ -602,20 +535,15 @@ func setDNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Target = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Target = o
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
-               return nil, &ParseError{f, "bad CNAME Target", l}, ""
-       }
-       if rr.Target[l.length-1] != '.' {
-               rr.Target = appendOrigin(rr.Target, o)
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
+               return nil, &ParseError{f, "bad DNAME Target", l}, ""
        }
+       rr.Target = name
        return rr, nil, ""
 }
 
@@ -625,35 +553,26 @@ func setSOA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.Ns = l.token
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       <-c // zBlank
-       if l.token == "@" {
-               rr.Ns = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad SOA Ns", l}, ""
-               }
-               if rr.Ns[l.length-1] != '.' {
-                       rr.Ns = appendOrigin(rr.Ns, o)
-               }
+
+       ns, nsOk := toAbsoluteName(l.token, o)
+       if l.err || !nsOk {
+               return nil, &ParseError{f, "bad SOA Ns", l}, ""
        }
+       rr.Ns = ns
 
+       <-c // zBlank
        l = <-c
        rr.Mbox = l.token
-       if l.token == "@" {
-               rr.Mbox = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad SOA Mbox", l}, ""
-               }
-               if rr.Mbox[l.length-1] != '.' {
-                       rr.Mbox = appendOrigin(rr.Mbox, o)
-               }
+
+       mbox, mboxOk := toAbsoluteName(l.token, o)
+       if l.err || !mboxOk {
+               return nil, &ParseError{f, "bad SOA Mbox", l}, ""
        }
+       rr.Mbox = mbox
+
        <-c // zBlank
 
        var (
@@ -667,10 +586,11 @@ func setSOA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                }
                if j, e := strconv.ParseUint(l.token, 10, 32); e != nil {
                        if i == 0 {
-                               // Serial should be a number
+                               // Serial must be a number
                                return nil, &ParseError{f, "bad SOA zone parameter", l}, ""
                        }
-                       if v, ok = stringToTtl(l.token); !ok {
+                       // We allow other fields to be unitful duration strings
+                       if v, ok = stringToTTL(l.token); !ok {
                                return nil, &ParseError{f, "bad SOA zone parameter", l}, ""
 
                        }
@@ -702,14 +622,16 @@ func setSRV(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad SRV Priority", l}, ""
        }
        rr.Priority = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        i, e = strconv.ParseUint(l.token, 10, 16)
@@ -717,6 +639,7 @@ func setSRV(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad SRV Weight", l}, ""
        }
        rr.Weight = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        i, e = strconv.ParseUint(l.token, 10, 16)
@@ -724,20 +647,16 @@ func setSRV(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad SRV Port", l}, ""
        }
        rr.Port = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Target = l.token
-       if l.token == "@" {
-               rr.Target = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad SRV Target", l}, ""
        }
-       if rr.Target[l.length-1] != '.' {
-               rr.Target = appendOrigin(rr.Target, o)
-       }
+       rr.Target = name
        return rr, nil, ""
 }
 
@@ -746,14 +665,16 @@ func setNAPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad NAPTR Order", l}, ""
        }
        rr.Order = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        i, e = strconv.ParseUint(l.token, 10, 16)
@@ -761,6 +682,7 @@ func setNAPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad NAPTR Preference", l}, ""
        }
        rr.Preference = uint16(i)
+
        // Flags
        <-c     // zBlank
        l = <-c // _QUOTE
@@ -817,21 +739,17 @@ func setNAPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        } else {
                return nil, &ParseError{f, "bad NAPTR Regexp", l}, ""
        }
+
        // After quote no space??
        <-c     // zBlank
        l = <-c // zString
        rr.Replacement = l.token
-       if l.token == "@" {
-               rr.Replacement = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad NAPTR Replacement", l}, ""
        }
-       if rr.Replacement[l.length-1] != '.' {
-               rr.Replacement = appendOrigin(rr.Replacement, o)
-       }
+       rr.Replacement = name
        return rr, nil, ""
 }
 
@@ -841,34 +759,26 @@ func setTALINK(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.PreviousName = l.token
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
-       if l.token == "@" {
-               rr.PreviousName = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad TALINK PreviousName", l}, ""
-               }
-               if rr.PreviousName[l.length-1] != '.' {
-                       rr.PreviousName = appendOrigin(rr.PreviousName, o)
-               }
+
+       previousName, previousNameOk := toAbsoluteName(l.token, o)
+       if l.err || !previousNameOk {
+               return nil, &ParseError{f, "bad TALINK PreviousName", l}, ""
        }
+       rr.PreviousName = previousName
+
        <-c // zBlank
        l = <-c
        rr.NextName = l.token
-       if l.token == "@" {
-               rr.NextName = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+
+       nextName, nextNameOk := toAbsoluteName(l.token, o)
+       if l.err || !nextNameOk {
                return nil, &ParseError{f, "bad TALINK NextName", l}, ""
        }
-       if rr.NextName[l.length-1] != '.' {
-               rr.NextName = appendOrigin(rr.NextName, o)
-       }
+       rr.NextName = nextName
+
        return rr, nil, ""
 }
 
@@ -880,9 +790,10 @@ func setLOC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.VertPre = 162  // 10
        rr.Size = 18      // 1
        ok := false
+
        // North
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
        i, e := strconv.ParseUint(l.token, 10, 32)
@@ -1013,14 +924,16 @@ func setHIP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        // HitLength is not represented
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad HIP PublicKeyAlgorithm", l}, ""
        }
        rr.PublicKeyAlgorithm = uint8(i)
+
        <-c     // zBlank
        l = <-c // zString
        if l.length == 0 || l.err {
@@ -1043,19 +956,11 @@ func setHIP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        for l.value != zNewline && l.value != zEOF {
                switch l.value {
                case zString:
-                       if l.token == "@" {
-                               xs = append(xs, o)
-                               l = <-c
-                               continue
-                       }
-                       _, ok := IsDomainName(l.token)
-                       if !ok || l.length == 0 || l.err {
+                       name, nameOk := toAbsoluteName(l.token, o)
+                       if l.err || !nameOk {
                                return nil, &ParseError{f, "bad HIP RendezvousServers", l}, ""
                        }
-                       if l.token[l.length-1] != '.' {
-                               l.token = appendOrigin(l.token, o)
-                       }
-                       xs = append(xs, l.token)
+                       xs = append(xs, name)
                case zBlank:
                        // Ok
                default:
@@ -1072,9 +977,10 @@ func setCERT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        if v, ok := StringToCertType[l.token]; ok {
                rr.Type = v
        } else if i, e := strconv.ParseUint(l.token, 10, 16); e != nil {
@@ -1118,6 +1024,56 @@ func setOPENPGPKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, strin
        return rr, nil, c1
 }
 
+func setCSYNC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+       rr := new(CSYNC)
+       rr.Hdr = h
+
+       l := <-c
+       if l.length == 0 { // dynamic update rr.
+               return rr, nil, l.comment
+       }
+       j, e := strconv.ParseUint(l.token, 10, 32)
+       if e != nil {
+               // Serial must be a number
+               return nil, &ParseError{f, "bad CSYNC serial", l}, ""
+       }
+       rr.Serial = uint32(j)
+
+       <-c // zBlank
+
+       l = <-c
+       j, e = strconv.ParseUint(l.token, 10, 16)
+       if e != nil {
+               // Serial must be a number
+               return nil, &ParseError{f, "bad CSYNC flags", l}, ""
+       }
+       rr.Flags = uint16(j)
+
+       rr.TypeBitMap = make([]uint16, 0)
+       var (
+               k  uint16
+               ok bool
+       )
+       l = <-c
+       for l.value != zNewline && l.value != zEOF {
+               switch l.value {
+               case zBlank:
+                       // Ok
+               case zString:
+                       if k, ok = StringToType[l.tokenUpper]; !ok {
+                               if k, ok = typeToInt(l.tokenUpper); !ok {
+                                       return nil, &ParseError{f, "bad CSYNC TypeBitMap", l}, ""
+                               }
+                       }
+                       rr.TypeBitMap = append(rr.TypeBitMap, k)
+               default:
+                       return nil, &ParseError{f, "bad CSYNC TypeBitMap", l}, ""
+               }
+               l = <-c
+       }
+       return rr, nil, l.comment
+}
+
 func setSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        r, e, s := setRRSIG(h, c, o, f)
        if r != nil {
@@ -1129,10 +1085,12 @@ func setSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(RRSIG)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        if t, ok := StringToType[l.tokenUpper]; !ok {
                if strings.HasPrefix(l.tokenUpper, "TYPE") {
                        t, ok = typeToInt(l.tokenUpper)
@@ -1146,6 +1104,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        } else {
                rr.TypeCovered = t
        }
+
        <-c // zBlank
        l = <-c
        i, err := strconv.ParseUint(l.token, 10, 8)
@@ -1153,6 +1112,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad RRSIG Algorithm", l}, ""
        }
        rr.Algorithm = uint8(i)
+
        <-c // zBlank
        l = <-c
        i, err = strconv.ParseUint(l.token, 10, 8)
@@ -1160,6 +1120,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad RRSIG Labels", l}, ""
        }
        rr.Labels = uint8(i)
+
        <-c // zBlank
        l = <-c
        i, err = strconv.ParseUint(l.token, 10, 32)
@@ -1167,6 +1128,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad RRSIG OrigTtl", l}, ""
        }
        rr.OrigTtl = uint32(i)
+
        <-c // zBlank
        l = <-c
        if i, err := StringToTime(l.token); err != nil {
@@ -1180,6 +1142,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        } else {
                rr.Expiration = i
        }
+
        <-c // zBlank
        l = <-c
        if i, err := StringToTime(l.token); err != nil {
@@ -1191,6 +1154,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        } else {
                rr.Inception = i
        }
+
        <-c // zBlank
        l = <-c
        i, err = strconv.ParseUint(l.token, 10, 16)
@@ -1198,25 +1162,22 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
                return nil, &ParseError{f, "bad RRSIG KeyTag", l}, ""
        }
        rr.KeyTag = uint16(i)
+
        <-c // zBlank
        l = <-c
        rr.SignerName = l.token
-       if l.token == "@" {
-               rr.SignerName = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad RRSIG SignerName", l}, ""
-               }
-               if rr.SignerName[l.length-1] != '.' {
-                       rr.SignerName = appendOrigin(rr.SignerName, o)
-               }
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
+               return nil, &ParseError{f, "bad RRSIG SignerName", l}, ""
        }
+       rr.SignerName = name
+
        s, e, c1 := endingToString(c, "bad RRSIG Signature", f)
        if e != nil {
                return nil, e, c1
        }
        rr.Signature = s
+
        return rr, nil, c1
 }
 
@@ -1226,20 +1187,15 @@ func setNSEC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 
        l := <-c
        rr.NextDomain = l.token
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
-       if l.token == "@" {
-               rr.NextDomain = o
-       } else {
-               _, ok := IsDomainName(l.token)
-               if !ok || l.length == 0 || l.err {
-                       return nil, &ParseError{f, "bad NSEC NextDomain", l}, ""
-               }
-               if rr.NextDomain[l.length-1] != '.' {
-                       rr.NextDomain = appendOrigin(rr.NextDomain, o)
-               }
+
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
+               return nil, &ParseError{f, "bad NSEC NextDomain", l}, ""
        }
+       rr.NextDomain = name
 
        rr.TypeBitMap = make([]uint16, 0)
        var (
@@ -1271,9 +1227,10 @@ func setNSEC3(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad NSEC3 Hash", l}, ""
@@ -1339,9 +1296,10 @@ func setNSEC3PARAM(h RR_Header, c chan lex, o, f string) (RR, *ParseError, strin
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad NSEC3PARAM Hash", l}, ""
@@ -1373,9 +1331,10 @@ func setEUI48(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        if l.length != 17 || l.err {
                return nil, &ParseError{f, "bad EUI48 Address", l}, ""
        }
@@ -1405,9 +1364,10 @@ func setEUI64(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        if l.length != 23 || l.err {
                return nil, &ParseError{f, "bad EUI64 Address", l}, ""
        }
@@ -1437,9 +1397,10 @@ func setSSHFP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad SSHFP Algorithm", l}, ""
@@ -1466,9 +1427,10 @@ func setDNSKEYs(h RR_Header, c chan lex, o, f, typ string) (RR, *ParseError, str
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad " + typ + " Flags", l}, ""
@@ -1522,9 +1484,10 @@ func setRKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad RKEY Flags", l}, ""
@@ -1577,10 +1540,12 @@ func setNIMLOC(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setGPOS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(GPOS)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        _, e := strconv.ParseFloat(l.token, 64)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad GPOS Longitude", l}, ""
@@ -1606,10 +1571,12 @@ func setGPOS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setDSs(h RR_Header, c chan lex, o, f, typ string) (RR, *ParseError, string) {
        rr := new(DS)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad " + typ + " KeyTag", l}, ""
@@ -1665,10 +1632,12 @@ func setCDS(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setTA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(TA)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad TA KeyTag", l}, ""
@@ -1703,10 +1672,12 @@ func setTA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setTLSA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(TLSA)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad TLSA Usage", l}, ""
@@ -1738,10 +1709,12 @@ func setTLSA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setSMIMEA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(SMIMEA)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, e := strconv.ParseUint(l.token, 10, 8)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad SMIMEA Usage", l}, ""
@@ -1773,10 +1746,12 @@ func setSMIMEA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setRFC3597(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(RFC3597)
        rr.Hdr = h
+
        l := <-c
        if l.token != "\\#" {
                return nil, &ParseError{f, "bad RFC3597 Rdata", l}, ""
        }
+
        <-c // zBlank
        l = <-c
        rdlength, e := strconv.Atoi(l.token)
@@ -1850,7 +1825,7 @@ func setURI(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 { // Dynamic updates.
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
 
@@ -1872,7 +1847,7 @@ func setURI(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        if err != nil {
                return nil, err, ""
        }
-       if len(s) > 1 {
+       if len(s) != 1 {
                return nil, &ParseError{f, "bad URI Target", l}, ""
        }
        rr.Target = s[0]
@@ -1897,9 +1872,10 @@ func setNID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad NID Preference", l}, ""
@@ -1920,9 +1896,10 @@ func setL32(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad L32 Preference", l}, ""
@@ -1942,31 +1919,25 @@ func setLP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad LP Preference", l}, ""
        }
        rr.Preference = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Fqdn = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Fqdn = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+       name, nameOk := toAbsoluteName(l.token, o)
+       if l.err || !nameOk {
                return nil, &ParseError{f, "bad LP Fqdn", l}, ""
        }
-       if rr.Fqdn[l.length-1] != '.' {
-               rr.Fqdn = appendOrigin(rr.Fqdn, o)
-       }
+       rr.Fqdn = name
+
        return rr, nil, ""
 }
 
@@ -1975,9 +1946,10 @@ func setL64(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad L64 Preference", l}, ""
@@ -1996,10 +1968,12 @@ func setL64(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setUID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(UID)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 32)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad UID Uid", l}, ""
@@ -2011,10 +1985,12 @@ func setUID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setGID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(GID)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 32)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad GID Gid", l}, ""
@@ -2026,6 +2002,7 @@ func setGID(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
 func setUINFO(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(UINFO)
        rr.Hdr = h
+
        s, e, c1 := endingToTxtSlice(c, "bad UINFO Uinfo", f)
        if e != nil {
                return nil, e, c1
@@ -2042,55 +2019,46 @@ func setPX(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr.Hdr = h
 
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, ""
        }
+
        i, e := strconv.ParseUint(l.token, 10, 16)
        if e != nil || l.err {
                return nil, &ParseError{f, "bad PX Preference", l}, ""
        }
        rr.Preference = uint16(i)
+
        <-c     // zBlank
        l = <-c // zString
        rr.Map822 = l.token
-       if l.length == 0 {
-               return rr, nil, ""
-       }
-       if l.token == "@" {
-               rr.Map822 = o
-               return rr, nil, ""
-       }
-       _, ok := IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+       map822, map822Ok := toAbsoluteName(l.token, o)
+       if l.err || !map822Ok {
                return nil, &ParseError{f, "bad PX Map822", l}, ""
        }
-       if rr.Map822[l.length-1] != '.' {
-               rr.Map822 = appendOrigin(rr.Map822, o)
-       }
+       rr.Map822 = map822
+
        <-c     // zBlank
        l = <-c // zString
        rr.Mapx400 = l.token
-       if l.token == "@" {
-               rr.Mapx400 = o
-               return rr, nil, ""
-       }
-       _, ok = IsDomainName(l.token)
-       if !ok || l.length == 0 || l.err {
+       mapx400, mapx400Ok := toAbsoluteName(l.token, o)
+       if l.err || !mapx400Ok {
                return nil, &ParseError{f, "bad PX Mapx400", l}, ""
        }
-       if rr.Mapx400[l.length-1] != '.' {
-               rr.Mapx400 = appendOrigin(rr.Mapx400, o)
-       }
+       rr.Mapx400 = mapx400
+
        return rr, nil, ""
 }
 
 func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        rr := new(CAA)
        rr.Hdr = h
+
        l := <-c
-       if l.length == 0 {
+       if l.length == 0 { // dynamic update rr.
                return rr, nil, l.comment
        }
+
        i, err := strconv.ParseUint(l.token, 10, 8)
        if err != nil || l.err {
                return nil, &ParseError{f, "bad CAA Flag", l}, ""
@@ -2109,13 +2077,58 @@ func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
        if e != nil {
                return nil, e, ""
        }
-       if len(s) > 1 {
+       if len(s) != 1 {
                return nil, &ParseError{f, "bad CAA Value", l}, ""
        }
        rr.Value = s[0]
        return rr, nil, c1
 }
 
+func setTKEY(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
+       rr := new(TKEY)
+       rr.Hdr = h
+
+       l := <-c
+
+       // Algorithm
+       if l.value != zString {
+               return nil, &ParseError{f, "bad TKEY algorithm", l}, ""
+       }
+       rr.Algorithm = l.token
+       <-c // zBlank
+
+       // Get the key length and key values
+       l = <-c
+       i, err := strconv.ParseUint(l.token, 10, 8)
+       if err != nil || l.err {
+               return nil, &ParseError{f, "bad TKEY key length", l}, ""
+       }
+       rr.KeySize = uint16(i)
+       <-c // zBlank
+       l = <-c
+       if l.value != zString {
+               return nil, &ParseError{f, "bad TKEY key", l}, ""
+       }
+       rr.Key = l.token
+       <-c // zBlank
+
+       // Get the otherdata length and string data
+       l = <-c
+       i, err = strconv.ParseUint(l.token, 10, 8)
+       if err != nil || l.err {
+               return nil, &ParseError{f, "bad TKEY otherdata length", l}, ""
+       }
+       rr.OtherLen = uint16(i)
+       <-c // zBlank
+       l = <-c
+       if l.value != zString {
+               return nil, &ParseError{f, "bad TKEY otherday", l}, ""
+       }
+       rr.OtherData = l.token
+
+       return rr, nil, ""
+}
+
 var typeToparserFunc = map[uint16]parserFunc{
        TypeAAAA:       {setAAAA, false},
        TypeAFSDB:      {setAFSDB, false},
@@ -2125,6 +2138,7 @@ var typeToparserFunc = map[uint16]parserFunc{
        TypeCDNSKEY:    {setCDNSKEY, true},
        TypeCERT:       {setCERT, true},
        TypeCNAME:      {setCNAME, false},
+       TypeCSYNC:      {setCSYNC, true},
        TypeDHCID:      {setDHCID, true},
        TypeDLV:        {setDLV, true},
        TypeDNAME:      {setDNAME, false},
@@ -2181,4 +2195,5 @@ var typeToparserFunc = map[uint16]parserFunc{
        TypeUINFO:      {setUINFO, true},
        TypeURI:        {setURI, true},
        TypeX25:        {setX25, false},
+       TypeTKEY:       {setTKEY, true},
 }

diff --git a/vendor/github.com/miekg/dns/scanner.go b/vendor/github.com/miekg/dns/scanner.go
index c29bc2f388e84c292ceb3ec58431c4f03abf3b6b..424e5af9f593136782d9482193cee9b7b76930e1 100644 (file)
--- a/vendor/github.com/miekg/dns/scanner.go
+++ b/vendor/github.com/miekg/dns/scanner.go
@@ -4,6 +4,7 @@ package dns
 
 import (
        "bufio"
+       "context"
        "io"
        "text/scanner"
 )
@@ -12,13 +13,18 @@ type scan struct {
        src      *bufio.Reader
        position scanner.Position
        eof      bool // Have we just seen a eof
+       ctx      context.Context
 }
 
-func scanInit(r io.Reader) *scan {
+func scanInit(r io.Reader) (*scan, context.CancelFunc) {
        s := new(scan)
        s.src = bufio.NewReader(r)
        s.position.Line = 1
-       return s
+
+       ctx, cancel := context.WithCancel(context.Background())
+       s.ctx = ctx
+
+       return s, cancel
 }
 
 // tokenText returns the next byte from the input
@@ -27,6 +33,13 @@ func (s *scan) tokenText() (byte, error) {
        if err != nil {
                return c, err
        }
+       select {
+       case <-s.ctx.Done():
+               return c, context.Canceled
+       default:
+               break
+       }
+
        // delay the newline handling until the next token is delivered,
        // fixes off-by-one errors when reporting a parse error.
        if s.eof == true {

diff --git a/vendor/github.com/miekg/dns/server.go b/vendor/github.com/miekg/dns/server.go
index 0ca6e008c08b955dce103d7c616ccaeb787cffc7..136a9a1ca39653fd9512a787e27e74dd430db274 100644 (file)
--- a/vendor/github.com/miekg/dns/server.go
+++ b/vendor/github.com/miekg/dns/server.go
@@ -285,7 +285,7 @@ type Server struct {
        WriteTimeout time.Duration
        // TCP idle timeout for multiple queries, if nil, defaults to 8 * time.Second (RFC 5966).
        IdleTimeout func() time.Duration
-       // Secret(s) for Tsig map[<zonename>]<base64 secret>.
+       // Secret(s) for Tsig map[<zonename>]<base64 secret>. The zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2).
        TsigSecret map[string]string
        // Unsafe instructs the server to disregard any sanity checks and directly hand the message to
        // the handler. It will specifically not check if the query has the QR bit not set.
@@ -297,10 +297,7 @@ type Server struct {
        // DecorateWriter is optional, allows customization of the process that writes raw DNS messages.
        DecorateWriter DecorateWriter
 
-       // Graceful shutdown handling
-
-       inFlight sync.WaitGroup
-
+       // Shutdown handling
        lock    sync.RWMutex
        started bool
 }
@@ -412,10 +409,8 @@ func (srv *Server) ActivateAndServe() error {
        return &Error{err: "bad listeners"}
 }
 
-// Shutdown gracefully shuts down a server. After a call to Shutdown, ListenAndServe and
-// ActivateAndServe will return. All in progress queries are completed before the server
-// is taken down. If the Shutdown is taking longer than the reading timeout an error
-// is returned.
+// Shutdown shuts down a server. After a call to Shutdown, ListenAndServe and
+// ActivateAndServe will return.
 func (srv *Server) Shutdown() error {
        srv.lock.Lock()
        if !srv.started {
@@ -431,19 +426,7 @@ func (srv *Server) Shutdown() error {
        if srv.Listener != nil {
                srv.Listener.Close()
        }
-
-       fin := make(chan bool)
-       go func() {
-               srv.inFlight.Wait()
-               fin <- true
-       }()
-
-       select {
-       case <-time.After(srv.getReadTimeout()):
-               return &Error{err: "server shutdown is pending"}
-       case <-fin:
-               return nil
-       }
+       return nil
 }
 
 // getReadTimeout is a helper func to use system timeout if server did not intend to change it.
@@ -493,7 +476,6 @@ func (srv *Server) serveTCP(l net.Listener) error {
                if err != nil {
                        continue
                }
-               srv.inFlight.Add(1)
                go srv.serve(rw.RemoteAddr(), handler, m, nil, nil, rw)
        }
 }
@@ -529,15 +511,12 @@ func (srv *Server) serveUDP(l *net.UDPConn) error {
                if err != nil {
                        continue
                }
-               srv.inFlight.Add(1)
                go srv.serve(s.RemoteAddr(), handler, m, l, s, nil)
        }
 }
 
 // Serve a new connection.
 func (srv *Server) serve(a net.Addr, h Handler, m []byte, u *net.UDPConn, s *SessionUDP, t net.Conn) {
-       defer srv.inFlight.Done()
-
        w := &response{tsigSecret: srv.TsigSecret, udp: u, tcp: t, remoteAddr: a, udpSession: s}
        if srv.DecorateWriter != nil {
                w.writer = srv.DecorateWriter(w)

diff --git a/vendor/github.com/miekg/dns/types.go b/vendor/github.com/miekg/dns/types.go
index 57f065bc81750ac3941d16b80185c7be2b131704..a779ca8abc0e3590a2cc582ddf02642474a314de 100644 (file)
--- a/vendor/github.com/miekg/dns/types.go
+++ b/vendor/github.com/miekg/dns/types.go
@@ -78,6 +78,7 @@ const (
        TypeCDS        uint16 = 59
        TypeCDNSKEY    uint16 = 60
        TypeOPENPGPKEY uint16 = 61
+       TypeCSYNC      uint16 = 62
        TypeSPF        uint16 = 99
        TypeUINFO      uint16 = 100
        TypeUID        uint16 = 101
@@ -164,14 +165,15 @@ const (
        _Z  = 1 << 6  // Z
        _AD = 1 << 5  // authticated data
        _CD = 1 << 4  // checking disabled
+)
 
+// Various constants used in the LOC RR, See RFC 1887.
+const (
        LOC_EQUATOR       = 1 << 31 // RFC 1876, Section 2.
        LOC_PRIMEMERIDIAN = 1 << 31 // RFC 1876, Section 2.
-
-       LOC_HOURS   = 60 * 1000
-       LOC_DEGREES = 60 * LOC_HOURS
-
-       LOC_ALTITUDEBASE = 100000
+       LOC_HOURS         = 60 * 1000
+       LOC_DEGREES       = 60 * LOC_HOURS
+       LOC_ALTITUDEBASE  = 100000
 )
 
 // Different Certificate Types, see RFC 4398, Section 2.1
@@ -237,6 +239,7 @@ type ANY struct {
 
 func (rr *ANY) String() string { return rr.Hdr.String() }
 
+// CNAME RR. See RFC 1034.
 type CNAME struct {
        Hdr    RR_Header
        Target string `dns:"cdomain-name"`
@@ -244,6 +247,7 @@ type CNAME struct {
 
 func (rr *CNAME) String() string { return rr.Hdr.String() + sprintName(rr.Target) }
 
+// HINFO RR. See RFC 1034.
 type HINFO struct {
        Hdr RR_Header
        Cpu string
@@ -254,6 +258,7 @@ func (rr *HINFO) String() string {
        return rr.Hdr.String() + sprintTxt([]string{rr.Cpu, rr.Os})
 }
 
+// MB RR. See RFC 1035.
 type MB struct {
        Hdr RR_Header
        Mb  string `dns:"cdomain-name"`
@@ -261,6 +266,7 @@ type MB struct {
 
 func (rr *MB) String() string { return rr.Hdr.String() + sprintName(rr.Mb) }
 
+// MG RR. See RFC 1035.
 type MG struct {
        Hdr RR_Header
        Mg  string `dns:"cdomain-name"`
@@ -268,6 +274,7 @@ type MG struct {
 
 func (rr *MG) String() string { return rr.Hdr.String() + sprintName(rr.Mg) }
 
+// MINFO RR. See RFC 1035.
 type MINFO struct {
        Hdr   RR_Header
        Rmail string `dns:"cdomain-name"`
@@ -278,6 +285,7 @@ func (rr *MINFO) String() string {
        return rr.Hdr.String() + sprintName(rr.Rmail) + " " + sprintName(rr.Email)
 }
 
+// MR RR. See RFC 1035.
 type MR struct {
        Hdr RR_Header
        Mr  string `dns:"cdomain-name"`
@@ -287,6 +295,7 @@ func (rr *MR) String() string {
        return rr.Hdr.String() + sprintName(rr.Mr)
 }
 
+// MF RR. See RFC 1035.
 type MF struct {
        Hdr RR_Header
        Mf  string `dns:"cdomain-name"`
@@ -296,6 +305,7 @@ func (rr *MF) String() string {
        return rr.Hdr.String() + sprintName(rr.Mf)
 }
 
+// MD RR. See RFC 1035.
 type MD struct {
        Hdr RR_Header
        Md  string `dns:"cdomain-name"`
@@ -305,6 +315,7 @@ func (rr *MD) String() string {
        return rr.Hdr.String() + sprintName(rr.Md)
 }
 
+// MX RR. See RFC 1035.
 type MX struct {
        Hdr        RR_Header
        Preference uint16
@@ -315,6 +326,7 @@ func (rr *MX) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Mx)
 }
 
+// AFSDB RR. See RFC 1183.
 type AFSDB struct {
        Hdr      RR_Header
        Subtype  uint16
@@ -325,6 +337,7 @@ func (rr *AFSDB) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Subtype)) + " " + sprintName(rr.Hostname)
 }
 
+// X25 RR. See RFC 1183, Section 3.1.
 type X25 struct {
        Hdr         RR_Header
        PSDNAddress string
@@ -334,6 +347,7 @@ func (rr *X25) String() string {
        return rr.Hdr.String() + rr.PSDNAddress
 }
 
+// RT RR. See RFC 1183, Section 3.3.
 type RT struct {
        Hdr        RR_Header
        Preference uint16
@@ -344,6 +358,7 @@ func (rr *RT) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Host)
 }
 
+// NS RR. See RFC 1035.
 type NS struct {
        Hdr RR_Header
        Ns  string `dns:"cdomain-name"`
@@ -353,6 +368,7 @@ func (rr *NS) String() string {
        return rr.Hdr.String() + sprintName(rr.Ns)
 }
 
+// PTR RR. See RFC 1035.
 type PTR struct {
        Hdr RR_Header
        Ptr string `dns:"cdomain-name"`
@@ -362,6 +378,7 @@ func (rr *PTR) String() string {
        return rr.Hdr.String() + sprintName(rr.Ptr)
 }
 
+// RP RR. See RFC 1138, Section 2.2.
 type RP struct {
        Hdr  RR_Header
        Mbox string `dns:"domain-name"`
@@ -372,6 +389,7 @@ func (rr *RP) String() string {
        return rr.Hdr.String() + rr.Mbox + " " + sprintTxt([]string{rr.Txt})
 }
 
+// SOA RR. See RFC 1035.
 type SOA struct {
        Hdr     RR_Header
        Ns      string `dns:"cdomain-name"`
@@ -392,6 +410,7 @@ func (rr *SOA) String() string {
                " " + strconv.FormatInt(int64(rr.Minttl), 10)
 }
 
+// TXT RR. See RFC 1035.
 type TXT struct {
        Hdr RR_Header
        Txt []string `dns:"txt"`
@@ -524,6 +543,7 @@ func nextByte(b []byte, offset int) (byte, int) {
        return b[offset+1], 2
 }
 
+// SPF RR. See RFC 4408, Section 3.1.1.
 type SPF struct {
        Hdr RR_Header
        Txt []string `dns:"txt"`
@@ -531,6 +551,7 @@ type SPF struct {
 
 func (rr *SPF) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
 
+// AVC RR. See https://www.iana.org/assignments/dns-parameters/AVC/avc-completed-template.
 type AVC struct {
        Hdr RR_Header
        Txt []string `dns:"txt"`
@@ -538,6 +559,7 @@ type AVC struct {
 
 func (rr *AVC) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
 
+// SRV RR. See RFC 2782.
 type SRV struct {
        Hdr      RR_Header
        Priority uint16
@@ -553,6 +575,7 @@ func (rr *SRV) String() string {
                strconv.Itoa(int(rr.Port)) + " " + sprintName(rr.Target)
 }
 
+// NAPTR RR. See RFC 2915.
 type NAPTR struct {
        Hdr         RR_Header
        Order       uint16
@@ -573,7 +596,7 @@ func (rr *NAPTR) String() string {
                rr.Replacement
 }
 
-// The CERT resource record, see RFC 4398.
+// CERT RR. See RFC 4398.
 type CERT struct {
        Hdr         RR_Header
        Type        uint16
@@ -599,7 +622,7 @@ func (rr *CERT) String() string {
                " " + rr.Certificate
 }
 
-// The DNAME resource record, see RFC 2672.
+// DNAME RR. See RFC 2672.
 type DNAME struct {
        Hdr    RR_Header
        Target string `dns:"domain-name"`
@@ -609,6 +632,7 @@ func (rr *DNAME) String() string {
        return rr.Hdr.String() + sprintName(rr.Target)
 }
 
+// A RR. See RFC 1035.
 type A struct {
        Hdr RR_Header
        A   net.IP `dns:"a"`
@@ -621,6 +645,7 @@ func (rr *A) String() string {
        return rr.Hdr.String() + rr.A.String()
 }
 
+// AAAA RR. See RFC 3596.
 type AAAA struct {
        Hdr  RR_Header
        AAAA net.IP `dns:"aaaa"`
@@ -633,6 +658,7 @@ func (rr *AAAA) String() string {
        return rr.Hdr.String() + rr.AAAA.String()
 }
 
+// PX RR. See RFC 2163.
 type PX struct {
        Hdr        RR_Header
        Preference uint16
@@ -644,6 +670,7 @@ func (rr *PX) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Map822) + " " + sprintName(rr.Mapx400)
 }
 
+// GPOS RR. See RFC 1712.
 type GPOS struct {
        Hdr       RR_Header
        Longitude string
@@ -655,6 +682,7 @@ func (rr *GPOS) String() string {
        return rr.Hdr.String() + rr.Longitude + " " + rr.Latitude + " " + rr.Altitude
 }
 
+// LOC RR. See RFC RFC 1876.
 type LOC struct {
        Hdr       RR_Header
        Version   uint8
@@ -731,11 +759,12 @@ func (rr *LOC) String() string {
        return s
 }
 
-// SIG is identical to RRSIG and nowadays only used for SIG(0), RFC2931.
+// SIG RR. See RFC 2535. The SIG RR is identical to RRSIG and nowadays only used for SIG(0), See RFC 2931.
 type SIG struct {
        RRSIG
 }
 
+// RRSIG RR. See RFC 4034 and RFC 3755.
 type RRSIG struct {
        Hdr         RR_Header
        TypeCovered uint16
@@ -763,6 +792,7 @@ func (rr *RRSIG) String() string {
        return s
 }
 
+// NSEC RR. See RFC 4034 and RFC 3755.
 type NSEC struct {
        Hdr        RR_Header
        NextDomain string   `dns:"domain-name"`
@@ -790,14 +820,13 @@ func (rr *NSEC) len() int {
        return l
 }
 
-type DLV struct {
-       DS
-}
+// DLV RR. See RFC 4431.
+type DLV struct{ DS }
 
-type CDS struct {
-       DS
-}
+// CDS RR. See RFC 7344.
+type CDS struct{ DS }
 
+// DS RR. See RFC 4034 and RFC 3658.
 type DS struct {
        Hdr        RR_Header
        KeyTag     uint16
@@ -813,6 +842,7 @@ func (rr *DS) String() string {
                " " + strings.ToUpper(rr.Digest)
 }
 
+// KX RR. See RFC 2230.
 type KX struct {
        Hdr        RR_Header
        Preference uint16
@@ -824,6 +854,7 @@ func (rr *KX) String() string {
                " " + sprintName(rr.Exchanger)
 }
 
+// TA RR. See http://www.watson.org/~weiler/INI1999-19.pdf.
 type TA struct {
        Hdr        RR_Header
        KeyTag     uint16
@@ -839,6 +870,7 @@ func (rr *TA) String() string {
                " " + strings.ToUpper(rr.Digest)
 }
 
+// TALINK RR. See https://www.iana.org/assignments/dns-parameters/TALINK/talink-completed-template.
 type TALINK struct {
        Hdr          RR_Header
        PreviousName string `dns:"domain-name"`
@@ -850,6 +882,7 @@ func (rr *TALINK) String() string {
                sprintName(rr.PreviousName) + " " + sprintName(rr.NextName)
 }
 
+// SSHFP RR. See RFC RFC 4255.
 type SSHFP struct {
        Hdr         RR_Header
        Algorithm   uint8
@@ -863,14 +896,17 @@ func (rr *SSHFP) String() string {
                " " + strings.ToUpper(rr.FingerPrint)
 }
 
+// KEY RR. See RFC RFC 2535.
 type KEY struct {
        DNSKEY
 }
 
+// CDNSKEY RR. See RFC 7344.
 type CDNSKEY struct {
        DNSKEY
 }
 
+// DNSKEY RR. See RFC 4034 and RFC 3755.
 type DNSKEY struct {
        Hdr       RR_Header
        Flags     uint16
@@ -886,6 +922,7 @@ func (rr *DNSKEY) String() string {
                " " + rr.PublicKey
 }
 
+// RKEY RR. See https://www.iana.org/assignments/dns-parameters/RKEY/rkey-completed-template.
 type RKEY struct {
        Hdr       RR_Header
        Flags     uint16
@@ -901,6 +938,7 @@ func (rr *RKEY) String() string {
                " " + rr.PublicKey
 }
 
+// NSAPPTR RR. See RFC 1348.
 type NSAPPTR struct {
        Hdr RR_Header
        Ptr string `dns:"domain-name"`
@@ -908,6 +946,7 @@ type NSAPPTR struct {
 
 func (rr *NSAPPTR) String() string { return rr.Hdr.String() + sprintName(rr.Ptr) }
 
+// NSEC3 RR. See RFC 5155.
 type NSEC3 struct {
        Hdr        RR_Header
        Hash       uint8
@@ -946,6 +985,7 @@ func (rr *NSEC3) len() int {
        return l
 }
 
+// NSEC3PARAM RR. See RFC 5155.
 type NSEC3PARAM struct {
        Hdr        RR_Header
        Hash       uint8
@@ -964,6 +1004,7 @@ func (rr *NSEC3PARAM) String() string {
        return s
 }
 
+// TKEY RR. See RFC 2930.
 type TKEY struct {
        Hdr        RR_Header
        Algorithm  string `dns:"domain-name"`
@@ -972,17 +1013,21 @@ type TKEY struct {
        Mode       uint16
        Error      uint16
        KeySize    uint16
-       Key        string
+       Key        string `dns:"size-hex:KeySize"`
        OtherLen   uint16
-       OtherData  string
+       OtherData  string `dns:"size-hex:OtherLen"`
 }
 
+// TKEY has no official presentation format, but this will suffice.
 func (rr *TKEY) String() string {
-       // It has no presentation format
-       return ""
+       s := "\n;; TKEY PSEUDOSECTION:\n"
+       s += rr.Hdr.String() + " " + rr.Algorithm + " " +
+               strconv.Itoa(int(rr.KeySize)) + " " + rr.Key + " " +
+               strconv.Itoa(int(rr.OtherLen)) + " " + rr.OtherData
+       return s
 }
 
-// RFC3597 represents an unknown/generic RR.
+// RFC3597 represents an unknown/generic RR. See RFC 3597.
 type RFC3597 struct {
        Hdr   RR_Header
        Rdata string `dns:"hex"`
@@ -1006,6 +1051,7 @@ func rfc3597Header(h RR_Header) string {
        return s
 }
 
+// URI RR. See RFC 7553.
 type URI struct {
        Hdr      RR_Header
        Priority uint16
@@ -1018,6 +1064,7 @@ func (rr *URI) String() string {
                " " + strconv.Itoa(int(rr.Weight)) + " " + sprintTxtOctet(rr.Target)
 }
 
+// DHCID RR. See RFC 4701.
 type DHCID struct {
        Hdr    RR_Header
        Digest string `dns:"base64"`
@@ -1025,6 +1072,7 @@ type DHCID struct {
 
 func (rr *DHCID) String() string { return rr.Hdr.String() + rr.Digest }
 
+// TLSA RR. See RFC 6698.
 type TLSA struct {
        Hdr          RR_Header
        Usage        uint8
@@ -1041,6 +1089,7 @@ func (rr *TLSA) String() string {
                " " + rr.Certificate
 }
 
+// SMIMEA RR. See RFC 8162.
 type SMIMEA struct {
        Hdr          RR_Header
        Usage        uint8
@@ -1063,6 +1112,7 @@ func (rr *SMIMEA) String() string {
        return s
 }
 
+// HIP RR. See RFC 8005.
 type HIP struct {
        Hdr                RR_Header
        HitLength          uint8
@@ -1084,6 +1134,7 @@ func (rr *HIP) String() string {
        return s
 }
 
+// NINFO RR. See https://www.iana.org/assignments/dns-parameters/NINFO/ninfo-completed-template.
 type NINFO struct {
        Hdr    RR_Header
        ZSData []string `dns:"txt"`
@@ -1091,6 +1142,7 @@ type NINFO struct {
 
 func (rr *NINFO) String() string { return rr.Hdr.String() + sprintTxt(rr.ZSData) }
 
+// NID RR. See RFC RFC 6742.
 type NID struct {
        Hdr        RR_Header
        Preference uint16
@@ -1104,6 +1156,7 @@ func (rr *NID) String() string {
        return s
 }
 
+// L32 RR, See RFC 6742.
 type L32 struct {
        Hdr        RR_Header
        Preference uint16
@@ -1118,6 +1171,7 @@ func (rr *L32) String() string {
                " " + rr.Locator32.String()
 }
 
+// L64 RR, See RFC 6742.
 type L64 struct {
        Hdr        RR_Header
        Preference uint16
@@ -1131,6 +1185,7 @@ func (rr *L64) String() string {
        return s
 }
 
+// LP RR. See RFC 6742.
 type LP struct {
        Hdr        RR_Header
        Preference uint16
@@ -1141,6 +1196,7 @@ func (rr *LP) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintName(rr.Fqdn)
 }
 
+// EUI48 RR. See RFC 7043.
 type EUI48 struct {
        Hdr     RR_Header
        Address uint64 `dns:"uint48"`
@@ -1148,6 +1204,7 @@ type EUI48 struct {
 
 func (rr *EUI48) String() string { return rr.Hdr.String() + euiToString(rr.Address, 48) }
 
+// EUI64 RR. See RFC 7043.
 type EUI64 struct {
        Hdr     RR_Header
        Address uint64
@@ -1155,6 +1212,7 @@ type EUI64 struct {
 
 func (rr *EUI64) String() string { return rr.Hdr.String() + euiToString(rr.Address, 64) }
 
+// CAA RR. See RFC 6844.
 type CAA struct {
        Hdr   RR_Header
        Flag  uint8
@@ -1166,6 +1224,7 @@ func (rr *CAA) String() string {
        return rr.Hdr.String() + strconv.Itoa(int(rr.Flag)) + " " + rr.Tag + " " + sprintTxtOctet(rr.Value)
 }
 
+// UID RR. Deprecated, IANA-Reserved.
 type UID struct {
        Hdr RR_Header
        Uid uint32
@@ -1173,6 +1232,7 @@ type UID struct {
 
 func (rr *UID) String() string { return rr.Hdr.String() + strconv.FormatInt(int64(rr.Uid), 10) }
 
+// GID RR. Deprecated, IANA-Reserved.
 type GID struct {
        Hdr RR_Header
        Gid uint32
@@ -1180,6 +1240,7 @@ type GID struct {
 
 func (rr *GID) String() string { return rr.Hdr.String() + strconv.FormatInt(int64(rr.Gid), 10) }
 
+// UINFO RR. Deprecated, IANA-Reserved.
 type UINFO struct {
        Hdr   RR_Header
        Uinfo string
@@ -1187,6 +1248,7 @@ type UINFO struct {
 
 func (rr *UINFO) String() string { return rr.Hdr.String() + sprintTxt([]string{rr.Uinfo}) }
 
+// EID RR. See http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt.
 type EID struct {
        Hdr      RR_Header
        Endpoint string `dns:"hex"`
@@ -1194,6 +1256,7 @@ type EID struct {
 
 func (rr *EID) String() string { return rr.Hdr.String() + strings.ToUpper(rr.Endpoint) }
 
+// NIMLOC RR. See http://ana-3.lcs.mit.edu/~jnc/nimrod/dns.txt.
 type NIMLOC struct {
        Hdr     RR_Header
        Locator string `dns:"hex"`
@@ -1201,6 +1264,7 @@ type NIMLOC struct {
 
 func (rr *NIMLOC) String() string { return rr.Hdr.String() + strings.ToUpper(rr.Locator) }
 
+// OPENPGPKEY RR. See RFC 7929.
 type OPENPGPKEY struct {
        Hdr       RR_Header
        PublicKey string `dns:"base64"`
@@ -1208,6 +1272,36 @@ type OPENPGPKEY struct {
 
 func (rr *OPENPGPKEY) String() string { return rr.Hdr.String() + rr.PublicKey }
 
+// CSYNC RR. See RFC 7477.
+type CSYNC struct {
+       Hdr        RR_Header
+       Serial     uint32
+       Flags      uint16
+       TypeBitMap []uint16 `dns:"nsec"`
+}
+
+func (rr *CSYNC) String() string {
+       s := rr.Hdr.String() + strconv.FormatInt(int64(rr.Serial), 10) + " " + strconv.Itoa(int(rr.Flags))
+
+       for i := 0; i < len(rr.TypeBitMap); i++ {
+               s += " " + Type(rr.TypeBitMap[i]).String()
+       }
+       return s
+}
+
+func (rr *CSYNC) len() int {
+       l := rr.Hdr.len() + 4 + 2
+       lastwindow := uint32(2 ^ 32 + 1)
+       for _, t := range rr.TypeBitMap {
+               window := t / 256
+               if uint32(window) != lastwindow {
+                       l += 1 + 32
+               }
+               lastwindow = uint32(window)
+       }
+       return l
+}
+
 // TimeToString translates the RRSIG's incep. and expir. times to the
 // string representation used when printing the record.
 // It takes serial arithmetic (RFC 1982) into account.

diff --git a/vendor/github.com/miekg/dns/types_generate.go b/vendor/github.com/miekg/dns/types_generate.go
index dd1310942ba483a93027421e120a2dbe8295620c..8703cce64779a44f0dcab3935192fa12796bb94e 100644 (file)
--- a/vendor/github.com/miekg/dns/types_generate.go
+++ b/vendor/github.com/miekg/dns/types_generate.go
@@ -23,11 +23,11 @@ var skipLen = map[string]struct{}{
        "NSEC":  {},
        "NSEC3": {},
        "OPT":   {},
+       "CSYNC": {},
 }
 
 var packageHdr = `
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from type_generate.go
+// Code generated by "go run types_generate.go"; DO NOT EDIT.
 
 package dns
 
@@ -56,7 +56,6 @@ var TypeToString = map[uint16]string{
 `))
 
 var headerFunc = template.Must(template.New("headerFunc").Parse(`
-// Header() functions
 {{range .}}  func (rr *{{.}}) Header() *RR_Header { return &rr.Hdr }
 {{end}}
 
@@ -182,6 +181,8 @@ func main() {
                                fallthrough
                        case st.Tag(i) == `dns:"base64"`:
                                o("l += base64.StdEncoding.DecodedLen(len(rr.%s))\n")
+                       case strings.HasPrefix(st.Tag(i), `dns:"size-hex:`): // this has an extra field where the length is stored
+                               o("l += len(rr.%s)/2\n")
                        case strings.HasPrefix(st.Tag(i), `dns:"size-hex`):
                                fallthrough
                        case st.Tag(i) == `dns:"hex"`:

diff --git a/vendor/github.com/miekg/dns/udp.go b/vendor/github.com/miekg/dns/udp.go
index af111b9a89460ea7d84d0b7102007e4d371af0b3..f3f31a7ac9436543324d8e6bfa92763a09dd2301 100644 (file)
--- a/vendor/github.com/miekg/dns/udp.go
+++ b/vendor/github.com/miekg/dns/udp.go
@@ -4,6 +4,9 @@ package dns
 
 import (
        "net"
+
+       "golang.org/x/net/ipv4"
+       "golang.org/x/net/ipv6"
 )
 
 // SessionUDP holds the remote address and the associated
@@ -27,8 +30,60 @@ func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
        return n, &SessionUDP{raddr, oob[:oobn]}, err
 }
 
-// WriteToSessionUDP acts just like net.UDPConn.WritetTo(), but uses a *SessionUDP instead of a net.Addr.
+// WriteToSessionUDP acts just like net.UDPConn.WriteTo(), but uses a *SessionUDP instead of a net.Addr.
 func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
-       n, _, err := conn.WriteMsgUDP(b, session.context, session.raddr)
+       oob := correctSource(session.context)
+       n, _, err := conn.WriteMsgUDP(b, oob, session.raddr)
        return n, err
 }
+
+func setUDPSocketOptions(conn *net.UDPConn) error {
+       // Try setting the flags for both families and ignore the errors unless they
+       // both error.
+       err6 := ipv6.NewPacketConn(conn).SetControlMessage(ipv6.FlagDst|ipv6.FlagInterface, true)
+       err4 := ipv4.NewPacketConn(conn).SetControlMessage(ipv4.FlagDst|ipv4.FlagInterface, true)
+       if err6 != nil && err4 != nil {
+               return err4
+       }
+       return nil
+}
+
+// parseDstFromOOB takes oob data and returns the destination IP.
+func parseDstFromOOB(oob []byte) net.IP {
+       // Start with IPv6 and then fallback to IPv4
+       // TODO(fastest963): Figure out a way to prefer one or the other. Looking at
+       // the lvl of the header for a 0 or 41 isn't cross-platform.
+       var dst net.IP
+       cm6 := new(ipv6.ControlMessage)
+       if cm6.Parse(oob) == nil {
+               dst = cm6.Dst
+       }
+       if dst == nil {
+               cm4 := new(ipv4.ControlMessage)
+               if cm4.Parse(oob) == nil {
+                       dst = cm4.Dst
+               }
+       }
+       return dst
+}
+
+// correctSource takes oob data and returns new oob data with the Src equal to the Dst
+func correctSource(oob []byte) []byte {
+       dst := parseDstFromOOB(oob)
+       if dst == nil {
+               return nil
+       }
+       // If the dst is definitely an IPv6, then use ipv6's ControlMessage to
+       // respond otherwise use ipv4's because ipv6's marshal ignores ipv4
+       // addresses.
+       if dst.To4() == nil {
+               cm := new(ipv6.ControlMessage)
+               cm.Src = dst
+               oob = cm.Marshal()
+       } else {
+               cm := new(ipv4.ControlMessage)
+               cm.Src = dst
+               oob = cm.Marshal()
+       }
+       return oob
+}

diff --git a/vendor/github.com/miekg/dns/udp_linux.go b/vendor/github.com/miekg/dns/udp_linux.go
deleted file mode 100644 (file)
index 033df42..0000000
--- a/vendor/github.com/miekg/dns/udp_linux.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// +build linux,!appengine
-
-package dns
-
-// See:
-// * http://stackoverflow.com/questions/3062205/setting-the-source-ip-for-a-udp-socket and
-// * http://blog.powerdns.com/2012/10/08/on-binding-datagram-udp-sockets-to-the-any-addresses/
-//
-// Why do we need this: When listening on 0.0.0.0 with UDP so kernel decides what is the outgoing
-// interface, this might not always be the correct one. This code will make sure the egress
-// packet's interface matched the ingress' one.
-
-import (
-       "net"
-       "syscall"
-)
-
-// setUDPSocketOptions sets the UDP socket options.
-// This function is implemented on a per platform basis. See udp_*.go for more details
-func setUDPSocketOptions(conn *net.UDPConn) error {
-       sa, err := getUDPSocketName(conn)
-       if err != nil {
-               return err
-       }
-       switch sa.(type) {
-       case *syscall.SockaddrInet6:
-               v6only, err := getUDPSocketOptions6Only(conn)
-               if err != nil {
-                       return err
-               }
-               setUDPSocketOptions6(conn)
-               if !v6only {
-                       setUDPSocketOptions4(conn)
-               }
-       case *syscall.SockaddrInet4:
-               setUDPSocketOptions4(conn)
-       }
-       return nil
-}
-
-// setUDPSocketOptions4 prepares the v4 socket for sessions.
-func setUDPSocketOptions4(conn *net.UDPConn) error {
-       file, err := conn.File()
-       if err != nil {
-               return err
-       }
-       if err := syscall.SetsockoptInt(int(file.Fd()), syscall.IPPROTO_IP, syscall.IP_PKTINFO, 1); err != nil {
-               file.Close()
-               return err
-       }
-       // Calling File() above results in the connection becoming blocking, we must fix that.
-       // See https://github.com/miekg/dns/issues/279
-       err = syscall.SetNonblock(int(file.Fd()), true)
-       if err != nil {
-               file.Close()
-               return err
-       }
-       file.Close()
-       return nil
-}
-
-// setUDPSocketOptions6 prepares the v6 socket for sessions.
-func setUDPSocketOptions6(conn *net.UDPConn) error {
-       file, err := conn.File()
-       if err != nil {
-               return err
-       }
-       if err := syscall.SetsockoptInt(int(file.Fd()), syscall.IPPROTO_IPV6, syscall.IPV6_RECVPKTINFO, 1); err != nil {
-               file.Close()
-               return err
-       }
-       err = syscall.SetNonblock(int(file.Fd()), true)
-       if err != nil {
-               file.Close()
-               return err
-       }
-       file.Close()
-       return nil
-}
-
-// getUDPSocketOption6Only return true if the socket is v6 only and false when it is v4/v6 combined
-// (dualstack).
-func getUDPSocketOptions6Only(conn *net.UDPConn) (bool, error) {
-       file, err := conn.File()
-       if err != nil {
-               return false, err
-       }
-       // dual stack. See http://stackoverflow.com/questions/1618240/how-to-support-both-ipv4-and-ipv6-connections
-       v6only, err := syscall.GetsockoptInt(int(file.Fd()), syscall.IPPROTO_IPV6, syscall.IPV6_V6ONLY)
-       if err != nil {
-               file.Close()
-               return false, err
-       }
-       file.Close()
-       return v6only == 1, nil
-}
-
-func getUDPSocketName(conn *net.UDPConn) (syscall.Sockaddr, error) {
-       file, err := conn.File()
-       if err != nil {
-               return nil, err
-       }
-       defer file.Close()
-       return syscall.Getsockname(int(file.Fd()))
-}

diff --git a/vendor/github.com/miekg/dns/udp_other.go b/vendor/github.com/miekg/dns/udp_other.go
deleted file mode 100644 (file)
index 488a282..0000000
--- a/vendor/github.com/miekg/dns/udp_other.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !linux appengine
-
-package dns
-
-import (
-       "net"
-)
-
-// These do nothing. See udp_linux.go for an example of how to implement this.
-
-// We tried to adhire to some kind of naming scheme.
-func setUDPSocketOptions(conn *net.UDPConn) error                  { return nil }
-func setUDPSocketOptions4(conn *net.UDPConn) error                 { return nil }
-func setUDPSocketOptions6(conn *net.UDPConn) error                 { return nil }
-func getUDPSocketOptions6Only(conn *net.UDPConn) (bool, error)     { return false, nil }

diff --git a/vendor/github.com/miekg/dns/udp_windows.go b/vendor/github.com/miekg/dns/udp_windows.go
index 51e532ac2a8687e211bae7e6af28526e919c4ff2..6778c3c6cfe989a6955bbd456556bbf38b6cf61a 100644 (file)
--- a/vendor/github.com/miekg/dns/udp_windows.go
+++ b/vendor/github.com/miekg/dns/udp_windows.go
@@ -4,14 +4,17 @@ package dns
 
 import "net"
 
+// SessionUDP holds the remote address
 type SessionUDP struct {
        raddr *net.UDPAddr
 }
 
+// RemoteAddr returns the remote network address.
 func (s *SessionUDP) RemoteAddr() net.Addr { return s.raddr }
 
 // ReadFromSessionUDP acts just like net.UDPConn.ReadFrom(), but returns a session object instead of a
 // net.UDPAddr.
+// TODO(fastest963): Once go1.10 is released, use ReadMsgUDP.
 func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
        n, raddr, err := conn.ReadFrom(b)
        if err != nil {
@@ -21,9 +24,14 @@ func ReadFromSessionUDP(conn *net.UDPConn, b []byte) (int, *SessionUDP, error) {
        return n, session, err
 }
 
-// WriteToSessionUDP acts just like net.UDPConn.WritetTo(), but uses a *SessionUDP instead of a net.Addr.
+// WriteToSessionUDP acts just like net.UDPConn.WriteTo(), but uses a *SessionUDP instead of a net.Addr.
+// TODO(fastest963): Once go1.10 is released, use WriteMsgUDP.
 func WriteToSessionUDP(conn *net.UDPConn, b []byte, session *SessionUDP) (int, error) {
        n, err := conn.WriteTo(b, session.raddr)
        return n, err
 }
 
+// TODO(fastest963): Once go1.10 is released and we can use *MsgUDP methods
+// use the standard method in udp.go for these.
+func setUDPSocketOptions(*net.UDPConn) error { return nil }
+func parseDstFromOOB([]byte, net.IP) net.IP  { return nil }

diff --git a/vendor/github.com/miekg/dns/version.go b/vendor/github.com/miekg/dns/version.go
new file mode 100644 (file)
index 0000000..8d3b71c
--- /dev/null
+++ b/vendor/github.com/miekg/dns/version.go
@@ -0,0 +1,15 @@
+package dns
+
+import "fmt"
+
+// Version is current version of this library.
+var Version = V{1, 0, 1}
+
+// V holds the version of this library.
+type V struct {
+       Major, Minor, Patch int
+}
+
+func (v V) String() string {
+       return fmt.Sprintf("%d.%d.%d", v.Major, v.Minor, v.Patch)
+}

diff --git a/vendor/github.com/miekg/dns/xfr.go b/vendor/github.com/miekg/dns/xfr.go
index 576c5590afd54df964ac6dd45b63631786c464ca..5d0ff5c8a2758387f8d3e29992c694e39ab55ca8 100644 (file)
--- a/vendor/github.com/miekg/dns/xfr.go
+++ b/vendor/github.com/miekg/dns/xfr.go
@@ -17,7 +17,7 @@ type Transfer struct {
        DialTimeout    time.Duration     // net.DialTimeout, defaults to 2 seconds
        ReadTimeout    time.Duration     // net.Conn.SetReadTimeout value for connections, defaults to 2 seconds
        WriteTimeout   time.Duration     // net.Conn.SetWriteTimeout value for connections, defaults to 2 seconds
-       TsigSecret     map[string]string // Secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be fully qualified
+       TsigSecret     map[string]string // Secret(s) for Tsig map[<zonename>]<base64 secret>, zonename must be in canonical form (lowercase, fqdn, see RFC 4034 Section 6.2)
        tsigTimersOnly bool
 }
 
@@ -51,18 +51,18 @@ func (t *Transfer) In(q *Msg, a string) (env chan *Envelope, err error) {
        env = make(chan *Envelope)
        go func() {
                if q.Question[0].Qtype == TypeAXFR {
-                       go t.inAxfr(q.Id, env)
+                       go t.inAxfr(q, env)
                        return
                }
                if q.Question[0].Qtype == TypeIXFR {
-                       go t.inIxfr(q.Id, env)
+                       go t.inIxfr(q, env)
                        return
                }
        }()
        return env, nil
 }
 
-func (t *Transfer) inAxfr(id uint16, c chan *Envelope) {
+func (t *Transfer) inAxfr(q *Msg, c chan *Envelope) {
        first := true
        defer t.Close()
        defer close(c)
@@ -77,7 +77,7 @@ func (t *Transfer) inAxfr(id uint16, c chan *Envelope) {
                        c <- &Envelope{nil, err}
                        return
                }
-               if id != in.Id {
+               if q.Id != in.Id {
                        c <- &Envelope{in.Answer, ErrId}
                        return
                }
@@ -110,9 +110,11 @@ func (t *Transfer) inAxfr(id uint16, c chan *Envelope) {
        }
 }
 
-func (t *Transfer) inIxfr(id uint16, c chan *Envelope) {
+func (t *Transfer) inIxfr(q *Msg, c chan *Envelope) {
        serial := uint32(0) // The first serial seen is the current server serial
-       first := true
+       axfr := true
+       n := 0
+       qser := q.Ns[0].(*SOA).Serial
        defer t.Close()
        defer close(c)
        timeout := dnsTimeout
@@ -126,21 +128,15 @@ func (t *Transfer) inIxfr(id uint16, c chan *Envelope) {
                        c <- &Envelope{nil, err}
                        return
                }
-               if id != in.Id {
+               if q.Id != in.Id {
                        c <- &Envelope{in.Answer, ErrId}
                        return
                }
-               if first {
-                       if in.Rcode != RcodeSuccess {
-                               c <- &Envelope{in.Answer, &Error{err: fmt.Sprintf(errXFR, in.Rcode)}}
-                               return
-                       }
-                       // A single SOA RR signals "no changes"
-                       if len(in.Answer) == 1 && isSOAFirst(in) {
-                               c <- &Envelope{in.Answer, nil}
-                               return
-                       }
-
+               if in.Rcode != RcodeSuccess {
+                       c <- &Envelope{in.Answer, &Error{err: fmt.Sprintf(errXFR, in.Rcode)}}
+                       return
+               }
+               if n == 0 {
                        // Check if the returned answer is ok
                        if !isSOAFirst(in) {
                                c <- &Envelope{in.Answer, ErrSoa}
@@ -148,21 +144,30 @@ func (t *Transfer) inIxfr(id uint16, c chan *Envelope) {
                        }
                        // This serial is important
                        serial = in.Answer[0].(*SOA).Serial
-                       first = !first
+                       // Check if there are no changes in zone
+                       if qser >= serial {
+                               c <- &Envelope{in.Answer, nil}
+                               return
+                       }
                }
-
                // Now we need to check each message for SOA records, to see what we need to do
-               if !first {
-                       t.tsigTimersOnly = true
-                       // If the last record in the IXFR contains the servers' SOA,  we should quit
-                       if v, ok := in.Answer[len(in.Answer)-1].(*SOA); ok {
+               t.tsigTimersOnly = true
+               for _, rr := range in.Answer {
+                       if v, ok := rr.(*SOA); ok {
                                if v.Serial == serial {
-                                       c <- &Envelope{in.Answer, nil}
-                                       return
+                                       n++
+                                       // quit if it's a full axfr or the the servers' SOA is repeated the third time
+                                       if axfr && n == 2 || n == 3 {
+                                               c <- &Envelope{in.Answer, nil}
+                                               return
+                                       }
+                               } else if axfr {
+                                       // it's an ixfr
+                                       axfr = false
                                }
                        }
-                       c <- &Envelope{in.Answer, nil}
                }
+               c <- &Envelope{in.Answer, nil}
        }
 }
 

diff --git a/vendor/github.com/miekg/dns/zcompress.go b/vendor/github.com/miekg/dns/zcompress.go
index b277978b96aab00c944a779a44831d66bf63de6a..c2503204dd14a50ac26e97dd7bdbe96edcdeca71 100644 (file)
--- a/vendor/github.com/miekg/dns/zcompress.go
+++ b/vendor/github.com/miekg/dns/zcompress.go
@@ -1,87 +1,83 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from compress_generate.go
+// Code generated by "go run compress_generate.go"; DO NOT EDIT.
 
 package dns
 
 func compressionLenHelperType(c map[string]int, r RR) {
        switch x := r.(type) {
-       case *PTR:
-               compressionLenHelper(c, x.Ptr)
-       case *SOA:
-               compressionLenHelper(c, x.Ns)
-               compressionLenHelper(c, x.Mbox)
        case *AFSDB:
                compressionLenHelper(c, x.Hostname)
+       case *CNAME:
+               compressionLenHelper(c, x.Target)
+       case *DNAME:
+               compressionLenHelper(c, x.Target)
        case *HIP:
                for i := range x.RendezvousServers {
                        compressionLenHelper(c, x.RendezvousServers[i])
                }
+       case *KX:
+               compressionLenHelper(c, x.Exchanger)
        case *LP:
                compressionLenHelper(c, x.Fqdn)
-       case *CNAME:
-               compressionLenHelper(c, x.Target)
        case *MB:
                compressionLenHelper(c, x.Mb)
-       case *RP:
-               compressionLenHelper(c, x.Mbox)
-               compressionLenHelper(c, x.Txt)
-       case *RRSIG:
-               compressionLenHelper(c, x.SignerName)
+       case *MD:
+               compressionLenHelper(c, x.Md)
        case *MF:
                compressionLenHelper(c, x.Mf)
+       case *MG:
+               compressionLenHelper(c, x.Mg)
        case *MINFO:
                compressionLenHelper(c, x.Rmail)
                compressionLenHelper(c, x.Email)
-       case *SIG:
-               compressionLenHelper(c, x.SignerName)
-       case *SRV:
-               compressionLenHelper(c, x.Target)
-       case *TSIG:
-               compressionLenHelper(c, x.Algorithm)
-       case *KX:
-               compressionLenHelper(c, x.Exchanger)
-       case *MG:
-               compressionLenHelper(c, x.Mg)
-       case *NSAPPTR:
-               compressionLenHelper(c, x.Ptr)
-       case *PX:
-               compressionLenHelper(c, x.Map822)
-               compressionLenHelper(c, x.Mapx400)
-       case *DNAME:
-               compressionLenHelper(c, x.Target)
        case *MR:
                compressionLenHelper(c, x.Mr)
        case *MX:
                compressionLenHelper(c, x.Mx)
-       case *TKEY:
-               compressionLenHelper(c, x.Algorithm)
-       case *NSEC:
-               compressionLenHelper(c, x.NextDomain)
-       case *TALINK:
-               compressionLenHelper(c, x.PreviousName)
-               compressionLenHelper(c, x.NextName)
-       case *MD:
-               compressionLenHelper(c, x.Md)
        case *NAPTR:
                compressionLenHelper(c, x.Replacement)
        case *NS:
                compressionLenHelper(c, x.Ns)
+       case *NSAPPTR:
+               compressionLenHelper(c, x.Ptr)
+       case *NSEC:
+               compressionLenHelper(c, x.NextDomain)
+       case *PTR:
+               compressionLenHelper(c, x.Ptr)
+       case *PX:
+               compressionLenHelper(c, x.Map822)
+               compressionLenHelper(c, x.Mapx400)
+       case *RP:
+               compressionLenHelper(c, x.Mbox)
+               compressionLenHelper(c, x.Txt)
+       case *RRSIG:
+               compressionLenHelper(c, x.SignerName)
        case *RT:
                compressionLenHelper(c, x.Host)
+       case *SIG:
+               compressionLenHelper(c, x.SignerName)
+       case *SOA:
+               compressionLenHelper(c, x.Ns)
+               compressionLenHelper(c, x.Mbox)
+       case *SRV:
+               compressionLenHelper(c, x.Target)
+       case *TALINK:
+               compressionLenHelper(c, x.PreviousName)
+               compressionLenHelper(c, x.NextName)
+       case *TKEY:
+               compressionLenHelper(c, x.Algorithm)
+       case *TSIG:
+               compressionLenHelper(c, x.Algorithm)
        }
 }
 
 func compressionLenSearchType(c map[string]int, r RR) (int, bool) {
        switch x := r.(type) {
-       case *MG:
-               k1, ok1 := compressionLenSearch(c, x.Mg)
-               return k1, ok1
-       case *PTR:
-               k1, ok1 := compressionLenSearch(c, x.Ptr)
-               return k1, ok1
        case *AFSDB:
                k1, ok1 := compressionLenSearch(c, x.Hostname)
                return k1, ok1
+       case *CNAME:
+               k1, ok1 := compressionLenSearch(c, x.Target)
+               return k1, ok1
        case *MB:
                k1, ok1 := compressionLenSearch(c, x.Mb)
                return k1, ok1
@@ -91,18 +87,8 @@ func compressionLenSearchType(c map[string]int, r RR) (int, bool) {
        case *MF:
                k1, ok1 := compressionLenSearch(c, x.Mf)
                return k1, ok1
-       case *NS:
-               k1, ok1 := compressionLenSearch(c, x.Ns)
-               return k1, ok1
-       case *RT:
-               k1, ok1 := compressionLenSearch(c, x.Host)
-               return k1, ok1
-       case *SOA:
-               k1, ok1 := compressionLenSearch(c, x.Ns)
-               k2, ok2 := compressionLenSearch(c, x.Mbox)
-               return k1 + k2, ok1 && ok2
-       case *CNAME:
-               k1, ok1 := compressionLenSearch(c, x.Target)
+       case *MG:
+               k1, ok1 := compressionLenSearch(c, x.Mg)
                return k1, ok1
        case *MINFO:
                k1, ok1 := compressionLenSearch(c, x.Rmail)
@@ -114,6 +100,19 @@ func compressionLenSearchType(c map[string]int, r RR) (int, bool) {
        case *MX:
                k1, ok1 := compressionLenSearch(c, x.Mx)
                return k1, ok1
+       case *NS:
+               k1, ok1 := compressionLenSearch(c, x.Ns)
+               return k1, ok1
+       case *PTR:
+               k1, ok1 := compressionLenSearch(c, x.Ptr)
+               return k1, ok1
+       case *RT:
+               k1, ok1 := compressionLenSearch(c, x.Host)
+               return k1, ok1
+       case *SOA:
+               k1, ok1 := compressionLenSearch(c, x.Ns)
+               k2, ok2 := compressionLenSearch(c, x.Mbox)
+               return k1 + k2, ok1 && ok2
        }
        return 0, false
 }

diff --git a/vendor/github.com/miekg/dns/zmsg.go b/vendor/github.com/miekg/dns/zmsg.go
index 418fb1fe3e27a98971e927096264b6bd7941bb64..0d1f6f4daaddbee06ec3754a3aa86976741b2a41 100644 (file)
--- a/vendor/github.com/miekg/dns/zmsg.go
+++ b/vendor/github.com/miekg/dns/zmsg.go
@@ -1,5 +1,4 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from msg_generate.go
+// Code generated by "go run msg_generate.go"; DO NOT EDIT.
 
 package dns
 
@@ -189,6 +188,28 @@ func (rr *CNAME) pack(msg []byte, off int, compression map[string]int, compress
        return off, nil
 }
 
+func (rr *CSYNC) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
+       off, err := rr.Hdr.pack(msg, off, compression, compress)
+       if err != nil {
+               return off, err
+       }
+       headerEnd := off
+       off, err = packUint32(rr.Serial, msg, off)
+       if err != nil {
+               return off, err
+       }
+       off, err = packUint16(rr.Flags, msg, off)
+       if err != nil {
+               return off, err
+       }
+       off, err = packDataNsec(rr.TypeBitMap, msg, off)
+       if err != nil {
+               return off, err
+       }
+       rr.Header().Rdlength = uint16(off - headerEnd)
+       return off, nil
+}
+
 func (rr *DHCID) pack(msg []byte, off int, compression map[string]int, compress bool) (int, error) {
        off, err := rr.Hdr.pack(msg, off, compression, compress)
        if err != nil {
@@ -1303,7 +1324,7 @@ func (rr *TKEY) pack(msg []byte, off int, compression map[string]int, compress b
        if err != nil {
                return off, err
        }
-       off, err = packString(rr.Key, msg, off)
+       off, err = packStringHex(rr.Key, msg, off)
        if err != nil {
                return off, err
        }
@@ -1311,7 +1332,7 @@ func (rr *TKEY) pack(msg []byte, off int, compression map[string]int, compress b
        if err != nil {
                return off, err
        }
-       off, err = packString(rr.OtherData, msg, off)
+       off, err = packStringHex(rr.OtherData, msg, off)
        if err != nil {
                return off, err
        }
@@ -1721,6 +1742,37 @@ func unpackCNAME(h RR_Header, msg []byte, off int) (RR, int, error) {
        return rr, off, err
 }
 
+func unpackCSYNC(h RR_Header, msg []byte, off int) (RR, int, error) {
+       rr := new(CSYNC)
+       rr.Hdr = h
+       if noRdata(h) {
+               return rr, off, nil
+       }
+       var err error
+       rdStart := off
+       _ = rdStart
+
+       rr.Serial, off, err = unpackUint32(msg, off)
+       if err != nil {
+               return rr, off, err
+       }
+       if off == len(msg) {
+               return rr, off, nil
+       }
+       rr.Flags, off, err = unpackUint16(msg, off)
+       if err != nil {
+               return rr, off, err
+       }
+       if off == len(msg) {
+               return rr, off, nil
+       }
+       rr.TypeBitMap, off, err = unpackDataNsec(msg, off)
+       if err != nil {
+               return rr, off, err
+       }
+       return rr, off, err
+}
+
 func unpackDHCID(h RR_Header, msg []byte, off int) (RR, int, error) {
        rr := new(DHCID)
        rr.Hdr = h
@@ -3265,13 +3317,10 @@ func unpackTKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
        if off == len(msg) {
                return rr, off, nil
        }
-       rr.Key, off, err = unpackString(msg, off)
+       rr.Key, off, err = unpackStringHex(msg, off, off+int(rr.KeySize))
        if err != nil {
                return rr, off, err
        }
-       if off == len(msg) {
-               return rr, off, nil
-       }
        rr.OtherLen, off, err = unpackUint16(msg, off)
        if err != nil {
                return rr, off, err
@@ -3279,7 +3328,7 @@ func unpackTKEY(h RR_Header, msg []byte, off int) (RR, int, error) {
        if off == len(msg) {
                return rr, off, nil
        }
-       rr.OtherData, off, err = unpackString(msg, off)
+       rr.OtherData, off, err = unpackStringHex(msg, off, off+int(rr.OtherLen))
        if err != nil {
                return rr, off, err
        }
@@ -3504,6 +3553,7 @@ var typeToUnpack = map[uint16]func(RR_Header, []byte, int) (RR, int, error){
        TypeCDS:        unpackCDS,
        TypeCERT:       unpackCERT,
        TypeCNAME:      unpackCNAME,
+       TypeCSYNC:      unpackCSYNC,
        TypeDHCID:      unpackDHCID,
        TypeDLV:        unpackDLV,
        TypeDNAME:      unpackDNAME,

diff --git a/vendor/github.com/miekg/dns/ztypes.go b/vendor/github.com/miekg/dns/ztypes.go
index 3e534f12e0191248c1a8603f7b0cc553470a465c..abd75dd918784536192f56f94fdaec6ca5cc36c8 100644 (file)
--- a/vendor/github.com/miekg/dns/ztypes.go
+++ b/vendor/github.com/miekg/dns/ztypes.go
@@ -1,5 +1,4 @@
-// *** DO NOT MODIFY ***
-// AUTOGENERATED BY go generate from type_generate.go
+// Code generated by "go run types_generate.go"; DO NOT EDIT.
 
 package dns
 
@@ -20,6 +19,7 @@ var TypeToRR = map[uint16]func() RR{
        TypeCDS:        func() RR { return new(CDS) },
        TypeCERT:       func() RR { return new(CERT) },
        TypeCNAME:      func() RR { return new(CNAME) },
+       TypeCSYNC:      func() RR { return new(CSYNC) },
        TypeDHCID:      func() RR { return new(DHCID) },
        TypeDLV:        func() RR { return new(DLV) },
        TypeDNAME:      func() RR { return new(DNAME) },
@@ -94,6 +94,7 @@ var TypeToString = map[uint16]string{
        TypeCDS:        "CDS",
        TypeCERT:       "CERT",
        TypeCNAME:      "CNAME",
+       TypeCSYNC:      "CSYNC",
        TypeDHCID:      "DHCID",
        TypeDLV:        "DLV",
        TypeDNAME:      "DNAME",
@@ -163,7 +164,6 @@ var TypeToString = map[uint16]string{
        TypeNSAPPTR:    "NSAP-PTR",
 }
 
-// Header() functions
 func (rr *A) Header() *RR_Header          { return &rr.Hdr }
 func (rr *AAAA) Header() *RR_Header       { return &rr.Hdr }
 func (rr *AFSDB) Header() *RR_Header      { return &rr.Hdr }
@@ -174,6 +174,7 @@ func (rr *CDNSKEY) Header() *RR_Header    { return &rr.Hdr }
 func (rr *CDS) Header() *RR_Header        { return &rr.Hdr }
 func (rr *CERT) Header() *RR_Header       { return &rr.Hdr }
 func (rr *CNAME) Header() *RR_Header      { return &rr.Hdr }
+func (rr *CSYNC) Header() *RR_Header      { return &rr.Hdr }
 func (rr *DHCID) Header() *RR_Header      { return &rr.Hdr }
 func (rr *DLV) Header() *RR_Header        { return &rr.Hdr }
 func (rr *DNAME) Header() *RR_Header      { return &rr.Hdr }
@@ -346,7 +347,7 @@ func (rr *HIP) len() int {
        l++    // HitLength
        l++    // PublicKeyAlgorithm
        l += 2 // PublicKeyLength
-       l += len(rr.Hit)/2 + 1
+       l += len(rr.Hit) / 2
        l += base64.StdEncoding.DecodedLen(len(rr.PublicKey))
        for _, x := range rr.RendezvousServers {
                l += len(x) + 1
@@ -469,7 +470,7 @@ func (rr *NSEC3PARAM) len() int {
        l++    // Flags
        l += 2 // Iterations
        l++    // SaltLength
-       l += len(rr.Salt)/2 + 1
+       l += len(rr.Salt) / 2
        return l
 }
 func (rr *OPENPGPKEY) len() int {
@@ -590,9 +591,9 @@ func (rr *TKEY) len() int {
        l += 2 // Mode
        l += 2 // Error
        l += 2 // KeySize
-       l += len(rr.Key) + 1
+       l += len(rr.Key) / 2
        l += 2 // OtherLen
-       l += len(rr.OtherData) + 1
+       l += len(rr.OtherData) / 2
        return l
 }
 func (rr *TLSA) len() int {
@@ -609,11 +610,11 @@ func (rr *TSIG) len() int {
        l += 6 // TimeSigned
        l += 2 // Fudge
        l += 2 // MACSize
-       l += len(rr.MAC)/2 + 1
+       l += len(rr.MAC) / 2
        l += 2 // OrigId
        l += 2 // Error
        l += 2 // OtherLen
-       l += len(rr.OtherData)/2 + 1
+       l += len(rr.OtherData) / 2
        return l
 }
 func (rr *TXT) len() int {
@@ -673,6 +674,11 @@ func (rr *CERT) copy() RR {
 func (rr *CNAME) copy() RR {
        return &CNAME{*rr.Hdr.copyHeader(), rr.Target}
 }
+func (rr *CSYNC) copy() RR {
+       TypeBitMap := make([]uint16, len(rr.TypeBitMap))
+       copy(TypeBitMap, rr.TypeBitMap)
+       return &CSYNC{*rr.Hdr.copyHeader(), rr.Serial, rr.Flags, TypeBitMap}
+}
 func (rr *DHCID) copy() RR {
        return &DHCID{*rr.Hdr.copyHeader(), rr.Digest}
 }

diff --git a/vendor/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
new file mode 100644 (file)
index 0000000..6a66aea
--- /dev/null
+++ b/vendor/golang.org/x/crypto/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2009 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/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS
new file mode 100644 (file)
index 0000000..7330990
--- /dev/null
+++ b/vendor/golang.org/x/crypto/PATENTS
@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.

diff --git a/vendor/golang.org/x/crypto/ed25519/ed25519.go b/vendor/golang.org/x/crypto/ed25519/ed25519.go
new file mode 100644 (file)
index 0000000..4f26b49
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/ed25519.go
@@ -0,0 +1,181 @@
+// Copyright 2016 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
+// https://ed25519.cr.yp.to/.
+//
+// These functions are also compatible with the “Ed25519” function defined in
+// RFC 8032.
+package ed25519
+
+// This code is a port of the public domain, “ref10” implementation of ed25519
+// from SUPERCOP.
+
+import (
+       "bytes"
+       "crypto"
+       cryptorand "crypto/rand"
+       "crypto/sha512"
+       "errors"
+       "io"
+       "strconv"
+
+       "golang.org/x/crypto/ed25519/internal/edwards25519"
+)
+
+const (
+       // PublicKeySize is the size, in bytes, of public keys as used in this package.
+       PublicKeySize = 32
+       // PrivateKeySize is the size, in bytes, of private keys as used in this package.
+       PrivateKeySize = 64
+       // SignatureSize is the size, in bytes, of signatures generated and verified by this package.
+       SignatureSize = 64
+)
+
+// PublicKey is the type of Ed25519 public keys.
+type PublicKey []byte
+
+// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer.
+type PrivateKey []byte
+
+// Public returns the PublicKey corresponding to priv.
+func (priv PrivateKey) Public() crypto.PublicKey {
+       publicKey := make([]byte, PublicKeySize)
+       copy(publicKey, priv[32:])
+       return PublicKey(publicKey)
+}
+
+// Sign signs the given message with priv.
+// 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 PrivateKey) 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 Sign(priv, message), nil
+}
+
+// GenerateKey generates a public/private key pair using entropy from rand.
+// If rand is nil, crypto/rand.Reader will be used.
+func GenerateKey(rand io.Reader) (publicKey PublicKey, privateKey PrivateKey, err error) {
+       if rand == nil {
+               rand = cryptorand.Reader
+       }
+
+       privateKey = make([]byte, PrivateKeySize)
+       publicKey = make([]byte, PublicKeySize)
+       _, err = io.ReadFull(rand, privateKey[:32])
+       if err != nil {
+               return nil, nil, err
+       }
+
+       digest := sha512.Sum512(privateKey[:32])
+       digest[0] &= 248
+       digest[31] &= 127
+       digest[31] |= 64
+
+       var A edwards25519.ExtendedGroupElement
+       var hBytes [32]byte
+       copy(hBytes[:], digest[:])
+       edwards25519.GeScalarMultBase(&A, &hBytes)
+       var publicKeyBytes [32]byte
+       A.ToBytes(&publicKeyBytes)
+
+       copy(privateKey[32:], publicKeyBytes[:])
+       copy(publicKey, publicKeyBytes[:])
+
+       return publicKey, privateKey, nil
+}
+
+// Sign signs the message with privateKey and returns a signature. It will
+// panic if len(privateKey) is not PrivateKeySize.
+func Sign(privateKey PrivateKey, message []byte) []byte {
+       if l := len(privateKey); l != PrivateKeySize {
+               panic("ed25519: bad private key length: " + strconv.Itoa(l))
+       }
+
+       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 := make([]byte, SignatureSize)
+       copy(signature[:], encodedR[:])
+       copy(signature[32:], s[:])
+
+       return signature
+}
+
+// Verify reports whether sig is a valid signature of message by publicKey. It
+// will panic if len(publicKey) is not PublicKeySize.
+func Verify(publicKey PublicKey, message, sig []byte) bool {
+       if l := len(publicKey); l != PublicKeySize {
+               panic("ed25519: bad public key length: " + strconv.Itoa(l))
+       }
+
+       if len(sig) != SignatureSize || sig[63]&224 != 0 {
+               return false
+       }
+
+       var A edwards25519.ExtendedGroupElement
+       var publicKeyBytes [32]byte
+       copy(publicKeyBytes[:], publicKey)
+       if !A.FromBytes(&publicKeyBytes) {
+               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 bytes.Equal(sig[:32], checkR[:])
+}

diff --git a/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
new file mode 100644 (file)
index 0000000..e39f086
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
@@ -0,0 +1,1422 @@
+// Copyright 2016 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
+
+// These values are from the public domain, “ref10” implementation of ed25519
+// from SUPERCOP.
+
+// d is a constant in the Edwards curve equation.
+var d = FieldElement{
+       -10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116,
+}
+
+// d2 is 2*d.
+var d2 = FieldElement{
+       -21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199,
+}
+
+// SqrtM1 is the square-root of -1 in the field.
+var SqrtM1 = FieldElement{
+       -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482,
+}
+
+// A is a constant in the Montgomery-form of curve25519.
+var A = FieldElement{
+       486662, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+}
+
+// bi contains precomputed multiples of the base-point. See the Ed25519 paper
+// for a discussion about how these values are used.
+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},
+       },
+}
+
+// base contains precomputed multiples of the base-point. See the Ed25519 paper
+// for a discussion about how these values are used.
+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/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
new file mode 100644 (file)
index 0000000..5f8b994
--- /dev/null
+++ b/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
@@ -0,0 +1,1771 @@
+// Copyright 2016 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
+
+// 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, assuming that b and c are
+// non-negative.
+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/vendor.json b/vendor/vendor.json
index b815568845c5d7d67a285117a31754ab78cc43bf..c862a0ac1ca31f651a25d06001d9cbd73fea97bc 100644 (file)
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -69,10 +69,12 @@
                        "revisionTime": "2016-04-24T11:30:07Z"
                },
                {
-                       "checksumSHA1": "Ewgc6lPiuDZVOf1407rxzSgAOag=",
+                       "checksumSHA1": "ILTVouyz8EPosBS0+g+hYsBnwds=",
                        "path": "github.com/miekg/dns",
-                       "revision": "e4205768578dc90c2669e75a2f8a8bf77e3083a4",
-                       "revisionTime": "2017-08-18T13:14:42Z"
+                       "revision": "787fb05a250f045a0c3e676c8c499ed412633f45",
+                       "revisionTime": "2017-12-21T11:36:42Z",
+                       "version": "v1.0.1",
+                       "versionExact": "v1.0.1"
                },
                {
                        "checksumSHA1": "rJab1YdNhQooDiBWNnt7TLWPyBU=",
@@ -152,6 +154,18 @@
                        "revision": "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2",
                        "revisionTime": "2017-07-03T10:12:42Z"
                },
+               {
+                       "checksumSHA1": "1hwn8cgg4EVXhCpJIqmMbzqnUo0=",
+                       "path": "golang.org/x/crypto/ed25519",
+                       "revision": "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8",
+                       "revisionTime": "2017-11-25T19:00:56Z"
+               },
+               {
+                       "checksumSHA1": "LXFcVx8I587SnWmKycSDEq9yvK8=",
+                       "path": "golang.org/x/crypto/ed25519/internal/edwards25519",
+                       "revision": "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8",
+                       "revisionTime": "2017-11-25T19:00:56Z"
+               },
                {
                        "checksumSHA1": "uX2McdP4VcQ6zkAF0Q4oyd0rFtU=",
                        "path": "golang.org/x/net/bpf",