[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  180df315c789be1138ce2643583362f4b37c8809 (commit)
      from  f8d9d6e48b7ce50aee32d151e5dc7253594e01ed (commit)


- Log -----------------------------------------------------------------
commit 180df315c789be1138ce2643583362f4b37c8809
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Feb 21 22:43:29 2016 +0100

    Don't use 'parent' in util/dofile.pl
    
    Because we're requiring Perl 5.10.0 and the 'parent' didn't appear
    before Perl 5.10.1, we need to resort to the older parent module
    declaration style, modifying @ISA.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 util/TLSProxy/ClientHello.pm       | 3 ++-
 util/TLSProxy/NewSessionTicket.pm  | 3 ++-
 util/TLSProxy/ServerHello.pm       | 3 ++-
 util/TLSProxy/ServerKeyExchange.pm | 3 ++-
 util/dofile.pl                     | 4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/util/TLSProxy/ClientHello.pm b/util/TLSProxy/ClientHello.pm
index 3830628..0586cf9 100644
--- a/util/TLSProxy/ClientHello.pm
+++ b/util/TLSProxy/ClientHello.pm
@@ -55,7 +55,8 @@ use strict;
 
 package TLSProxy::ClientHello;
 
-use parent 'TLSProxy::Message';
+use vars '@ISA';
+push @ISA, 'TLSProxy::Message';
 
 sub new
 {
diff --git a/util/TLSProxy/NewSessionTicket.pm b/util/TLSProxy/NewSessionTicket.pm
index 75dbf23..4e8c713 100644
--- a/util/TLSProxy/NewSessionTicket.pm
+++ b/util/TLSProxy/NewSessionTicket.pm
@@ -54,7 +54,8 @@ use strict;
 
 package TLSProxy::NewSessionTicket;
 
-use parent 'TLSProxy::Message';
+use vars '@ISA';
+push @ISA, 'TLSProxy::Message';
 
 sub new
 {
diff --git a/util/TLSProxy/ServerHello.pm b/util/TLSProxy/ServerHello.pm
index 7cf7535..4798f22 100644
--- a/util/TLSProxy/ServerHello.pm
+++ b/util/TLSProxy/ServerHello.pm
@@ -55,7 +55,8 @@ use strict;
 
 package TLSProxy::ServerHello;
 
-use parent 'TLSProxy::Message';
+use vars '@ISA';
+push @ISA, 'TLSProxy::Message';
 
 sub new
 {
diff --git a/util/TLSProxy/ServerKeyExchange.pm b/util/TLSProxy/ServerKeyExchange.pm
index b85b8ad..a3973be 100644
--- a/util/TLSProxy/ServerKeyExchange.pm
+++ b/util/TLSProxy/ServerKeyExchange.pm
@@ -55,7 +55,8 @@ use strict;
 
 package TLSProxy::ServerKeyExchange;
 
-use parent 'TLSProxy::Message';
+use vars '@ISA';
+push @ISA, 'TLSProxy::Message';
 
 sub new
 {
diff --git a/util/dofile.pl b/util/dofile.pl
index 76dfe2b..78b8dfe 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -35,7 +35,9 @@ use File::Spec::Functions;
 use lib catdir(dirname(__FILE__));
 use with_fallback qw(Text::Template);
 
-use parent qw/Text::Template/;
+#use parent qw/Text::Template/;
+use vars qw/@ISA/;
+push @ISA, qw/Text::Template/;
 
 # Override constructor
 sub new {