crypto/gns: fixed serialization of ZonePrivate. Updated tests.v0.1.41

6 files changed, 244 insertions, 85 deletions

diff --git a/src/gnunet/crypto/gns.go b/src/gnunet/crypto/gns.go
index fe12b09..9486f66 100644
--- a/src/gnunet/crypto/gns.go
+++ b/src/gnunet/crypto/gns.go
@@ -288,10 +288,7 @@ func (zk *ZonePrivate) IsNull() bool {
 
 // Bytes returns the binary representation
 func (zp *ZonePrivate) Bytes() []byte {
-        buf := new(bytes.Buffer)
-        _ = binary.Write(buf, binary.BigEndian, zp.Type)
-        _, _ = buf.Write(zp.KeyData)
-        return buf.Bytes()
+        return zp.impl.Bytes()
 }
 
 // KeySize returns the number of bytes of a key representation.
@@ -305,9 +302,11 @@ func (zp *ZonePrivate) KeySize() uint {
 
 // Derive key (key blinding)
 func (zp *ZonePrivate) Derive(label, context string) (dzp *ZonePrivate, h *math.Int, err error) {
-        // calculate derived key
+        // calculate blinding value
         key := zp.Public().KeyData
         h = deriveH(key, label, context)
+
+        // derive private implementation
         var derived ZonePrivateImpl
         if derived, h, err = zp.impl.Derive(h); err != nil {
                 return
diff --git a/src/gnunet/crypto/gns_pkey.go b/src/gnunet/crypto/gns_pkey.go
index f1bb110..0f91af9 100644
--- a/src/gnunet/crypto/gns_pkey.go
+++ b/src/gnunet/crypto/gns_pkey.go
@@ -53,7 +53,7 @@ func init() {
 }
 
 //----------------------------------------------------------------------
-// Private key
+// Public key
 //----------------------------------------------------------------------
 
 // PKEYPublicImpl implements the public key scheme.
diff --git a/src/gnunet/go.mod b/src/gnunet/go.mod
index e45a035..07231a5 100644
--- a/src/gnunet/go.mod
+++ b/src/gnunet/go.mod
@@ -3,7 +3,7 @@ module gnunet
 go 1.19
 
 require (
-        github.com/bfix/gospel v1.2.22
+        github.com/bfix/gospel v1.2.24
         github.com/go-redis/redis/v8 v8.11.5
         github.com/go-sql-driver/mysql v1.6.0
         github.com/gorilla/mux v1.8.0
@@ -14,7 +14,9 @@ require (
 )
 
 require (
+        github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310 // indirect
         github.com/cespare/xxhash/v2 v2.1.2 // indirect
+        github.com/cloudflare/circl v1.3.3 // indirect
         github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
         github.com/huin/goupnp v1.0.0 // indirect
         golang.org/x/mod v0.8.0 // indirect
@@ -24,4 +26,4 @@ require (
         golang.org/x/tools v0.6.0 // indirect
 )
 
-// replace github.com/bfix/gospel v1.2.22 => ../gospel
+// replace github.com/bfix/gospel v1.2.24 => ../gospel
diff --git a/src/gnunet/go.sum b/src/gnunet/go.sum
index c7c04b9..9fbacd8 100644
--- a/src/gnunet/go.sum
+++ b/src/gnunet/go.sum
@@ -1,7 +1,13 @@
-github.com/bfix/gospel v1.2.22 h1:b7hChvq4Cn/+KZDiaE0bKBx7b6L+aObbjR1dj6V5f9o=
-github.com/bfix/gospel v1.2.22/go.mod h1:cdu63bA9ZdfeDoqZ+vnWOcbY9Puwdzmf5DMxMGMznRI=
+github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310 h1:dGAdTcqheKrQ/TW76sAcmO2IorwXplUw2inPkOzykbw=
+github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
+github.com/bfix/gospel v1.2.24 h1:QiEhgZPk3QjNRMq/3pWQThLbm3U7RA+YATyPScGLhss=
+github.com/bfix/gospel v1.2.24/go.mod h1:Nd9c/DuMKFhZvUokW4vmRmrbNSTnyJL5cUplA2/7SC0=
+github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
+github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs=
+github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
@@ -24,45 +30,64 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
 golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/src/gnunet/service/gns/rfc-data_test.go b/src/gnunet/service/gns/rfc-data_test.go
index bb876e1..28d76dd 100644
--- a/src/gnunet/service/gns/rfc-data_test.go
+++ b/src/gnunet/service/gns/rfc-data_test.go
@@ -34,22 +34,25 @@ type Enc struct {
 }
 
 type TestCase struct {
-        Zpk     []byte
-        Zid     []byte
-        Ztld    string
-        Label   string
-        Q       []byte
-        Recs    []*Rec
-        Rdata   []byte
-        Enc     *Enc
-        Bdata   []byte
+        Zprv  []byte
+        Zid   []byte
+        Ztld  string
+        Label string
+        Dzprv []byte
+        Dzpub []byte
+        Q     []byte
+        Recs  []*Rec
+        Rdata []byte
+        Enc   *Enc
+        Bdata []byte
+
         RRblock []byte
 }
 
 var tests = []*TestCase{
         // Testcase #1
         {
-                Zpk: []byte{
+                Zprv: []byte{
                         0x50, 0xd7, 0xb6, 0x52, 0xa4, 0xef, 0xea, 0xdf, 0xf3, 0x73, 0x96, 0x90, 0x97, 0x85, 0xe5, 0x95,
                         0x21, 0x71, 0xa0, 0x21, 0x78, 0xc8, 0xe7, 0xd4, 0x50, 0xfa, 0x90, 0x79, 0x25, 0xfa, 0xfd, 0x98,
                 },
@@ -58,7 +61,19 @@ var tests = []*TestCase{
                         0x67, 0x7c, 0x47, 0x7d, 0x2d, 0x93, 0x09, 0x7c, 0x85, 0xb1, 0x95, 0xc6, 0xf9, 0x6d, 0x84, 0xff,
                         0x61, 0xf5, 0x98, 0x2c, 0x2c, 0x4f, 0xe0, 0x2d, 0x5a, 0x11, 0xfe, 0xdf, 0xb0, 0xc2, 0x90, 0x1f,
                 },
-                Ztld:  "000G0037FH3QTBCK15Y8BCCNRVWPV17ZC7TSGB1C9ZG2TPGHZVFV1GMG3W",
+                Ztld: "000G0037FH3QTBCK15Y8BCCNRVWPV17ZC7TSGB1C9ZG2TPGHZVFV1GMG3W",
+                Dzprv: []byte{
+                        0x0a, 0x4c, 0x5e, 0x0f, 0x00, 0x63, 0xdf, 0xce,
+                        0xdb, 0xc8, 0xc7, 0xf2, 0xb2, 0x2c, 0x03, 0x0c,
+                        0x86, 0x28, 0xb2, 0xc2, 0xcb, 0xac, 0x9f, 0xa7,
+                        0x29, 0xaa, 0xe6, 0x1f, 0x89, 0xdb, 0x3e, 0x9c,
+                },
+                Dzpub: []byte{
+                        0x18, 0x2b, 0xb6, 0x36, 0xed, 0xa7, 0x9f, 0x79,
+                        0x57, 0x11, 0xbc, 0x27, 0x08, 0xad, 0xbb, 0x24,
+                        0x2a, 0x60, 0x44, 0x6a, 0xd3, 0xc3, 0x08, 0x03,
+                        0x12, 0x1d, 0x03, 0xd3, 0x48, 0xb7, 0xce, 0xb6,
+                },
                 Label: "testdelegation",
                 Q: []byte{
                         0x4a, 0xdc, 0x67, 0xc5, 0xec, 0xee, 0x9f, 0x76, 0x98, 0x6a, 0xbd, 0x71, 0xc2, 0x22, 0x4a, 0x3d,
@@ -68,7 +83,7 @@ var tests = []*TestCase{
                 },
                 Recs: []*Rec{
                         {
-                                Expire: []byte{0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80},
+                                Expire: []byte{0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80},
                                 Size:   []byte{0x00, 0x20},
                                 Type:   []byte{0x00, 0x01, 0x00, 0x00},
                                 Flags:  []byte{0x00, 0x01},
@@ -79,13 +94,13 @@ var tests = []*TestCase{
                         },
                 },
                 Rdata: []byte{
-                        0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80, 0x00, 0x20, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+                        0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80, 0x00, 0x20, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
                         0x21, 0xe3, 0xb3, 0x0f, 0xf9, 0x3b, 0xc6, 0xd3, 0x5a, 0xc8, 0xc6, 0xe0, 0xe1, 0x3a, 0xfd, 0xff,
                         0x79, 0x4c, 0xb7, 0xb4, 0x4b, 0xbb, 0xc7, 0x48, 0xd2, 0x59, 0xd0, 0xa0, 0x28, 0x4d, 0xbe, 0x84,
                 },
                 Enc: &Enc{
                         Nonce:   []byte{0xe9, 0x0a, 0x00, 0x61},
-                        Expire:  []byte{0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80},
+                        Expire:  []byte{0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80},
                         Counter: []byte{0x00, 0x00, 0x00, 0x01},
                         Key: []byte{
                                 0x86, 0x4e, 0x71, 0x38, 0xea, 0xe7, 0xfd, 0x91, 0xa3, 0x01, 0x36, 0x89, 0x9c, 0x13, 0x2b, 0x23,
@@ -93,27 +108,27 @@ var tests = []*TestCase{
                         },
                 },
                 Bdata: []byte{
-                        0x41, 0xdc, 0x7b, 0x5f, 0x21, 0x76, 0xba, 0x59, 0x19, 0x98, 0xaf, 0xb9, 0xe3, 0xc8, 0x25, 0x79,
-                        0x50, 0x50, 0xaf, 0xc4, 0xb5, 0x3d, 0x68, 0xe4, 0x1e, 0xd9, 0x21, 0xda, 0x89, 0xde, 0x51, 0xe7,
-                        0xda, 0x35, 0xa2, 0x95, 0xb5, 0x9c, 0x2b, 0x8a, 0xae, 0xa4, 0x39, 0x91, 0x48, 0xd5, 0x0c, 0xff,
+                        0x0c, 0x1e, 0xda, 0x5c, 0xc0, 0x94, 0xa1, 0xc7, 0xa8, 0x88, 0x64, 0x9d, 0x25, 0xfa, 0xee, 0xbd,
+                        0x60, 0xda, 0xe6, 0x07, 0x3d, 0x57, 0xd8, 0xae, 0x8d, 0x45, 0x5f, 0x4f, 0x13, 0x92, 0xc0, 0x74,
+                        0xe2, 0x6a, 0xc6, 0x69, 0xbd, 0xee, 0xc2, 0x34, 0x62, 0xb9, 0x62, 0x95, 0x2c, 0xc6, 0xe9, 0xeb,
                 },
+
                 RRblock: []byte{
-                        0x00, 0x00, 0x00, 0xb0, 0x00, 0x01, 0x00, 0x00, 0x18, 0x2b, 0xb6, 0x36, 0xed, 0xa7, 0x9f, 0x79,
+                        0x00, 0x00, 0x00, 0xa0, 0x00, 0x01, 0x00, 0x00, 0x18, 0x2b, 0xb6, 0x36, 0xed, 0xa7, 0x9f, 0x79,
                         0x57, 0x11, 0xbc, 0x27, 0x08, 0xad, 0xbb, 0x24, 0x2a, 0x60, 0x44, 0x6a, 0xd3, 0xc3, 0x08, 0x03,
-                        0x12, 0x1d, 0x03, 0xd3, 0x48, 0xb7, 0xce, 0xb6, 0x01, 0xbe, 0xab, 0x94, 0x4a, 0xff, 0x7c, 0xcc,
-                        0x51, 0xbf, 0xfb, 0x21, 0x27, 0x79, 0xc3, 0x41, 0x87, 0x66, 0x0c, 0x62, 0x5d, 0x1c, 0xeb, 0x59,
-                        0xd5, 0xa0, 0xa9, 0xa2, 0xdf, 0xe4, 0x07, 0x2d, 0x0f, 0x08, 0xcd, 0x2a, 0xb1, 0xe9, 0xed, 0x63,
-                        0xd3, 0x89, 0x8f, 0xf7, 0x32, 0x52, 0x1b, 0x57, 0x31, 0x7a, 0x6c, 0x49, 0x50, 0xe1, 0x98, 0x4d,
-                        0x74, 0xdf, 0x01, 0x5f, 0x9e, 0xb7, 0x2c, 0x4a, 0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80,
-                        0x41, 0xdc, 0x7b, 0x5f, 0x21, 0x76, 0xba, 0x59, 0x19, 0x98, 0xaf, 0xb9, 0xe3, 0xc8, 0x25, 0x79,
-                        0x50, 0x50, 0xaf, 0xc4, 0xb5, 0x3d, 0x68, 0xe4, 0x1e, 0xd9, 0x21, 0xda, 0x89, 0xde, 0x51, 0xe7,
-                        0xda, 0x35, 0xa2, 0x95, 0xb5, 0x9c, 0x2b, 0x8a, 0xae, 0xa4, 0x39, 0x91, 0x48, 0xd5, 0x0c, 0xff,
-                        0x68, 0x59, 0x6b, 0x4d, 0xcb, 0x8b, 0xc2, 0xc1, 0x1b, 0xb1, 0x84, 0xd5, 0x90, 0x56, 0x13, 0xe8,
+                        0x12, 0x1d, 0x03, 0xd3, 0x48, 0xb7, 0xce, 0xb6, 0x0a, 0xd1, 0x0b, 0xc1, 0x3b, 0x40, 0x3b, 0x5b,
+                        0x25, 0x61, 0x26, 0xb2, 0x14, 0x5a, 0x6f, 0x60, 0xc5, 0x14, 0xf9, 0x51, 0xff, 0xa7, 0x66, 0xf7,
+                        0xa3, 0xfd, 0x4b, 0xac, 0x4a, 0x4e, 0x19, 0x90, 0x05, 0x5c, 0xb8, 0x7e, 0x8d, 0x1b, 0xfd, 0x19,
+                        0xaa, 0x09, 0xa4, 0x29, 0xf7, 0x29, 0xe9, 0xf5, 0xc6, 0xee, 0xc2, 0x47, 0x0a, 0xce, 0xe2, 0x22,
+                        0x07, 0x59, 0xe9, 0xe3, 0x6c, 0x88, 0x6f, 0x35, 0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80,
+                        0x0c, 0x1e, 0xda, 0x5c, 0xc0, 0x94, 0xa1, 0xc7, 0xa8, 0x88, 0x64, 0x9d, 0x25, 0xfa, 0xee, 0xbd,
+                        0x60, 0xda, 0xe6, 0x07, 0x3d, 0x57, 0xd8, 0xae, 0x8d, 0x45, 0x5f, 0x4f, 0x13, 0x92, 0xc0, 0x74,
+                        0xe2, 0x6a, 0xc6, 0x69, 0xbd, 0xee, 0xc2, 0x34, 0x62, 0xb9, 0x62, 0x95, 0x2c, 0xc6, 0xe9, 0xeb,
                 },
         },
         // Testcase #2
         {
-                Zpk: []byte{
+                Zprv: []byte{
                         0x50, 0xd7, 0xb6, 0x52, 0xa4, 0xef, 0xea, 0xdf, 0xf3, 0x73, 0x96, 0x90, 0x97, 0x85, 0xe5, 0x95,
                         0x21, 0x71, 0xa0, 0x21, 0x78, 0xc8, 0xe7, 0xd4, 0x50, 0xfa, 0x90, 0x79, 0x25, 0xfa, 0xfd, 0x98,
                 },
@@ -124,6 +139,14 @@ var tests = []*TestCase{
                 },
                 Ztld:  "000G0037FH3QTBCK15Y8BCCNRVWPV17ZC7TSGB1C9ZG2TPGHZVFV1GMG3W",
                 Label: "天下無敵",
+                Dzprv: []byte{
+                        0x0a, 0xbe, 0x56, 0xd6, 0x80, 0x68, 0xab, 0x40, 0xe1, 0x44, 0x79, 0x0c, 0xde, 0x9a, 0xcf, 0x4d,
+                        0x78, 0x7f, 0x2d, 0x3c, 0x63, 0xb8, 0x53, 0x05, 0x74, 0x6e, 0x68, 0x03, 0x32, 0x15, 0xf2, 0xab,
+                },
+                Dzpub: []byte{
+                        0xa5, 0x12, 0x96, 0xdf, 0x75, 0x7e, 0xe2, 0x75, 0xca, 0x11, 0x8d, 0x4f, 0x07, 0xfa, 0x7a, 0xae,
+                        0x55, 0x08, 0xbc, 0xf5, 0x12, 0xaa, 0x41, 0x12, 0x14, 0x29, 0xd4, 0xa0, 0xde, 0x9d, 0x05, 0x7e,
+                },
                 Q: []byte{
                         0xaf, 0xf0, 0xad, 0x6a, 0x44, 0x09, 0x73, 0x68, 0x42, 0x9a, 0xc4, 0x76, 0xdf, 0xa1, 0xf3, 0x4b,
                         0xee, 0x4c, 0x36, 0xe7, 0x47, 0x6d, 0x07, 0xaa, 0x64, 0x63, 0xff, 0x20, 0x91, 0x5b, 0x10, 0x05,
@@ -132,21 +155,21 @@ var tests = []*TestCase{
                 },
                 Recs: []*Rec{
                         {
-                                Expire: []byte{0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80},
+                                Expire: []byte{0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80},
                                 Size:   []byte{0x00, 0x10},
                                 Type:   []byte{0x00, 0x00, 0x00, 0x1c},
                                 Flags:  []byte{0x00, 0x00},
                                 Data:   []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xad, 0xbe, 0xef},
                         },
                         {
-                                Expire: []byte{0x00, 0xb0, 0x0f, 0x81, 0xb7, 0x44, 0x9b, 0x40},
+                                Expire: []byte{0x00, 0x3f, 0xf2, 0xab, 0x2a, 0x9c, 0x7f, 0x40},
                                 Size:   []byte{0x00, 0x06},
                                 Type:   []byte{0x00, 0x01, 0x00, 0x01},
-                                Flags:  []byte{0x80, 0x00},
+                                Flags:  []byte{0x00, 0x00},
                                 Data:   []byte{0xe6, 0x84, 0x9b, 0xe7, 0xa7, 0xb0},
                         },
                         {
-                                Expire: []byte{0x00, 0x98, 0xd7, 0xff, 0x80, 0x4a, 0x39, 0x40},
+                                Expire: []byte{0x00, 0x28, 0xbb, 0x14, 0xd5, 0xca, 0xbd, 0x40},
                                 Size:   []byte{0x00, 0x0b},
                                 Type:   []byte{0x00, 0x00, 0x00, 0x10},
                                 Flags:  []byte{0x00, 0x04},
@@ -154,10 +177,10 @@ var tests = []*TestCase{
                         },
                 },
                 Rdata: []byte{
-                        0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
+                        0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c,
                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xad, 0xbe, 0xef,
-                        0x00, 0xb0, 0x0f, 0x81, 0xb7, 0x44, 0x9b, 0x40, 0x00, 0x06, 0x80, 0x00, 0x00, 0x01, 0x00, 0x01,
-                        0xe6, 0x84, 0x9b, 0xe7, 0xa7, 0xb0, 0x00, 0x98, 0xd7, 0xff, 0x80, 0x4a, 0x39, 0x40, 0x00, 0x0b,
+                        0x00, 0x3f, 0xf2, 0xab, 0x2a, 0x9c, 0x7f, 0x40, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+                        0xe6, 0x84, 0x9b, 0xe7, 0xa7, 0xb0, 0x00, 0x28, 0xbb, 0x14, 0xd5, 0xca, 0xbd, 0x40, 0x00, 0x0b,
                         0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x57, 0x6f, 0x72, 0x6c,
                         0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -165,7 +188,7 @@ var tests = []*TestCase{
                 },
                 Enc: &Enc{
                         Nonce:   []byte{0xee, 0x96, 0x33, 0xc1},
-                        Expire:  []byte{0x00, 0x08, 0xc0, 0x6f, 0xb9, 0x28, 0x15, 0x80},
+                        Expire:  []byte{0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80},
                         Counter: []byte{0x00, 0x00, 0x00, 0x01},
                         Key: []byte{
                                 0xfb, 0x3a, 0xb5, 0xde, 0x23, 0xbd, 0xda, 0xe1, 0x99, 0x7a, 0xaf, 0x7b, 0x92, 0xc2, 0xd2, 0x71,
@@ -173,36 +196,36 @@ var tests = []*TestCase{
                         },
                 },
                 Bdata: []byte{
-                        0xa1, 0xf9, 0x4f, 0x65, 0xc7, 0x20, 0x2b, 0x86, 0x2b, 0x75, 0x0d, 0x89, 0x53, 0x1c, 0x66, 0x5d,
-                        0x1b, 0x7f, 0x5e, 0x90, 0x92, 0x9b, 0xd8, 0xa4, 0xd9, 0x24, 0xe6, 0x52, 0x5d, 0xbd, 0x6b, 0x2f,
-                        0x81, 0x8c, 0x43, 0xb2, 0x2e, 0x2a, 0xc7, 0x08, 0x2b, 0x6e, 0x69, 0x60, 0x27, 0x6f, 0x41, 0xca,
-                        0xcf, 0x0b, 0x27, 0xb2, 0x50, 0x2b, 0x58, 0x90, 0xc8, 0x03, 0x9e, 0xb6, 0xb5, 0x74, 0x22, 0x06,
-                        0x88, 0xd5, 0x43, 0xb4, 0xf4, 0x51, 0x9f, 0x4a, 0xc4, 0x76, 0xd2, 0xa5, 0x77, 0xe9, 0xbd, 0x59,
-                        0xd6, 0xf4, 0x72, 0xbc, 0x93, 0xa2, 0xfe, 0x66, 0x16, 0x11, 0x75, 0x9c, 0xca, 0xf2, 0xd6, 0x72,
-                        0x60, 0xc1, 0xdb, 0x4a, 0x03, 0x53, 0x1b, 0x86, 0x7d, 0xfa, 0x35, 0xf7, 0xbc, 0x30, 0x02, 0xb8,
-                        0xf4, 0x00, 0x0e, 0x4e, 0x7c, 0x7d, 0x91, 0x7a, 0xd2, 0x29, 0xf7, 0x9b, 0x2a, 0xee, 0xe3, 0xf1,
+                        0xd8, 0xc2, 0x8d, 0x2f, 0xd6, 0x96, 0x7d, 0x1a, 0xb7, 0x22, 0x53, 0xf2, 0x10, 0x98, 0xb8, 0x14,
+                        0xa4, 0x10, 0xbe, 0x1f, 0x59, 0x98, 0xde, 0x03, 0xf5, 0x8f, 0x7e, 0x7c, 0xdb, 0x7f, 0x08, 0xa6,
+                        0x16, 0x51, 0xbe, 0x4c, 0x75, 0xfb, 0x2e, 0x61, 0xdf, 0x15, 0x30, 0x44, 0x0b, 0xd7, 0x47, 0xdc,
+                        0xf0, 0xd7, 0x10, 0x4f, 0x6b, 0x8d, 0x24, 0xc2, 0xac, 0x9c, 0xeb, 0xc0, 0x38, 0x6f, 0xe8, 0x29,
+                        0x05, 0x25, 0xd2, 0xa6, 0xd0, 0xf8, 0x84, 0x42, 0x67, 0xa1, 0x57, 0x0e, 0x8e, 0x29, 0x4d, 0xc9,
+                        0x3a, 0x31, 0x9f, 0xcf, 0xc0, 0x3e, 0xa2, 0x70, 0x17, 0xd6, 0xfd, 0xa3, 0x47, 0xb4, 0xa7, 0x94,
+                        0x97, 0xd7, 0xf6, 0xb1, 0x42, 0x2d, 0x4e, 0xdd, 0x82, 0x1c, 0x19, 0x93, 0x4e, 0x96, 0xc1, 0xaa,
+                        0x87, 0x76, 0x57, 0x25, 0xd4, 0x94, 0xc7, 0x64, 0xb1, 0x55, 0xdc, 0x6d, 0x13, 0x26, 0x91, 0x74,
                 },
                 RRblock: []byte{
                         0x00, 0x00, 0x00, 0xf0, 0x00, 0x01, 0x00, 0x00, 0xa5, 0x12, 0x96, 0xdf, 0x75, 0x7e, 0xe2, 0x75,
                         0xca, 0x11, 0x8d, 0x4f, 0x07, 0xfa, 0x7a, 0xae, 0x55, 0x08, 0xbc, 0xf5, 0x12, 0xaa, 0x41, 0x12,
-                        0x14, 0x29, 0xd4, 0xa0, 0xde, 0x9d, 0x05, 0x7e, 0x05, 0xc0, 0x95, 0x04, 0x0b, 0x10, 0xc7, 0xf8,
-                        0x18, 0x7a, 0xa5, 0xda, 0x12, 0x28, 0x7d, 0x1c, 0x29, 0x10, 0xff, 0x04, 0xd6, 0xf5, 0x0a, 0xf1,
-                        0xfa, 0x95, 0x38, 0x2e, 0x9f, 0x00, 0x7f, 0x75, 0x09, 0x8f, 0x62, 0x0d, 0x1f, 0xf7, 0xc9, 0x71,
-                        0x28, 0xf4, 0x0d, 0x74, 0x58, 0xa2, 0xd3, 0xc7, 0xf0, 0x48, 0xca, 0x38, 0x20, 0x06, 0x4b, 0xdd,
-                        0xee, 0x94, 0x13, 0xe9, 0x54, 0x8e, 0xc9, 0x94, 0x00, 0x05, 0xdb, 0x3b, 0xcd, 0xbd, 0x61, 0x7c,
-                        0xa1, 0xf9, 0x4f, 0x65, 0xc7, 0x20, 0x2b, 0x86, 0x2b, 0x75, 0x0d, 0x89, 0x53, 0x1c, 0x66, 0x5d,
-                        0x1b, 0x7f, 0x5e, 0x90, 0x92, 0x9b, 0xd8, 0xa4, 0xd9, 0x24, 0xe6, 0x52, 0x5d, 0xbd, 0x6b, 0x2f,
-                        0x81, 0x8c, 0x43, 0xb2, 0x2e, 0x2a, 0xc7, 0x08, 0x2b, 0x6e, 0x69, 0x60, 0x27, 0x6f, 0x41, 0xca,
-                        0xcf, 0x0b, 0x27, 0xb2, 0x50, 0x2b, 0x58, 0x90, 0xc8, 0x03, 0x9e, 0xb6, 0xb5, 0x74, 0x22, 0x06,
-                        0x88, 0xd5, 0x43, 0xb4, 0xf4, 0x51, 0x9f, 0x4a, 0xc4, 0x76, 0xd2, 0xa5, 0x77, 0xe9, 0xbd, 0x59,
-                        0xd6, 0xf4, 0x72, 0xbc, 0x93, 0xa2, 0xfe, 0x66, 0x16, 0x11, 0x75, 0x9c, 0xca, 0xf2, 0xd6, 0x72,
-                        0x60, 0xc1, 0xdb, 0x4a, 0x03, 0x53, 0x1b, 0x86, 0x7d, 0xfa, 0x35, 0xf7, 0xbc, 0x30, 0x02, 0xb8,
-                        0xf4, 0x00, 0x0e, 0x4e, 0x7c, 0x7d, 0x91, 0x7a, 0xd2, 0x29, 0xf7, 0x9b, 0x2a, 0xee, 0xe3, 0xf1,
+                        0x14, 0x29, 0xd4, 0xa0, 0xde, 0x9d, 0x05, 0x7e, 0x08, 0x2f, 0xfa, 0xa1, 0x83, 0x71, 0xdc, 0x82,
+                        0x91, 0x9d, 0x5e, 0xd4, 0xd4, 0x91, 0xae, 0x65, 0xcd, 0x09, 0x2f, 0x61, 0xa7, 0x26, 0xa9, 0xee,
+                        0x29, 0xb2, 0x1a, 0xfe, 0x5f, 0xdd, 0x96, 0x29, 0x0c, 0xfc, 0xb9, 0x12, 0xad, 0xe6, 0x7f, 0x3a,
+                        0x75, 0x92, 0x4f, 0x17, 0x4d, 0xb0, 0x34, 0xdf, 0x00, 0x70, 0xfb, 0xf8, 0x13, 0x96, 0xef, 0xee,
+                        0x19, 0xb9, 0xcd, 0x80, 0x21, 0x06, 0x3e, 0x35, 0x00, 0x1c, 0xee, 0x8c, 0x10, 0xe2, 0x59, 0x80,
+                        0xd8, 0xc2, 0x8d, 0x2f, 0xd6, 0x96, 0x7d, 0x1a, 0xb7, 0x22, 0x53, 0xf2, 0x10, 0x98, 0xb8, 0x14,
+                        0xa4, 0x10, 0xbe, 0x1f, 0x59, 0x98, 0xde, 0x03, 0xf5, 0x8f, 0x7e, 0x7c, 0xdb, 0x7f, 0x08, 0xa6,
+                        0x16, 0x51, 0xbe, 0x4c, 0x75, 0xfb, 0x2e, 0x61, 0xdf, 0x15, 0x30, 0x44, 0x0b, 0xd7, 0x47, 0xdc,
+                        0xf0, 0xd7, 0x10, 0x4f, 0x6b, 0x8d, 0x24, 0xc2, 0xac, 0x9c, 0xeb, 0xc0, 0x38, 0x6f, 0xe8, 0x29,
+                        0x05, 0x25, 0xd2, 0xa6, 0xd0, 0xf8, 0x84, 0x42, 0x67, 0xa1, 0x57, 0x0e, 0x8e, 0x29, 0x4d, 0xc9,
+                        0x3a, 0x31, 0x9f, 0xcf, 0xc0, 0x3e, 0xa2, 0x70, 0x17, 0xd6, 0xfd, 0xa3, 0x47, 0xb4, 0xa7, 0x94,
+                        0x97, 0xd7, 0xf6, 0xb1, 0x42, 0x2d, 0x4e, 0xdd, 0x82, 0x1c, 0x19, 0x93, 0x4e, 0x96, 0xc1, 0xaa,
+                        0x87, 0x76, 0x57, 0x25, 0xd4, 0x94, 0xc7, 0x64, 0xb1, 0x55, 0xdc, 0x6d, 0x13, 0x26, 0x91, 0x74,
                 },
         },
         // Testcase #3
         {
-                Zpk: []byte{
+                Zprv: []byte{
                         0x5a, 0xf7, 0x02, 0x0e, 0xe1, 0x91, 0x60, 0x32, 0x88, 0x32, 0x35, 0x2b, 0xbc, 0x6a, 0x68, 0xa8,
                         0xd7, 0x1a, 0x7c, 0xbe, 0x1b, 0x92, 0x99, 0x69, 0xa7, 0xc6, 0x6d, 0x41, 0x5a, 0x0d, 0x8f, 0x65,
                 },
@@ -213,6 +236,14 @@ var tests = []*TestCase{
                 },
                 Ztld:  "000G051WYJWJ80S04BRDRM2R2H9VGQCKP13VCFA4DHC4BJT88HEXQ5K8HW",
                 Label: "testdelegation",
+                Dzprv: []byte{
+                        0x0b, 0x1b, 0x29, 0xd4, 0x23, 0x0b, 0x10, 0xa8, 0xec, 0x4d, 0xa3, 0xc8, 0x6e, 0xdb, 0x88, 0xea,
+                        0x8e, 0xb7, 0x1a, 0xc0, 0x34, 0xf4, 0x8d, 0x74, 0xa1, 0xa0, 0x16, 0x2d, 0xb4, 0x4e, 0x47, 0xd1,
+                },
+                Dzpub: []byte{
+                        0x9b, 0xf2, 0x33, 0x19, 0x8c, 0x6d, 0x53, 0xbb, 0xdb, 0xac, 0x49, 0x5c, 0xab, 0xd9, 0x10, 0x49,
+                        0xa6, 0x84, 0xaf, 0x3f, 0x40, 0x51, 0xba, 0xca, 0xb0, 0xdc, 0xf2, 0x1c, 0x8c, 0xf2, 0x7a, 0x1a,
+                },
                 Q: []byte{
                         0xab, 0xaa, 0xba, 0xc0, 0xe1, 0x24, 0x94, 0x59, 0x75, 0x98, 0x83, 0x95, 0xaa, 0xc0, 0x24, 0x1e,
                         0x55, 0x59, 0xc4, 0x1c, 0x40, 0x74, 0xe2, 0x55, 0x7b, 0x9f, 0xe6, 0xd1, 0x54, 0xb6, 0x14, 0xfb,
@@ -269,7 +300,7 @@ var tests = []*TestCase{
         },
         // Testcase #4
         {
-                Zpk: []byte{
+                Zprv: []byte{
                         0x5a, 0xf7, 0x02, 0x0e, 0xe1, 0x91, 0x60, 0x32, 0x88, 0x32, 0x35, 0x2b, 0xbc, 0x6a, 0x68, 0xa8,
                         0xd7, 0x1a, 0x7c, 0xbe, 0x1b, 0x92, 0x99, 0x69, 0xa7, 0xc6, 0x6d, 0x41, 0x5a, 0x0d, 0x8f, 0x65,
                 },
@@ -280,6 +311,14 @@ var tests = []*TestCase{
                 },
                 Ztld:  "000G051WYJWJ80S04BRDRM2R2H9VGQCKP13VCFA4DHC4BJT88HEXQ5K8HW",
                 Label: "天下無敵",
+                Dzprv: []byte{
+                        0x07, 0xc0, 0x68, 0xa6, 0xc3, 0xf7, 0x20, 0xde, 0x0e, 0x1b, 0x69, 0xff, 0x3f, 0x53, 0xe0, 0x5d,
+                        0x2b, 0x06, 0xcb, 0xd1, 0xae, 0x2d, 0xdd, 0xb3, 0x4e, 0x29, 0xb7, 0xb8, 0xfd, 0xce, 0x61, 0x6b,
+                },
+                Dzpub: []byte{
+                        0x74, 0xf9, 0x00, 0x68, 0xf1, 0x67, 0x69, 0x53, 0x52, 0xa8, 0xa6, 0xc2, 0xeb, 0x98, 0x48, 0x98,
+                        0xc5, 0x3a, 0xcc, 0xa0, 0x98, 0x04, 0x70, 0xc6, 0xc8, 0x12, 0x64, 0xcb, 0xdd, 0x78, 0xad, 0x11,
+                },
                 Q: []byte{
                         0xba, 0xf8, 0x21, 0x77, 0xee, 0xc0, 0x81, 0xe0, 0x74, 0xa7, 0xda, 0x47, 0xff, 0xc6, 0x48, 0x77,
                         0x58, 0xfb, 0x0d, 0xf0, 0x1a, 0x6c, 0x7f, 0xbb, 0x52, 0xfc, 0x8a, 0x31, 0xbe, 0xf0, 0x29, 0xaf,
diff --git a/src/gnunet/service/gns/rfc_test.go b/src/gnunet/service/gns/rfc_test.go
index e42d5ad..c18240e 100644
--- a/src/gnunet/service/gns/rfc_test.go
+++ b/src/gnunet/service/gns/rfc_test.go
@@ -29,6 +29,8 @@ import (
         "gnunet/util"
         "strings"
         "testing"
+
+        "github.com/bfix/gospel/math"
 )
 
 func TestRFCDump(t *testing.T) {
@@ -41,7 +43,7 @@ func TestRFCDump(t *testing.T) {
                         endian = ", big-endian"
                 }
                 fmt.Printf("Zone private key (d%s):\n", endian)
-                dumpHex("    ", tc.Zpk)
+                dumpHex("    ", tc.Zprv)
 
                 fmt.Println("\n\nZone identifier {")
                 dumpHex("    ZTYPE: ", tc.Zid[:4])
@@ -111,13 +113,13 @@ func TestRecordsRFC(t *testing.T) {
                 fmt.Printf("   ztype = %08x (%d)\n", uint32(ztype), ztype)
 
                 // generate private zone key
-                zprv, err := crypto.NewZonePrivate(ztype, tc.Zpk)
+                zprv, err := crypto.NewZonePrivate(ztype, tc.Zprv)
                 if err != nil {
                         t.Log("Failed: " + err.Error())
                         t.Fail()
                         continue
                 }
-                fmt.Printf("   zprv = %s\n", hex.EncodeToString(zprv.Bytes()))
+                fmt.Printf("   zprv = %s\n", hex.EncodeToString(zprv.Bytes()[32:]))
 
                 // generate zone key (public)
                 zkey := zprv.Public()
@@ -136,19 +138,45 @@ func TestRecordsRFC(t *testing.T) {
                         continue
                 }
 
-                // derive zone key for given label and compute storage key 'q'
-                pd, _, err := zkey.Derive(tc.Label, blocks.GNSContext)
+                // derive zone keys for given label
+                dzprv, _, err := zprv.Derive(tc.Label, blocks.GNSContext)
                 if err != nil {
-                        t.Log("Failed: " + err.Error())
+                        t.Log("Failed dzprv: " + err.Error())
                         t.Fail()
                         continue
                 }
-                pdb := pd.KeyData // pd.Bytes()
-                q := crypto.Hash(pdb).Data
+                fmt.Printf("   dzprv = %s\n", hex.EncodeToString(dzprv.Bytes()[32:]))
+                d1 := dzprv.Bytes()[32:]
+                if !bytes.Equal(d1, tc.Dzprv) {
+                        t.Log("dzprv mismatch")
+                        t.Fail()
+
+                }
+                dzpub, _, err := zkey.Derive(tc.Label, blocks.GNSContext)
+                if err != nil {
+                        t.Log("Failed dzpub: " + err.Error())
+                        t.Fail()
+                }
+                fmt.Printf("   dzpub = %s\n", hex.EncodeToString(dzpub.KeyData))
+                if !bytes.Equal(dzpub.KeyData, tc.Dzpub) {
+                        t.Log("dzpub mismatch")
+                        t.Fail()
+                        continue
+                }
+
+                // double-check and verify derivation
+                if !dzpub.Equal(dzprv.Public()) {
+                        t.Log("bad derived key")
+                        t.Fail()
+                        continue
+                }
+
+                // compute storage key 'q'
+                q := crypto.Hash(dzpub.KeyData).Data
                 fmt.Printf("   Q = %s\n", hex.EncodeToString(q))
                 if !bytes.Equal(q, tc.Q) {
                         fmt.Printf("    != %s\n", hex.EncodeToString(tc.Q))
-                        fmt.Printf("   pd = %s\n", hex.EncodeToString(pdb))
+                        fmt.Printf("   pd = %s\n", hex.EncodeToString(dzpub.KeyData))
                         t.Log("Failed: storage key mismatch")
                         t.Fail()
                 }
@@ -233,8 +261,11 @@ func TestRecordsRFC(t *testing.T) {
                 blk := blocks.NewGNSBlock().(*blocks.GNSBlock)
                 blk.Prepare(enums.BLOCK_TYPE_GNS_NAMERECORD, expires)
                 blk.SetData(bdata)
-                dsk, _, _ := zprv.Derive(tc.Label, "gns")
-                blk.Sign(dsk)
+
+                // sign the block
+                blk.Sign(dzprv)
+
+                // check resulting RRBLOCK
                 rrblock := blk.RRBLOCK()
                 if !bytes.Equal(rrblock, tc.RRblock) {
                         fmt.Printf("rrblock = %s\n", hex.EncodeToString(rrblock))
@@ -242,16 +273,79 @@ func TestRecordsRFC(t *testing.T) {
                         t.Log("RRblock mismatch")
 
                         // PKEY/ECDSA signatures are currently not identical with
-                        // GNUnet produced signature, so ignore any failures.
+                        // GNUnet produced signatures, so ignore any failures.
                         if ztype != enums.GNS_TYPE_PKEY {
                                 t.Fail()
                         }
+
+                        // check signatures
+                        if ok, err := blk.Verify(); !ok || err != nil {
+                                t.Fatal("FAILED: sig")
+                        }
+                        sd := blk.DerivedKeySig.Signature
+                        r := math.NewIntFromBytes(sd[:32])
+                        s := math.NewIntFromBytes(sd[32:])
+                        fmt.Printf("*** r = %s\n", hex.EncodeToString(r.Bytes()))
+                        fmt.Printf("*** s = %s\n", hex.EncodeToString(s.Bytes()))
+
+                        BLK := blocks.NewGNSBlock().(*blocks.GNSBlock)
+                        BLK.Prepare(enums.BLOCK_TYPE_GNS_NAMERECORD, expires)
+                        BLK.SetData(bdata)
+                        BLK.DerivedKeySig, err = crypto.NewZoneSignature(tc.RRblock[4:104])
+                        SD := BLK.DerivedKeySig.Signature
+                        R := math.NewIntFromBytes(SD[:32])
+                        S := math.NewIntFromBytes(SD[32:])
+                        fmt.Printf("*** R = %s\n", hex.EncodeToString(R.Bytes()))
+                        fmt.Printf("*** S = %s\n", hex.EncodeToString(S.Bytes()))
+
+                        if ok, err := BLK.Verify(); !ok || err != nil {
+                                t.Fatal("FAILED: SIG")
+                        }
+
                         continue
                 }
                 fmt.Println("   ----- passed -----")
         }
 }
 
+func TestSigGcrypt(t *testing.T) {
+        tc := tests[0]
+
+        // Zonekey type
+        var ztype enums.GNSType
+        rdInt(tc.Zid, &ztype)
+        fmt.Printf("   ztype = %08x (%d)\n", uint32(ztype), ztype)
+
+        // generate private zone key
+        zprv, err := crypto.NewZonePrivate(ztype, tc.Zprv)
+        if err != nil {
+                t.Fatal("Failed: " + err.Error())
+        }
+        fmt.Printf("   zprv = %s\n", hex.EncodeToString(zprv.Bytes()))
+
+        // generate signature
+        tsig, _ := zprv.Sign([]byte("sample"))
+
+        // test result
+        R := []byte{
+                0x03, 0xfb, 0xaf, 0xa1, 0x40, 0xd0, 0x11, 0x12, 0x45, 0xa1, 0xa7, 0x38, 0x45, 0x77, 0x81, 0x66,
+                0x4c, 0x73, 0x7f, 0x97, 0x4d, 0x53, 0x6a, 0x17, 0xf7, 0xc4, 0x9a, 0x19, 0xa4, 0x01, 0xaf, 0xd7,
+        }
+        S := []byte{
+                0x0c, 0x42, 0xe7, 0xde, 0xbe, 0xa9, 0xeb, 0x5c, 0x9f, 0x4a, 0x30, 0xb8, 0x23, 0x22, 0xa9, 0xb2,
+                0xdf, 0x37, 0x0a, 0x7d, 0xe6, 0xea, 0xa7, 0x17, 0x1c, 0x90, 0xba, 0xa1, 0x0e, 0x6e, 0x15, 0x29,
+        }
+        buf := tsig.Bytes()
+        t.Log("r = " + hex.EncodeToString(buf[:32]))
+        t.Log("s = " + hex.EncodeToString(buf[32:]))
+        if !bytes.Equal(buf[:32], R) {
+                t.Fatal("Failed: R mismatch")
+        }
+        if !bytes.Equal(buf[32:], S) {
+                t.Fatal("Failed: S mismatch")
+        }
+}
+
 func rdInt(data []byte, v any) {
         _ = binary.Read(bytes.NewReader(data), binary.BigEndian, v)
 }