about summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2017-05-26 23:24:41 +0200
committerLeah Neukirchen <leah@vuxu.org>2017-05-26 23:27:40 +0200
commit7635bc4657f6db064a681f28b3354744ed57e5cb (patch)
tree76f78c15808e6d420493803548300bc3415f3f83 /contrib
parent46a44e2f2234ed8cf069c461313c78f2c7f188f1 (diff)
downloadmblaze-7635bc4657f6db064a681f28b3354744ed57e5cb.tar.gz
mblaze-7635bc4657f6db064a681f28b3354744ed57e5cb.tar.xz
mblaze-7635bc4657f6db064a681f28b3354744ed57e5cb.zip
contrib/mverify: use unix2dos for CRLF normalization
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/mverify4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/mverify b/contrib/mverify
index 563d0b1..2bca940 100755
--- a/contrib/mverify
+++ b/contrib/mverify
@@ -1,7 +1,7 @@
 #!/bin/sh
 # mverify MSG - verify a OpenPGP or SMIME message
 
-# Needs bash, gpg and openssl.
+# Needs bash, unix2dos, gpg and openssl.
 
 [ "$#" -eq 0 ] && set -- .
 
@@ -20,7 +20,7 @@ END {
 		exit(100)
 	} else if (type == "application/pgp-signature") {
 		exit(system("bash -c " q("mshow -r -O " q(msg) " " q(content) \
-			" | sed 's/$/\\r/' | gpg --verify <(mshow -O " q(msg) \
+			" | unix2dos | gpg --verify <(mshow -O " q(msg) \
 			" " q(signature) " ) -")))
 	} else if (type == "application/pkcs7-signature") {
 		exit(system("mshow -r -O " q(msg) " " q(signed) \