Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-03 19:17:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

letsencrypt: Don't store KeyFile as field in user; staying consistent

Browse Source
This commit is contained in:
Matthew Holt 2015-11-01 10:58:58 -07:00
parent a729be295a
commit 9a4e26a518
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddy/letsencrypt/user.go
View File

@ -20,7 +20,6 @@ import (
type User struct { type User struct {
Email string Email string
Registration *acme.RegistrationResource Registration *acme.RegistrationResource
KeyFile string
key *rsa.PrivateKey key *rsa.PrivateKey
} }
@ -64,7 +63,7 @@ func getUser(email string) (User, error) {
} }
// load their private key // load their private key
user.key, err = loadRSAPrivateKey(user.KeyFile) user.key, err = loadRSAPrivateKey(storage.UserKeyFile(email))
if err != nil { if err != nil {
return user, err return user, err
} }
@ -82,8 +81,7 @@ func saveUser(user User) error {
} }
// save private key file // save private key file
user.KeyFile = storage.UserKeyFile(user.Email) err = saveRSAPrivateKey(user.key, storage.UserKeyFile(user.Email))
err = saveRSAPrivateKey(user.key, user.KeyFile)
if err != nil { if err != nil {
return err return err
} }