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

Secure key storage #481

Merged
merged 3 commits into from
Sep 2, 2024
Merged

Secure key storage #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c1bf17
Implement secure key storage using PKCS8
MatheusFranco99 Aug 14, 2024
205cf62
Fix lint issue
MatheusFranco99 Aug 14, 2024
ef19a85
Switch back PKCS8 to PKCS1
MatheusFranco99 Aug 19, 2024
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
2 changes: 1 addition & 1 deletion ssv/runner_validations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (b *BaseRunner) ValidatePostConsensusMsg(runner Runner, psigMsgs *types.Par
}

// TODO https://github.com/ssvlabs/ssv-spec/issues/142 need to fix with this issue solution instead.
if b.State.DecidedValue == nil || len(b.State.DecidedValue) == 0 {
if len(b.State.DecidedValue) == 0 {
return errors.New("no decided value")
}

Expand Down
34 changes: 11 additions & 23 deletions types/encryption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,39 +49,26 @@ func Encrypt(pk *rsa.PublicKey, plainText []byte) ([]byte, error) {
// PemToPrivateKey return rsa private key from pem
func PemToPrivateKey(skPem []byte) (*rsa.PrivateKey, error) {
block, _ := pem.Decode(skPem)
// nolint
enc := x509.IsEncryptedPEMBlock(block)
b := block.Bytes
if enc {
var err error
// nolint
b, err = x509.DecryptPEMBlock(block, nil)
if err != nil {
return nil, errors.Wrap(err, "Failed to decrypt private key")
}
if block == nil {
return nil, errors.New("failed to decode PEM")
}
parsedSk, err := x509.ParsePKCS1PrivateKey(b)

// Parse key as PKCS1
parsedSk, err := x509.ParsePKCS1PrivateKey(block.Bytes)
if err != nil {
return nil, errors.Wrap(err, "Failed to parse private key")
}

return parsedSk, nil
}

// PemToPublicKey return rsa public key from pem
func PemToPublicKey(pkPem []byte) (*rsa.PublicKey, error) {
block, _ := pem.Decode(pkPem)
// nolint
enc := x509.IsEncryptedPEMBlock(block)
b := block.Bytes
if enc {
var err error
// nolint
b, err = x509.DecryptPEMBlock(block, nil)
if err != nil {
return nil, errors.Wrap(err, "Failed to decrypt private key")
}
if block == nil {
return nil, errors.New("failed to decode PEM")
}
parsedPk, err := x509.ParsePKIXPublicKey(b)
parsedPk, err := x509.ParsePKIXPublicKey(block.Bytes)
if err != nil {
return nil, errors.Wrap(err, "Failed to parse public key")
}
Expand All @@ -93,10 +80,11 @@ func PemToPublicKey(pkPem []byte) (*rsa.PublicKey, error) {

// PrivateKeyToPem converts privateKey to pem encoded
func PrivateKeyToPem(sk *rsa.PrivateKey) []byte {
pemBytes := x509.MarshalPKCS1PrivateKey(sk)
return pem.EncodeToMemory(
&pem.Block{
Type: "RSA PRIVATE KEY",
Bytes: x509.MarshalPKCS1PrivateKey(sk),
Bytes: pemBytes,
},
)
}
Expand Down