Commit 9a4e26a5 authored by Matthew Holt's avatar Matthew Holt

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

parent a729be29
...@@ -20,7 +20,6 @@ import ( ...@@ -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) { ...@@ -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 { ...@@ -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
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment