Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hardening RSA keys for PKI and SSH #3593

Merged
merged 7 commits into from Dec 11, 2017
Merged

Hardening RSA keys for PKI and SSH #3593

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1501758
switch to go 1.9.2
Nov 19, 2017
19647bc
add RSA 16384
Nov 19, 2017
c8f7a5b
switch default to 2048 so same default that ssh-keygen
Nov 19, 2017
17cf847
Merge branch 'master' into hardening-keys
Nov 27, 2017
875a0e4
rollback .travis.yml to go 1.9.1
Nov 27, 2017
f4673af
Merge branch 'master' into hardening-keys
Nov 27, 2017
5259247
remove RSA 16384
Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions builtin/logical/ssh/path_roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func pathRoles(b *backend) *framework.Path {
Description: `
[Required for Dynamic type] [Not applicable for OTP type] [Not applicable for CA type]
Admin user at remote host. The shared key being registered should be
for this user and should have root privileges. Everytime a dynamic
for this user and should have root privileges. Everytime a dynamic
credential is being generated for other users, Vault uses this admin
username to login to remote host and install the generated credential
for the other user.`,
Expand Down Expand Up @@ -386,15 +386,15 @@ func (b *backend) pathRoleWrite(req *logical.Request, d *framework.FieldData) (*
return logical.ErrorResponse("missing admin username"), nil
}

// This defaults to 1024 and it can also be 2048.
// This defaults to 1024 and it can also be 2048 and 4096.
keyBits := d.Get("key_bits").(int)
if keyBits != 0 && keyBits != 1024 && keyBits != 2048 {
if keyBits != 0 && keyBits != 1024 && keyBits != 2048 && keyBits != 4096 {
return logical.ErrorResponse("invalid key_bits field"), nil
}

// If user has not set this field, default it to 1024
// If user has not set this field, default it to 2048
if keyBits == 0 {
keyBits = 1024
keyBits = 2048
}

// Store all the fields required by dynamic key type
Expand Down