Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
9a4e26a5
Commit
9a4e26a5
authored
Nov 01, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
letsencrypt: Don't store KeyFile as field in user; staying consistent
parent
a729be29
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
caddy/letsencrypt/user.go
caddy/letsencrypt/user.go
+2
-4
No files found.
caddy/letsencrypt/user.go
View file @
9a4e26a5
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment