update server and genkey according to new key pkg

diff --git a/cmd/genkey/genkey.go b/cmd/genkey/genkey.go
index 7f3c518..58237b2 100644 (file)
--- a/cmd/genkey/genkey.go
+++ b/cmd/genkey/genkey.go
@@ -86,9 +86,9 @@ func main() {
        }
        var e *openpgp.Entity
        if isIssuer {
-               e, err = key.NewIssuerEntity(b[:n], denom)
+               e, err = key.Issuer(b[:n], denom)
        } else {
-               e, err = key.NewHolderEntity(b[:n], issuer, denom)
+               e, err = key.Holder(b[:n], issuer, denom)
        }
        if err != nil {
                log.Fatal(err)

diff --git a/pkg/key/key.go b/pkg/key/key.go
index 37f2c63..f5f9143 100644 (file)
--- a/pkg/key/key.go
+++ b/pkg/key/key.go
@@ -29,6 +29,7 @@ import (
 
 // TODO: keep denomination only in issuer key?
 // TODO: cleanup
+// TODO: server key
 
 const P = "A4D2B9575C25F0E622B8694387128A793E1AD27D12FFF4B5BA11A37CEFD31C935BCBB0A944581A6E6DA12986FCBA9D666607D71D365C286B9BCB57F6D938BE74982B7D770CE438F03B0A20ABA02E5691458C39D96E6E86AE564176ED1A6DFBAFB6EE7674CC5EDCF9FEB6158471FB3FAB53BA1CE1BA64C5626B9E8585FCEF5D31"
 const Q = "FFFFFFFFFFFFFFFFFFFF254EAF9E7916D607AAAF"

diff --git a/pkg/server/server.go b/pkg/server/server.go
index 5d9af8e..71bd3fc 100644 (file)
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -52,7 +52,7 @@ func AddKeys(d []byte) (err error) {
        }
        for _, e := range entities {
                // TODO: various checks..
-               isIssuer, issuer, denom, err1 := key.CheckEntity(e)
+               isIssuer, issuer, denom, err1 := key.Check(e)
                err = err1
                if err != nil {
                        // TODO..
@@ -64,7 +64,7 @@ func AddKeys(d []byte) (err error) {
                                // TODO..
                                continue
                        }
-                       ok, _, den, err := key.CheckEntity(es[0])
+                       ok, _, den, err := key.Check(es[0])
                        if !ok || err != nil || den != denom {
                                // TODO..
                                continue
@@ -146,7 +146,7 @@ func ParseDraft(d []byte) (draft *document.Draft, draftid string, err error) {
        if err != nil {
                return
        }
-       _, issuer, denom, err := key.CheckEntity(kr[0])
+       _, issuer, denom, err := key.Check(kr[0])
        if err != nil {
                return
        }
@@ -159,7 +159,7 @@ func ParseDraft(d []byte) (draft *document.Draft, draftid string, err error) {
                // internal error: pubkey cannot be parsed
                return
        }
-       _, issuer2, denom2, err := key.CheckEntity(kr[0])
+       _, issuer2, denom2, err := key.Check(kr[0])
        if err != nil {
                return
        }