certdata2pem.sh: Fix corruption, wrap at 64 cols

2 files changed, 10 insertions, 4 deletions

diff --git a/certdata2pem.sh b/certdata2pem.sh
index e12fc67..543195a 100755
--- a/certdata2pem.sh
+++ b/certdata2pem.sh
@@ -83,8 +83,7 @@ parse()
 							return 1
 							;;
 						*)
-							value="${value}$(printf\
-								"${val}")"
+							value="${value}${val}"
 							;;
 					esac
 				done
@@ -138,8 +137,9 @@ parse()
 
 	for label in ${trusted}; do
 		printf '%s\n' '-----BEGIN CERTIFICATE-----'
-		eval "printf '%s' \"\${certificate_${label}}\"" | base64 -
-		printf '%s\n' '-----END CERTIFICATE-----'
+		eval "printf \"\${certificate_${label}}\"" | base64 - | \
+			tr -d '\n' | fold -w 64 -
+		printf '\n%s\n' '-----END CERTIFICATE-----'
 	done
 
 	return 0
diff --git a/changelog b/changelog
index 183f2a0..c1a9cd5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+nss-certdata (3.54-2) trunk
+
+  * Fix ASN.1 data that was corrupted in PEM encoding.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sun, 09 Aug 2020 02:52:29 -0400
+
 nss-certdata (3.54-1) trunk
 
   * Initial release.