|
@@ -103,7 +103,7 @@ func unmarshal(in []byte, out interface{}) error {
|
|
|
return nil
|
|
return nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// ConvertToPEM converts all "safe bags" contained in pfxData to PEM blocks.
|
|
|
|
|
|
|
+// ToPEM converts all "safe bags" contained in pfxData to PEM blocks.
|
|
|
func ToPEM(pfxData []byte, password string) ([]*pem.Block, error) {
|
|
func ToPEM(pfxData []byte, password string) ([]*pem.Block, error) {
|
|
|
encodedPassword, err := bmpString(password)
|
|
encodedPassword, err := bmpString(password)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -211,7 +211,7 @@ func convertAttribute(attribute *pkcs12Attribute) (key, value string, err error)
|
|
|
|
|
|
|
|
// Decode extracts a certificate and private key from pfxData. This function
|
|
// Decode extracts a certificate and private key from pfxData. This function
|
|
|
// assumes that there is only one certificate and only one private key in the
|
|
// assumes that there is only one certificate and only one private key in the
|
|
|
-// pfxData.
|
|
|
|
|
|
|
+// pfxData; if there are more use ToPEM instead.
|
|
|
func Decode(pfxData []byte, password string) (privateKey interface{}, certificate *x509.Certificate, err error) {
|
|
func Decode(pfxData []byte, password string) (privateKey interface{}, certificate *x509.Certificate, err error) {
|
|
|
encodedPassword, err := bmpString(password)
|
|
encodedPassword, err := bmpString(password)
|
|
|
if err != nil {
|
|
if err != nil {
|