From 9bfa633187cf0d3af72247594ce52543555e49f1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 23 Jan 2016 23:48:19 +0100 Subject: [PATCH] repository/key: Use Load() instead of GetReader() --- repository/key.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/repository/key.go b/repository/key.go index ea8fbd4c7..78665513b 100644 --- a/repository/key.go +++ b/repository/key.go @@ -119,17 +119,14 @@ func SearchKey(s *Repository, password string) (*Key, error) { // LoadKey loads a key from the backend. func LoadKey(s *Repository, name string) (k *Key, err error) { - // extract data from repo - rd, err := s.be.GetReader(backend.Key, name, 0, 0) + h := backend.Handle{Type: backend.Key, Name: name} + data, err := backend.LoadAll(s.be, h, nil) if err != nil { return nil, err } - defer closeOrErr(rd, &err) - // restore json - dec := json.NewDecoder(rd) - k = new(Key) - err = dec.Decode(k) + k = &Key{} + err = json.Unmarshal(data, k) if err != nil { return nil, err }