forked from TrueCloudLab/restic
server/key: Rename CreateKey -> CreateMasterKey
This commit is contained in:
parent
9b54fd7bdb
commit
bebb08ee7e
4 changed files with 9 additions and 7 deletions
|
@ -75,7 +75,7 @@ func (cmd CmdInit) Execute(args []string) error {
|
|||
|
||||
s := server.NewServer(be)
|
||||
|
||||
_, err = server.CreateKey(s, pw)
|
||||
_, err = server.CreateMasterKey(s, pw)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "creating key in backend at %s failed: %v\n", opts.Repo, err)
|
||||
os.Exit(1)
|
||||
|
|
|
@ -50,9 +50,9 @@ type Key struct {
|
|||
name string
|
||||
}
|
||||
|
||||
// CreateKey initializes a master key in the given backend and encrypts it with
|
||||
// the password.
|
||||
func CreateKey(s *Server, password string) (*Key, error) {
|
||||
// CreateMasterKey creates a new master key in the given backend and encrypts
|
||||
// it with the password.
|
||||
func CreateMasterKey(s *Server, password string) (*Key, error) {
|
||||
return AddKey(s, password, nil)
|
||||
}
|
||||
|
||||
|
|
|
@ -531,8 +531,10 @@ func (s *Server) SearchKey(password string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *Server) CreateKey(password string) error {
|
||||
key, err := CreateKey(s, password)
|
||||
// CreateMasterKey creates a new key with the supplied password, afterwards the
|
||||
// repository config is created.
|
||||
func (s *Server) CreateMasterKey(password string) error {
|
||||
key, err := CreateMasterKey(s, password)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ func SetupBackend(t testing.TB) *server.Server {
|
|||
OK(t, err)
|
||||
|
||||
s := server.NewServer(b)
|
||||
OK(t, s.CreateKey(*TestPassword))
|
||||
OK(t, s.CreateMasterKey(*TestPassword))
|
||||
return s
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue