diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-13 23:08:30 +0800 |
| commit | 5c251b69282b3992512d0c17ed0063f294a0e663 (patch) | |
| tree | 7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /crypto/key.go | |
| parent | 75d164037fb9bbf75def7c5501727fd634ef124f (diff) | |
| parent | bde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff) | |
| download | go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.bz2 go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.lz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.xz go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.zip | |
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'crypto/key.go')
| -rw-r--r-- | crypto/key.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/key.go b/crypto/key.go index b9ad34f47..ec4908c30 100644 --- a/crypto/key.go +++ b/crypto/key.go @@ -25,11 +25,12 @@ package crypto import ( "bytes" - "code.google.com/p/go-uuid/uuid" "crypto/ecdsa" "crypto/elliptic" "encoding/json" "io" + + "code.google.com/p/go-uuid/uuid" ) type Key struct { |