--- /dev/null
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id F1E5E431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 00:03:19 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id a8fFG1j+0SUg for <notmuch@notmuchmail.org>;\r
+ Sun, 18 Jan 2015 00:03:18 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7A752431FC4\r
+ for <notmuch@notmuchmail.org>; Sun, 18 Jan 2015 00:03:11 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YCkpC-0004qc-N4; Sun, 18 Jan 2015 04:03:10 -0400\r
+Received: (nullmailer pid 18925 invoked by uid 1000); Sun, 18 Jan 2015\r
+ 08:02:54 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 3/5] test: add S/MIME signature verification test for\r
+ notmuch CLI\r
+Date: Sun, 18 Jan 2015 09:02:45 +0100\r
+Message-Id: <1421568167-18683-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1421568167-18683-1-git-send-email-david@tethera.net>\r
+References: <1421568167-18683-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 18 Jan 2015 08:03:20 -0000\r
+\r
+The test is pretty much cut and paste from the PGP/MIME version, with\r
+obvious updates taken from notmuch output. This also requires setting\r
+up gpgsm infrastucture.\r
+---\r
+ test/T355-smime.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++\r
+ test/test-lib.sh | 1 +\r
+ 2 files changed, 50 insertions(+)\r
+\r
+diff --git a/test/T355-smime.sh b/test/T355-smime.sh\r
+index 5f3ff12..caedf5e 100755\r
+--- a/test/T355-smime.sh\r
++++ b/test/T355-smime.sh\r
+@@ -3,7 +3,17 @@\r
+ test_description='S/MIME signature verification and decryption'\r
+ . ./test-lib.sh\r
+ \r
++add_gpgsm_home ()\r
++{\r
++ local output\r
++ [ -d ${GNUPGHOME} ] && return\r
++ mkdir -m 0700 "$GNUPGHOME"\r
++ gpgsm --no-tty --import < test_suite.pem >"$GNUPGHOME"/import.log 2>&1\r
++ test_debug "cat $GNUPGHOME/import.log"\r
++}\r
++\r
+ test_require_external_prereq openssl\r
++test_require_external_prereq gpgsm\r
+ \r
+ test_begin_subtest "Generate CA Cert"\r
+ openssl genpkey -algorithm RSA -out ca.key -pass pass:test -des3 1024\r
+@@ -21,6 +31,10 @@ openssl x509 -req -in smime.csr -passin pass:test -CA ca.crt -CAkey ca.key -set_\r
+ cat test_suite.crt smime.key > test_suite.pem\r
+ test_expect_equal "$(openssl verify -purpose smimesign -CAfile ca.crt test_suite.pem)" "test_suite.pem: OK"\r
+ \r
++add_gpgsm_home\r
++\r
++FINGERPRINT=$(openssl x509 -fingerprint -in test_suite.crt -noout | sed -e 's/^.*=//' -e s/://g)\r
++\r
+ test_expect_success 'emacs delivery of S/MIME signed message' \\r
+ 'emacs_fcc_message \\r
+ "test signed message 001" \\r
+@@ -41,6 +55,41 @@ Verification successful\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
++test_begin_subtest "signature verification (notmuch CLI)"\r
++output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
++ | notmuch_json_show_sanitize \\r
++ | sed -e 's|"created": [1234567890]*|"created": 946728000|' \\r
++ -e 's|"expires": [1234567890]*|"expires": 424242424|' )\r
++expected='[[[{"id": "XXXXX",\r
++ "match": true,\r
++ "excluded": false,\r
++ "filename": "YYYYY",\r
++ "timestamp": 946728000,\r
++ "date_relative": "2000-01-01",\r
++ "tags": ["inbox","signed"],\r
++ "headers": {"Subject": "test signed message 001",\r
++ "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++ "To": "test_suite@notmuchmail.org",\r
++ "Date": "Sat, 01 Jan 2000 12:00:00 +0000"},\r
++ "body": [{"id": 1,\r
++ "sigstatus": [{"status": "good",\r
++ "fingerprint": "'$FINGERPRINT'",\r
++ "expires": 424242424,\r
++ "created": 946728000}],\r
++ "content-type": "multipart/signed",\r
++ "content": [{"id": 2,\r
++ "content-type": "text/plain",\r
++ "content": "This is a test signed message.\n"},\r
++ {"id": 3,\r
++ "content-length": 1930,\r
++ "content-transfer-encoding": "base64",\r
++ "content-type": "application/x-pkcs7-signature",\r
++ "filename": "smime.p7s"}]}]},\r
++ []]]]'\r
++test_expect_equal_json \\r
++ "$output" \\r
++ "$expected"\r
++\r
+ test_begin_subtest "Decryption and signature verification (openssl)"\r
+ notmuch show --format=raw subject:"test encrypted message 001" |\\r
+ openssl smime -decrypt -recip test_suite.pem |\\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 00612d9..a0d44e1 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1305,3 +1305,4 @@ test_declare_external_prereq gpg\r
+ test_declare_external_prereq python\r
+ test_declare_external_prereq python2\r
+ test_declare_external_prereq openssl\r
++test_declare_external_prereq gpgsm\r
+-- \r
+2.1.4\r
+\r