From test-commits-return-360-archive-asf-public=cust-asf.ponee.io@perl.apache.org Mon Nov 5 11:10:54 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D1071180670 for ; Mon, 5 Nov 2018 11:10:53 +0100 (CET) Received: (qmail 33974 invoked by uid 500); 5 Nov 2018 10:10:52 -0000 Mailing-List: contact test-commits-help@perl.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: test-dev@perl.apache.org Delivered-To: mailing list test-commits@perl.apache.org Received: (qmail 33965 invoked by uid 99); 5 Nov 2018 10:10:52 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2018 10:10:52 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C22493A0057 for ; Mon, 5 Nov 2018 10:10:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1845766 - /perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Date: Mon, 05 Nov 2018 10:10:51 -0000 To: test-commits@perl.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181105101051.C22493A0057@svn01-us-west.apache.org> Author: icing Date: Mon Nov 5 10:10:51 2018 New Revision: 1845766 URL: http://svn.apache.org/viewvc?rev=1845766&view=rev Log: Changed the openssl version detection to work with other *SSL libraries. Version detection now FATALs hard rather than assume it's some 0.* fossil when version cannot be determined. Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm?rev=1845766&r1=1845765&r2=1845766&view=diff ============================================================================== --- perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm (original) +++ perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Mon Nov 5 10:10:51 2018 @@ -573,8 +573,8 @@ sub gendir { sub version { my $version = qx($openssl version); - return $1 if $version =~ /^OpenSSL (\S+) /; - return 0; + return $1 if $version =~ /^\S+SSL (\S+)/; + die "FATAL: unable to determine openssl version via `$openssl version` from: $version"; } sub dgst {