From 459e26527287adbc2adcc5d0d49abff9a5f315a7 Mon Sep 17 00:00:00 2001
From: Fredrik Forsmo <fredrik.forsmo@gmail.com>
Date: Fri, 17 Mar 2017 14:29:17 +0100
Subject: [PATCH] pkcs12: fix ToPEM to not ignore non-nil error from
 getSafeContents

Fixes golang/go#19542

Change-Id: I60d2370d1d1e0763c72c9cc203ea2ff21123af73
Reviewed-on: https://go-review.googlesource.com/38261
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---
 pkcs12/pkcs12.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkcs12/pkcs12.go b/pkcs12/pkcs12.go
index ad6341e..eff9ad3 100644
--- a/pkcs12/pkcs12.go
+++ b/pkcs12/pkcs12.go
@@ -109,6 +109,10 @@ func ToPEM(pfxData []byte, password string) ([]*pem.Block, error) {
 
 	bags, encodedPassword, err := getSafeContents(pfxData, encodedPassword)
 
+	if err != nil {
+		return nil, err
+	}
+
 	blocks := make([]*pem.Block, 0, len(bags))
 	for _, bag := range bags {
 		block, err := convertBag(&bag, encodedPassword)