PR: 2101

Submitted by: Doug Kaufman <dkaufman@rahul.net>
Approved by: steve@openssl.org

Fixes for tests in cms-test.pl

test/cms-test.pl

@@ -58,6 +58,9 @@ my $ossl_path;
 if ( -f "../apps/openssl" ) {
     $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
 }
+elsif ( -f "../apps/openssl.exe" ) {
+    $ossl_path = "../util/shlib_wrap.sh ../apps/openssl.exe";
+}
 elsif ( -f "..\\out32dll\\openssl.exe" ) {
     $ossl_path = "..\\out32dll\\openssl.exe";
 }
@@ -232,7 +235,7 @@ my @smime_cms_tests = (
     [
         "signed content MIME format, RSA key, signed receipt request",
         "-sign -in smcont.txt -signer $smdir/smrsa1.pem -nodetach"
-          . " -receipt_request_to test@openssl.org -receipt_request_all"
+          . " -receipt_request_to test\@openssl.org -receipt_request_all"
           . " -out test.cms",
         "-verify -in test.cms "
           . " -CAfile $smdir/smroot.pem -out smtst.txt"