[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1c55e372b9e16049461caa4802e801cc945018d0 (commit)
      from  464d59a5bb5811f7671e2bd37f41d610606b829d (commit)


- Log -----------------------------------------------------------------
commit 1c55e372b9e16049461caa4802e801cc945018d0
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Aug 22 16:04:47 2016 +0100

    Fix no-des
    
    The PKCS12 command line utility is not available if no-des is used.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/80-test_pkcs12.t | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t
index bb3e0c8..4a65268 100644
--- a/test/recipes/80-test_pkcs12.t
+++ b/test/recipes/80-test_pkcs12.t
@@ -1,11 +1,24 @@
+#! /usr/bin/env perl
+# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 use strict;
 use warnings;
 
 use OpenSSL::Test qw/:DEFAULT srctop_file/;
+use OpenSSL::Test::Utils;
+
 use Encode;
 
 setup("test_pkcs12");
 
+plan skip_all => "The PKCS12 command line utility is not supported by this OpenSSL build"
+    if disabled("des");
+
 plan tests => 1;
 
 my $pass = "σύνθημα γνώρισμα";