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

password mandatory when converting to pkcs#8 #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

password mandatory when converting to pkcs#8 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions pkcs8.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,12 @@ func ParsePKCS8PrivateKeyECDSA(der []byte, v ...[]byte) (*ecdsa.PrivateKey, erro
}

// ConvertPrivateKeyToPKCS8 converts the private key into PKCS#8 format.
// To encrypt the private key, the password of []byte type should be provided as the second parameter.
// To encrypt the private key, the password of []byte type MUST be provided as the second parameter.
//
// The only supported key types are RSA and ECDSA (*rsa.PrivateKey or *ecdsa.PrivateKey for priv)
func ConvertPrivateKeyToPKCS8(priv interface{}, v ...[]byte) ([]byte, error) {
var password []byte
if len(v) > 0 {
password = v[0]
func ConvertPrivateKeyToPKCS8(priv interface{}, password []byte) ([]byte, error) {
if password == nil || len(password) == 0 {
return nil, errors.New("Password is required to protect the private key")
}
return MarshalPrivateKey(priv, password, nil)
}
70 changes: 51 additions & 19 deletions pkcs8_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,47 @@ func TestParsePKCS8PrivateKey(t *testing.T) {
}

func TestConvertPrivateKeyToPKCS8(t *testing.T) {
for i, password := range [][]byte{nil, []byte("password")} {
password := []byte("password")
rsaPrivateKey, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
t.Fatalf("GenerateKey returned: %s", err)
}
der, err := pkcs8.ConvertPrivateKeyToPKCS8(rsaPrivateKey, password)
if err != nil {
t.Fatalf("ConvertPrivateKeyToPKCS8 returned: %s", err)
}
decodedRSAPrivateKey, err := pkcs8.ParsePKCS8PrivateKey(der, password)
if err != nil {
t.Fatalf("ParsePKCS8PrivateKey returned: %s", err)
}
if rsaPrivateKey.D.Cmp(decodedRSAPrivateKey.(*rsa.PrivateKey).D) != 0 {
t.Fatalf("Decoded key does not match original key")
}

for _, curve := range []elliptic.Curve{
elliptic.P224(), elliptic.P256(), elliptic.P384(), elliptic.P521(),
} {
ecPrivateKey, err := ecdsa.GenerateKey(curve, rand.Reader)
if err != nil {
t.Fatalf("%s: GenerateKey returned: %s", curve, err)
}
der, err = pkcs8.ConvertPrivateKeyToPKCS8(ecPrivateKey, password)
if err != nil {
t.Fatalf("%s: ConvertPrivateKeyToPKCS8 returned: %s", curve, err)
}
decodedECPrivateKey, err := pkcs8.ParsePKCS8PrivateKey(der, password)
if err != nil {
t.Fatalf("%s: ParsePKCS8PrivateKey returned: %s", curve, err)
}
if ecPrivateKey.D.Cmp(decodedECPrivateKey.(*ecdsa.PrivateKey).D) != 0 {
t.Fatalf("%s: Decoded key does not match original key", curve)
}
}
}

func TestConvertPrivateKeyToPKCS8NoPassword(t *testing.T) {
expectedError := "Password is required to protect the private key"
for i, password := range [][]byte{nil, []byte("")} {
var args [][]byte
if password != nil {
args = append(args, password)
Expand All @@ -353,16 +393,12 @@ func TestConvertPrivateKeyToPKCS8(t *testing.T) {
if err != nil {
t.Fatalf("%d: GenerateKey returned: %s", i, err)
}
der, err := pkcs8.ConvertPrivateKeyToPKCS8(rsaPrivateKey, args...)
if err != nil {
t.Fatalf("%d: ConvertPrivateKeyToPKCS8 returned: %s", i, err)
}
decodedRSAPrivateKey, err := pkcs8.ParsePKCS8PrivateKey(der, args...)
if err != nil {
t.Fatalf("%d: ParsePKCS8PrivateKey returned: %s", i, err)
_, err = pkcs8.ConvertPrivateKeyToPKCS8(rsaPrivateKey, password)
if err == nil {
t.Errorf("%d: Should have failed", i)
}
if rsaPrivateKey.D.Cmp(decodedRSAPrivateKey.(*rsa.PrivateKey).D) != 0 {
t.Fatalf("%d: Decoded key does not match original key", i)
if err.Error() != expectedError {
t.Errorf("%d: Expected error \"%s\", got \"%s\"", i, expectedError, err.Error())
}

for _, curve := range []elliptic.Curve{
Expand All @@ -372,16 +408,12 @@ func TestConvertPrivateKeyToPKCS8(t *testing.T) {
if err != nil {
t.Fatalf("%d, %s: GenerateKey returned: %s", i, curve, err)
}
der, err = pkcs8.ConvertPrivateKeyToPKCS8(ecPrivateKey, args...)
if err != nil {
t.Fatalf("%d, %s: ConvertPrivateKeyToPKCS8 returned: %s", i, curve, err)
}
decodedECPrivateKey, err := pkcs8.ParsePKCS8PrivateKey(der, args...)
if err != nil {
t.Fatalf("%d, %s: ParsePKCS8PrivateKey returned: %s", i, curve, err)
_, err = pkcs8.ConvertPrivateKeyToPKCS8(ecPrivateKey, password)
if err == nil {
t.Errorf("%d, %s: Should have failed", i, curve)
}
if ecPrivateKey.D.Cmp(decodedECPrivateKey.(*ecdsa.PrivateKey).D) != 0 {
t.Fatalf("%d, %s: Decoded key does not match original key", i, curve)
if err.Error() != expectedError {
t.Errorf("%d, %s: Expected error \"%s\", got \"%s\"", i, curve, expectedError, err.Error())
}
}
}
Expand Down