Merge pull request spacemonkeygo#11 from stephaneberle9/master

Enabled PEM files with CRLF line endings to be used (spacemonkeygo#10)

Author: aschmahmann

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) {