From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id B7A606DE1455 for ; Wed, 1 May 2019 22:17:19 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.273 X-Spam-Level: X-Spam-Status: No, score=-0.273 tagged_above=-999 required=5 tests=[AWL=-0.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x6u7s-60vqyA for ; Wed, 1 May 2019 22:17:19 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [162.247.75.118]) by arlo.cworth.org (Postfix) with ESMTPS id B47CA6DE13F3 for ; Wed, 1 May 2019 22:17:12 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=iOtrWRmrlGYlmDF9lOd4CMlJK3ISI0O6Yf1qZDLnzfs=; b=71XvHPRu+bf4T9AglMFU0GHIJnANrZMDrT56Q7UkF+Nvn7qNkACU4iUC IKzSXwG3JnaE8bdVhsukfmU7zVAcAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fifthhorseman.net; i=@fifthhorseman.net; q=dns/txt; s=2019rsa; t=1556774230; h=from : to : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=iOtrWRmrlGYlmDF9lOd4CMlJK3ISI0O6Yf1qZDLnzfs=; b=h2qkfFSDpS4/oby6wtU5ZNx1KuS0VS4JpTUjZUpj0l8z0pt0S0Dp3ata B6/wUPYwQ41zSn3lXDZkqRKVanRDuTFMfDOsNbdjjckL+QvlOyFkkMGZ/b TVMT3kXFFVPU1oP8eqPo+mqZKLhpeO9xY4616m7OA8NdolVnjJtEuQJiBX 9dSDWHKPAISHPYAGPM/OCLLlIgDocVMPziY4sN1OZFZOTFegsiugP9/PEQ IL1HtuFDoSPss7fQO9iw/O4SOldIR7cfIhxeyjYIa7dJpPo9zAX1YN+3jH N2Jb2aeo6r7aqUWjdAvFIjdN2EiKCyL2JzIzWMdeTLiinY8Um6Y4zQ== Received: from fifthhorseman.net (unknown [IPv6:2001:470:1f07:60d:4864:1fff:fe17:5aa8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by che.mayfirst.org (Postfix) with ESMTPSA id 98F35F9AD for ; Thu, 2 May 2019 01:17:10 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 56DB320CC8; Thu, 2 May 2019 01:17:04 -0400 (EDT) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH 06/16] gmime-cleanup: simplify T355-smime.sh Date: Thu, 2 May 2019 01:16:43 -0400 Message-Id: <20190502051653.8502-7-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190502051653.8502-1-dkg@fifthhorseman.net> References: <20190501104643.5836-1-david@tethera.net> <20190502051653.8502-1-dkg@fifthhorseman.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2019 05:17:19 -0000 GMime 3.0 and later can handle User ID as expected. signed-off-by: Daniel Kahn Gillmor --- test/T355-smime.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/T355-smime.sh b/test/T355-smime.sh index be45e3b1..e410286b 100755 --- a/test/T355-smime.sh +++ b/test/T355-smime.sh @@ -48,12 +48,6 @@ EOF test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "signature verification (notmuch CLI)" -if [ "${NOTMUCH_GMIME_MAJOR}" -lt 3 ]; then - # gmime 2 can't report User IDs properly for S/MIME - USERID='' -else - USERID='"userid": "CN=Notmuch Test Suite",' -fi output=$(notmuch show --format=json --verify subject:"test signed message 001" \ | notmuch_json_show_sanitize \ | sed -e 's|"created": [-1234567890]*|"created": 946728000|' \ @@ -71,7 +65,8 @@ expected='[[[{"id": "XXXXX", "Date": "Sat, 01 Jan 2000 12:00:00 +0000"}, "body": [{"id": 1, "sigstatus": [{"fingerprint": "'$FINGERPRINT'", - "status": "good",'$USERID' + "status": "good", + "userid": "CN=Notmuch Test Suite", "expires": 424242424, "created": 946728000}], "content-type": "multipart/signed", -- 2.20.1