From 46170e7bf2d1dc4578f1be6978447bda37a012e6 Mon Sep 17 00:00:00 2001 From: Christopher Denny Date: Tue, 7 Jun 2016 14:18:23 -0700 Subject: [PATCH] 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_#?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%9hfC%ukwXZWfPo>z z$iUA#`^=84dF&b&*Is#An$KO+B9)ZQ&zfJAC%!-q7`IAKGGhk{O8dsJ(=(O3cFM1k2ZzmlS&|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: ")