mirror of
https://github.com/restic/restic.git
synced 2024-12-25 17:27:25 +00:00
Merge pull request #1228 from restic/fix-1204-3
Always use long name for keys
This commit is contained in:
commit
c1a02cc081
1 changed files with 3 additions and 3 deletions
|
@ -66,7 +66,7 @@ func createMasterKey(s *Repository, password string) (*Key, error) {
|
||||||
func OpenKey(ctx context.Context, s *Repository, name string, password string) (*Key, error) {
|
func OpenKey(ctx context.Context, s *Repository, name string, password string) (*Key, error) {
|
||||||
k, err := LoadKey(ctx, s, name)
|
k, err := LoadKey(ctx, s, name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
debug.Log("LoadKey(%v) returned error %v", name[:12], err)
|
debug.Log("LoadKey(%v) returned error %v", name, err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int)
|
||||||
debug.Log("trying key %q", name)
|
debug.Log("trying key %q", name)
|
||||||
key, err := OpenKey(ctx, s, name, password)
|
key, err := OpenKey(ctx, s, name, password)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
debug.Log("key %v returned error %v", name[:12], err)
|
debug.Log("key %v returned error %v", name, err)
|
||||||
|
|
||||||
// ErrUnauthenticated means the password is wrong, try the next key
|
// ErrUnauthenticated means the password is wrong, try the next key
|
||||||
if errors.Cause(err) == crypto.ErrUnauthenticated {
|
if errors.Cause(err) == crypto.ErrUnauthenticated {
|
||||||
|
@ -139,7 +139,7 @@ func SearchKey(ctx context.Context, s *Repository, password string, maxKeys int)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
debug.Log("successfully opened key %v", name[:12])
|
debug.Log("successfully opened key %v", name)
|
||||||
return key, nil
|
return key, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue