[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  ad2510836c8a5b03b4a63e276e370a64161cd6b8 (commit)
      from  98f2e513ce5c9425ec5d6316de30fdf4b5d333ee (commit)


- Log -----------------------------------------------------------------
commit ad2510836c8a5b03b4a63e276e370a64161cd6b8
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Apr 27 06:05:49 2018 +0200

    Skip the CMS test if configured 'no-cms'
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6108)

-----------------------------------------------------------------------

Summary of changes:
 test/cms-test.pl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/cms-test.pl b/test/cms-test.pl
index baa3b59..69436f1 100644
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -100,6 +100,13 @@ my $no_ec2m;
 my $no_ecdh;
 my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
 
+system ("$ossl_path no-cms > $null_path");
+if ($? == 0)
+	{
+	print STDERR "CMS disabled.  skipping...\n";
+	exit 0;
+	}
+
 system ("$ossl_path no-ec > $null_path");
 if ($? == 0)
 	{