projects
/
epoint
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update the codebase to latest go src (time, hash, strconv)
[epoint]
/
pkg
/
document
/
document.go
diff --git
a/pkg/document/document.go
b/pkg/document/document.go
index
eecd68a
..
3deaef2
100644
(file)
--- a/
pkg/document/document.go
+++ b/
pkg/document/document.go
@@
-207,7
+207,7
@@
func cleanBody(s []byte) []byte {
func Id(c *Signed) string {
h := sha1.New()
h.Write(c.Body)
func Id(c *Signed) string {
h := sha1.New()
h.Write(c.Body)
- return fmt.Sprintf("%040X", h.Sum())
+ return fmt.Sprintf("%040X", h.Sum(
nil
))
}
// Parse an epoint document without checking the signature and format details
}
// Parse an epoint document without checking the signature and format details
@@
-243,12
+243,10
@@
func Format(iv interface{}, key *openpgp.Entity) (s []byte, c *Signed, err error
}
// Verify an epoint document, return the cleaned version as well
}
// Verify an epoint document, return the cleaned version as well
-func Verify(c *Signed, key openpgp.KeyRing) (err error) {
+func Verify(c *Signed, key
s
openpgp.KeyRing) (err error) {
msg := bytes.NewBuffer(c.Body)
sig := bytes.NewBuffer(c.Signature)
msg := bytes.NewBuffer(c.Body)
sig := bytes.NewBuffer(c.Signature)
- // TODO: verify signature
- _, _ = msg, sig
- // _, err = openpgp.CheckArmoredDetachedSignature(key, msg, sig)
+ _, err = openpgp.CheckArmoredDetachedSignature(keys, msg, sig)
return
}
return
}
@@
-471,7
+469,7
@@
func parseStruct(v reflect.Value, fields map[string]string, seen map[string]bool
fv.SetString(val)
case "int":
var val int64
fv.SetString(val)
case "int":
var val int64
- val, err = strconv.
Atoi64(s
)
+ val, err = strconv.
ParseInt(s, 10, 64
)
fv.SetInt(val)
case "date":
var val int64
fv.SetInt(val)
case "date":
var val int64
@@
-561,7
+559,7
@@
func formatStruct(v reflect.Value, doc *Document) (err error) {
case "text":
val = formatString(fv.String())
case "int":
case "text":
val = formatString(fv.String())
case "int":
- val = strconv.
Itoa64(fv.Int()
)
+ val = strconv.
FormatInt(fv.Int(), 10
)
case "date":
val = formatDate(fv.Int())
case "ids":
case "date":
val = formatDate(fv.Int())
case "ids":
@@
-677,11
+675,11
@@
func parseDate(s string) (int64, error) {
if err != nil {
return 0, err
}
if err != nil {
return 0, err
}
- return t.
Seconds
(), nil
+ return t.
Unix
(), nil
}
func formatDate(i int64) string {
}
func formatDate(i int64) string {
- return time.
SecondsToUTC(i
).Format(time.RFC3339)
+ return time.
Unix(i,0
).Format(time.RFC3339)
}
func getLine(data []byte) (line, rest []byte) {
}
func getLine(data []byte) (line, rest []byte) {