Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
14120dd4
Unverified
Commit
14120dd4
authored
Nov 03, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 03, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70611 from yagonobre/rsa
Fix error wrap on pki_helpers
parents
474e27f9
a80a5730
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
pki_helpers.go
cmd/kubeadm/app/util/pkiutil/pki_helpers.go
+2
-2
No files found.
cmd/kubeadm/app/util/pkiutil/pki_helpers.go
View file @
14120dd4
...
@@ -201,7 +201,7 @@ func TryLoadKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, error) {
...
@@ -201,7 +201,7 @@ func TryLoadKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, error) {
case
*
rsa
.
PrivateKey
:
case
*
rsa
.
PrivateKey
:
key
=
k
key
=
k
default
:
default
:
return
nil
,
errors
.
Wrapf
(
err
,
"the private key file %s isn't in RSA format"
,
privateKeyPath
)
return
nil
,
errors
.
Errorf
(
"the private key file %s isn't in RSA format"
,
privateKeyPath
)
}
}
return
key
,
nil
return
key
,
nil
...
@@ -228,7 +228,7 @@ func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, *rs
...
@@ -228,7 +228,7 @@ func TryLoadPrivatePublicKeyFromDisk(pkiPath, name string) (*rsa.PrivateKey, *rs
// Allow RSA format only
// Allow RSA format only
k
,
ok
:=
privKey
.
(
*
rsa
.
PrivateKey
)
k
,
ok
:=
privKey
.
(
*
rsa
.
PrivateKey
)
if
!
ok
{
if
!
ok
{
return
nil
,
nil
,
errors
.
Wrapf
(
err
,
"the private key file %s isn't in RSA format"
,
privateKeyPath
)
return
nil
,
nil
,
errors
.
Errorf
(
"the private key file %s isn't in RSA format"
,
privateKeyPath
)
}
}
p
:=
pubKeys
[
0
]
.
(
*
rsa
.
PublicKey
)
p
:=
pubKeys
[
0
]
.
(
*
rsa
.
PublicKey
)
...
...
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