update code to latest go

[epoint] / cmd / epoint-server / epoint-server.go

diff --git a/cmd/epoint-server/epoint-server.go b/cmd/epoint-server/epoint-server.go
index cf29fa7..6e3bccd 100644 (file)
--- a/cmd/epoint-server/epoint-server.go
+++ b/cmd/epoint-server/epoint-server.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-       "crypto/openpgp"
        "epoint/key"
        "epoint/server"
        "fmt"
@@ -18,25 +17,6 @@ const (
 
 // todo: http header limit: 64K, body limit: 64K
 
-// TODO: generate
-func initkey() (sk *openpgp.Entity, err error) {
-       f, err := os.Open(seckey)
-       if err != nil {
-               return
-       }
-       keys, err := openpgp.ReadKeyRing(f)
-       if err != nil {
-               f.Close()
-               return
-       }
-       err = f.Close()
-       if err != nil {
-               return
-       }
-       sk = keys[0]
-       return
-}
-
 func httpError(w http.ResponseWriter, code int, msg string) {
        log.Printf("error: %d %s", code, msg)
        http.Error(w, fmt.Sprintf("%d %s\n\n%s\n", code, http.StatusText(code), msg), code)
@@ -54,12 +34,12 @@ func httpReq(r *http.Request) string {
                }
                form = fmt.Sprintf("%v", a)
        }
-       return fmt.Sprintf("%s %s params:%s", r.Method, r.URL.Raw, form)
+       return fmt.Sprintf("%s %s params:%s", r.Method, r.URL, form)
 }
 
 func defaultHandler(w http.ResponseWriter, r *http.Request) {
        log.Printf("%s %s", r.RemoteAddr, httpReq(r))
-       fmt.Fprintf(w, "not implemented: %s %s\n", r.Method, r.URL.Raw)
+       fmt.Fprintf(w, "not implemented: %s %s\n", r.Method, r.URL)
 }
 
 func submitHandler(w http.ResponseWriter, r *http.Request) {
@@ -99,7 +79,8 @@ func submitHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-       serverkey, err := initkey()
+       // TODO: serious keygen
+       serverkey, err := key.Server([]byte("secret seed"))
        if err != nil {
                log.Fatal(err)
        }