From 7635bc4657f6db064a681f28b3354744ed57e5cb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 26 May 2017 23:24:41 +0200 Subject: contrib/mverify: use unix2dos for CRLF normalization --- contrib/mverify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/mverify') 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) \ -- cgit 1.4.1