From 6d00a81776c17c5754e2f903f2119b5603c39d6d Mon Sep 17 00:00:00 2001 From: Stephan Eberle Date: Thu, 1 Oct 2020 20:09:41 +0200 Subject: [PATCH] Enabled PEM files with CRLF line endings to be used (#10); made PEM file splitter tolerant of trailing whitespace in PEM block delimiter lines --- pem.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pem.go b/pem.go index c8b0c1cf..14771097 100644 --- a/pem.go +++ b/pem.go @@ -16,13 +16,14 @@ package openssl import ( "regexp" + ) var pemSplit *regexp.Regexp = regexp.MustCompile(`(?sm)` + - `(^-----[\s-]*?BEGIN.*?-----$` + + `(^-----[\s-]*?BEGIN.*?-----[\s-]*?$` + `.*?` + - `^-----[\s-]*?END.*?-----$)`) - + `^-----[\s-]*?END.*?-----[\s-]*?$)`) + func SplitPEM(data []byte) [][]byte { var results [][]byte for _, block := range pemSplit.FindAll(data, -1) {