From 46170e7bf2d1dc4578f1be6978447bda37a012e6 Mon Sep 17 00:00:00 2001
From: Christopher Denny <cdenny@squareup.com>
Date: Tue, 7 Jun 2016 14:18:23 -0700
Subject: [PATCH 1/3] Added der support and a sample der cert in the certs
 folder.

---
 certs/cert.der | Bin 0 -> 1000 bytes
 main.go        |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 certs/cert.der

diff --git a/certs/cert.der b/certs/cert.der
new file mode 100644
index 0000000000000000000000000000000000000000..389e938add594950be0eca89965990c78d0080de
GIT binary patch
literal 1000
zcmXqLVt!)K#B_#<lVQQS%}3^bsjfEQW#iOp^Jx3d%gD&e%3#pA*^t|SlZ`o)g-w_#
zG}utsKoG>?5ax1D%*jm4FUreIG!!!s0SU4T^9Cp8DYz9S<|StqC+8bV8i<3$xr7BA
z3sQ?pN{dnzf|D~-^O92y6%FJ;QryB4L8-;5iABj73W<3s3NEQ-sX6%txv6<2h7ty1
zASKMg{4m`x&GH7aa946NiU}kpB|9WSZO}{3&oz(}=QT7lFf}qaGBh+bHjDyt%?%9<
zETP;X>Z>M3CFJN~WMyD(V&rEqXkz4IYGPz$c(PdSd`4zqqGe50(k6~cJiJUwU*}dX
zuaoDS>9>u2UnF;w^sTZNkylO%9hf<JiuV4et8}$hE!lJ}E^fH6{{N%P-9Gi~f}7)Y
zZ=8PBB|VMp;Rl_y+Z=f_&nMQ~Oa4Fm@s3Pcd-CPjH8vi1-JB+;U0JYCYNr;n#;mr(
zI~K?Nk9@g<u|WPn+70=8ORLo^Cp*aJWiDCJwO!xCU3yAd^E3IU(McuKOfwTVGJo8?
z<mrS=;ir6a3zM!fzrN0N|LcpigY$gWFV?*%_S{SB`n0VF*sWH5mdrGr@J`mwzd`)N
zkGVT%T&hdCeLjDVjJVX{ZU0)*l6OfQwti*V$gxT9%Dw~fo6@40m>C%ukwXZWfPo>z
z$iUA#`^=84dF&b&*Is#An$KO+B9)ZQ&zfJAC%<Fwen*oWlXC}bpJ=ByS$nEp3%!3`
z|KD%UN6`m=_J8$sy#0L266xuI|Ad)#&(gef(|F>!-q7`IAKGGhk{O<QD%#9_p1rC<
z<=><wi30AIXJy&*EaiX6B$jYP=*_upY%lue*zpCsT>8dsJ(=(O3cFM1<j(jV=(gW?
zaJ{rM!|cxq%zUTSeCB9aEvng@qZaq(-p);bTDSSN?EJc^jOWbjM5nsPH9iOVcZ61#
zo{Doi5>k2ZzmlS&|Kj8&mz%|3c~3VC3VGIX;aP+AzZus;HD7OtpYgnSRgh@PvMz6{
P*n}#>-iqIm@(u+60Vj4H

literal 0
HcmV?d00001

diff --git a/main.go b/main.go
index 1019c76..25884a8 100644
--- a/main.go
+++ b/main.go
@@ -45,6 +45,8 @@ var fileExtToFormat = map[string]string{
 	".p12":   "PKCS12",
 	".pfx":   "PKCS12",
 	".jceks": "JCEKS",
+	".jks":   "JCEKS",
+	".der":   "DER",
 }
 
 type certWithAlias struct {
@@ -105,6 +107,12 @@ func getCerts(file, format string) ([]certWithAlias, error) {
 			certs = append(certs, certWithAlias{cert: cert})
 			block, data = pem.Decode(data)
 		}
+	case "DER":
+		cert, err := x509.ParseCertificate(data)
+		if err != nil {
+			return nil, err
+		}
+		certs = append(certs, certWithAlias{cert: cert})
 	case "PKCS12":
 		scanner := bufio.NewReader(os.Stdin)
 		fmt.Print("Enter password: ")

From d90fbacb898eee3fc0a7087e69e4f42a470cbbfe Mon Sep 17 00:00:00 2001
From: Christopher Denny <cdenny@squareup.com>
Date: Tue, 7 Jun 2016 14:38:38 -0700
Subject: [PATCH 2/3] Converted der section in getCerts to use updated ioreader
 instead of filename.

---
 main.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.go b/main.go
index b8fbba8..611b96c 100644
--- a/main.go
+++ b/main.go
@@ -123,6 +123,10 @@ func getCerts(reader io.Reader, format string) ([]certWithAlias, error) {
 			block, data = pem.Decode(data)
 		}
 	case "DER":
+		data, err := ioutil.ReadAll(reader)
+		if err != nil {
+			return nil, err
+		}
 		cert, err := x509.ParseCertificate(data)
 		if err != nil {
 			return nil, err

From 2f91f11764bfb05a37b23000c3f2d2c85caf3a77 Mon Sep 17 00:00:00 2001
From: Christopher Denny <cdenny@squareup.com>
Date: Tue, 7 Jun 2016 15:00:26 -0700
Subject: [PATCH 3/3] Removed erronous support for jks files and renamed
 corresponding file in certs folder to use jceks extension.

---
 certs/{cert.jks => cert.jceks} | Bin
 main.go                        |   1 -
 2 files changed, 1 deletion(-)
 rename certs/{cert.jks => cert.jceks} (100%)

diff --git a/certs/cert.jks b/certs/cert.jceks
similarity index 100%
rename from certs/cert.jks
rename to certs/cert.jceks
diff --git a/main.go b/main.go
index 611b96c..3afbb18 100644
--- a/main.go
+++ b/main.go
@@ -46,7 +46,6 @@ var fileExtToFormat = map[string]string{
 	".p12":   "PKCS12",
 	".pfx":   "PKCS12",
 	".jceks": "JCEKS",
-	".jks":   "JCEKS",
 	".der":   "DER",
 }