deps: upgrade openssl sources to 1.1.0i

This updates all sources in deps/openssl/openssl with openssl-1.1.0i.

PR-URL: https://github.com/nodejs/node/pull/22318
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>

20 files changed, 167 insertions, 146 deletions

diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL b/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL
index 466f8e5040..7c5e4c6bde 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/INSTALL
@@ -21,7 +21,7 @@ Detailed documentation is at the bottom of the lib/Text/Template.pm
 file.  You may be able to view it with the following command:
 
         perldoc Text::Template
-
+ 
 Or:
 
         perldoc lib/Text/Template.pm
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/README b/deps/openssl/openssl/external/perl/Text-Template-1.46/README
index bdd3dd4a42..e184d8cd2f 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/README
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/README
@@ -5,7 +5,7 @@ This is a library for generating form letters, building HTML pages, or
 filling in templates generally.  A `template' is a piece of text that
 has little Perl programs embedded in it here and there.  When you
 `fill in' a template, you evaluate the little programs and replace
-them with their values.
+them with their values.  
 
 Here's an example of a template:
 
@@ -45,7 +45,7 @@ encourages functional separation.
 You can fill in the template in a `Safe' compartment.  This means that
 if you don't trust the person who wrote the code in the template, you
 won't have to worry that they are tampering with your program when you
-execute it.
+execute it.  
 
 ----------------------------------------------------------------
 
@@ -87,7 +87,7 @@ What's new in v1.46 since v1.44:
         parameter to ->new is omitted.
 
 ----------------------------------------------------------------
-What's new in v1.44 since v1.43:
+What's new in v1.44 since v1.43: 
 
 This is a maintentance release.  There are no feature changes.
 
@@ -182,7 +182,7 @@ What's new in v1.40 since v1.31:
 ----------------------------------------------------------------
 What's new in v1.31 since v1.23:
 
-	Just bug fixes---fill_in_string was failing.  Thanks to
+	Just bug fixes---fill_in_string was failing.  Thanks to 
         Donald L. Greer Jr. for the test case.
 
 ----------------------------------------------------------------
@@ -252,7 +252,7 @@ What's new in v1.10 since v1.03:
 
 	New OUTPUT option delivers template results directly to a
 	filehandle instead of making them into a string.  Saves space
-	and time.
+	and time. 
 
 	PACKAGE and HASH now work intelligently with SAFE.
 
@@ -263,16 +263,16 @@ What's new in v1.10 since v1.03:
 			{ my $blist = '';
 		          foreach $i (@items) {
 		            $blist .= qq{  * $i\n};
-		          }
+		          }    
 		          $blist;
-		        }
+		        } 
 
 	You can now write this instead, because $OUT is special.
 
 			{ foreach $i (@items) {
 		            $OUT.= "  * $i\n";
-		          }
-		        }
+		          }    
+		        } 
 
 	(`A spoonful of sugar makes the medicine go down.')
 
@@ -281,7 +281,7 @@ What's new in v1.10 since v1.03:
 
 	More documentation.  Errors fixed.
 
-	Lots more tests.
+	Lots more tests.  
 
 ----------------------------------------------------------------
 
@@ -289,22 +289,22 @@ What's new in v1.03 since v1.0:
 
 	Code added to support HASH option to fill_in.
 	(Incl. `_gensym' function.)
-
+	
 	Documentation for HASH.
-
+	
 	New test file for HASH.
-
+	
 	Note about failure of lexical variables to propagate into
-	templates.  Why does this surprise people?
-
+ 	templates.  Why does this surprise people?
+	
 	Bug fix: program fragments are evaluated in an environment with
-	`no strict' by default.  Otherwise, you get a lot of `Global
-	symbol "$v" requires explicit package name' failures.  Why didn't
-	the test program pick this up?  Because the only variable the test
-	program ever used was `$a', which is exempt.  Duhhhhh.
-
+ 	`no strict' by default.  Otherwise, you get a lot of `Global
+ 	symbol "$v" requires explicit package name' failures.  Why didn't
+ 	the test program pick this up?  Because the only variable the test
+ 	program ever used was `$a', which is exempt.  Duhhhhh.
+	
 	Fixed the test program.
-
+	
 	Various minor documentation fixes.
 
 
@@ -315,24 +315,25 @@ Improvements of 1.0 over the old 0.1beta:
 
 New features:
 
-      At least twice as fast
+      At least twice as fast 
 
-      Better support for filling out the same template more than once
+      Better support for filling out the same template more than once 
 
       Now supports evaluation of program fragments in Safe
-      compartments. (Thanks, Jonathan!)
+      compartments. (Thanks, Jonathan!)  
 
-      Better argument syntax
+      Better argument syntax 
 
-      More convenience functions
+      More convenience functions 
 
-      The parser is much better and simpler.
+      The parser is much better and simpler. 
 
       Once a template is parsed, the parsed version is stored so that
-      it needn't be parsed again.
+      it needn't be parsed again.  
 
       BROKEN function behavior is rationalized. You can now pass an
       arbitrary argument to your BROKEN function, or return a value
-      from it to the main program.
+      from it to the main program.  
+
+      Documentation overhauled. 
 
-      Documentation overhauled.
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm b/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm
index 2b8a391b53..dc4f3bac77 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template.pm
@@ -5,7 +5,7 @@
 #
 # Copyright 2013 M. J. Dominus.
 # You may copy and distribute this program under the
-# same terms as Perl iteself.
+# same terms as Perl iteself.  
 # If in doubt, write to mjd-perl-template+@plover.com for a license.
 #
 # Version 1.46
@@ -44,7 +44,7 @@ sub always_prepend
 
 {
   my %LEGAL_TYPE;
-  BEGIN {
+  BEGIN { 
     %LEGAL_TYPE = map {$_=>1} qw(FILE FILEHANDLE STRING ARRAY);
   }
   sub new {
@@ -78,7 +78,7 @@ sub always_prepend
 
     bless $self => $pack;
     return unless $self->_acquire_data;
-
+    
     $self;
   }
 }
@@ -89,7 +89,7 @@ sub _acquire_data {
   my ($self) = @_;
   my $type = $self->{TYPE};
   if ($type eq 'STRING') {
-    # nothing necessary
+    # nothing necessary    
   } elsif ($type eq 'FILE') {
     my $data = _load_text($self->{SOURCE});
     unless (defined $data) {
@@ -115,7 +115,7 @@ sub _acquire_data {
     }
     $self->{SOURCE} = $data;
   } else {
-    # This should have been caught long ago, so it represents a
+    # This should have been caught long ago, so it represents a 
     # drastic `can't-happen' sort of failure
     my $pack = ref $self;
     die "Can only acquire data for $pack objects of subtype STRING, but this is $type; aborting";
@@ -145,7 +145,7 @@ sub compile {
   return undef unless $self->_acquire_data;
   unless ($self->{TYPE} eq 'STRING') {
     my $pack = ref $self;
-    # This should have been caught long ago, so it represents a
+    # This should have been caught long ago, so it represents a 
     # drastic `can't-happen' sort of failure
     die "Can only compile $pack objects of subtype STRING, but this is $self->{TYPE}; aborting";
   }
@@ -153,7 +153,7 @@ sub compile {
   my @tokens;
   my $delim_pats = shift() || $self->{DELIM};
 
-
+  
 
   my ($t_open, $t_close) = ('{', '}');
   my $DELIM;			# Regex matches a delimiter if $delim_pats
@@ -215,7 +215,7 @@ sub compile {
   } else {
     die "Can't happen error #1";
   }
-
+  
   $self->{TYPE} = 'PREPARSED';
   $self->{SOURCE} = \@content;
   1;
@@ -247,7 +247,7 @@ sub fill_in {
 
   my $fi_varhash = _param('hash', %fi_a);
   my $fi_package = _param('package', %fi_a) ;
-  my $fi_broken  =
+  my $fi_broken  = 
     _param('broken', %fi_a)  || $fi_self->{BROKEN} || \&_default_broken;
   my $fi_broken_arg = _param('broken_arg', %fi_a) || [];
   my $fi_safe = _param('safe', %fi_a);
@@ -305,7 +305,7 @@ sub fill_in {
     } elsif ($fi_type eq 'PROG') {
       no strict;
       my $fi_lcomment = "#line $fi_lineno $fi_filename";
-      my $fi_progtext =
+      my $fi_progtext = 
         "package $fi_eval_package; $fi_prepend;\n$fi_lcomment\n$fi_text;";
       my $fi_res;
       my $fi_eval_err = '';
@@ -445,7 +445,7 @@ sub _unconditionally_untaint {
     }
   }
 }
-
+  
 # Given a hashful of variables (or a list of such hashes)
 # install the variables into the specified package,
 # overwriting whatever variables were there before.
@@ -467,7 +467,7 @@ sub _install_hash {
       } elsif (ref $val) {
 	*SYM = $val;
       } else {
-	*SYM = \$val;
+ 	*SYM = \$val;
       }
     }
   }
@@ -478,7 +478,7 @@ sub TTerror { $ERROR }
 1;
 
 
-=head1 NAME
+=head1 NAME 
 
 Text::Template - Expand template text with embedded Perl
 
@@ -539,7 +539,7 @@ This file documents C<Text::Template> version B<1.46>
  $text = fill_in_string( <<EOM, PACKAGE => 'T', ...);
  Dear {$recipient},
  Pay me at once.
-        Love,
+        Love, 
          G.V.
  EOM
 
@@ -555,7 +555,7 @@ This is a library for generating form letters, building HTML pages, or
 filling in templates generally.  A `template' is a piece of text that
 has little Perl programs embedded in it here and there.  When you
 `fill in' a template, you evaluate the little programs and replace
-them with their values.
+them with their values.  
 
 You can store a template in a file outside your program.  People can
 modify the template without modifying the program.  You can separate
@@ -683,16 +683,16 @@ The fragments are evaluated in order, and side effects from earlier
 fragments will persist into later fragments:
 
 	{$x = @things; ''}The Lord High Chamberlain has gotten {$x}
-	things for me this year.
-	{ $diff = $x - 17;
+	things for me this year.  
+	{ $diff = $x - 17; 
 	  $more = 'more'
 	  if ($diff == 0) {
 	    $diff = 'no';
 	  } elsif ($diff < 0) {
 	    $more = 'fewer';
-	  }
+	  } 
           '';
-	}
+	} 
 	That is {$diff} {$more} than he gave me last year.
 
 The value of C<$x> set in the first line will persist into the next
@@ -701,11 +701,11 @@ C<$more> set in the second fragment will persist and be interpolated
 into the last line.  The output will look something like this:
 
 	The Lord High Chamberlain has gotten 42
-	things for me this year.
+	things for me this year.  
 
 	That is 25 more than he gave me last year.
 
-That is all the syntax there is.
+That is all the syntax there is.  
 
 =head2 The C<$OUT> variable
 
@@ -726,9 +726,9 @@ One way to do it is with a template like this:
 	{ my $blist = '';
           foreach $i (@items) {
             $blist .= qq{  * $i\n};
-          }
+          }    
           $blist;
-        }
+        } 
 
 Here we construct the list in a variable called C<$blist>, which we
 return at the end.  This is a little cumbersome.  There is a shortcut.
@@ -743,11 +743,11 @@ This means that you can write the template above like this:
 	Here is a list of the things I have got for you since 1907:
 	{ foreach $i (@items) {
             $OUT .= "  * $i\n";
-          }
-        }
+          }    
+        } 
 
 C<$OUT> is reinitialized to the empty string at the start of each
-program fragment.  It is private to C<Text::Template>, so
+program fragment.  It is private to C<Text::Template>, so 
 you can't use a variable named C<$OUT> in your template without
 invoking the special behavior.
 
@@ -780,15 +780,15 @@ else that makes sense with C<open>.
 The C<TYPE> can also be C<STRING>, in which case the C<SOURCE> should
 be a string:
 
-	new Text::Template ( TYPE => 'STRING',
+	new Text::Template ( TYPE => 'STRING', 
                              SOURCE => "This is the actual template!" );
 
 The C<TYPE> can be C<ARRAY>, in which case the source should be a
 reference to an array of strings.  The concatenation of these strings
 is the template:
 
-	new Text::Template ( TYPE => 'ARRAY',
-                             SOURCE => [ "This is ", "the actual",
+	new Text::Template ( TYPE => 'ARRAY', 
+                             SOURCE => [ "This is ", "the actual", 
                                          " template!",
                                        ]
                            );
@@ -800,7 +800,7 @@ C<Text::Template> will read the text from the filehandle up to
 end-of-file, and that text is the template:
 
 	# Read template source code from STDIN:
-	new Text::Template ( TYPE => 'FILEHANDLE',
+	new Text::Template ( TYPE => 'FILEHANDLE', 
                              SOURCE => \*STDIN  );
 
 
@@ -870,7 +870,7 @@ overridden in the arguments to C<fill_in>.  See L<C<BROKEN>> below.
 Loads all the template text from the template's source, parses and
 compiles it.  If successful, returns true; otherwise returns false and
 sets C<$Text::Template::ERROR>.  If the template is already compiled,
-it returns true and does nothing.
+it returns true and does nothing.  
 
 You don't usually need to invoke this function, because C<fill_in>
 (see below) compiles the template if it isn't compiled already.
@@ -977,10 +977,10 @@ variables.
 
 You may not want to put the template variables into a package.
 Packages can be hard to manage:  You can't copy them, for example.
-C<HASH> provides an alternative.
+C<HASH> provides an alternative.  
 
 The value for C<HASH> should be a reference to a hash that maps
-variable names to values.  For example,
+variable names to values.  For example, 
 
 	$template->fill_in(HASH => { recipient => "The King",
 				     items => ['gold', 'frankincense', 'myrrh'],
@@ -996,19 +996,19 @@ should be passed by reference.
 We also want to pass an object, which is in C<$self>; note that we
 pass a reference to the object, C<\$self> instead.  Since we've passed
 a reference to a scalar, inside the template the object appears as
-C<$object>.
+C<$object>.  
 
 The full details of how it works are a little involved, so you might
 want to skip to the next section.
 
-Suppose the key in the hash is I<key> and the value is I<value>.
+Suppose the key in the hash is I<key> and the value is I<value>.  
 
 =over 4
 
 =item *
 
 If the I<value> is C<undef>, then any variables named C<$key>,
-C<@key>, C<%key>, etc., are undefined.
+C<@key>, C<%key>, etc., are undefined.  
 
 =item *
 
@@ -1032,7 +1032,7 @@ and
 
 have almost exactly the same effect.  (The difference is that in the
 former case, the value is copied, and in the latter case it is
-aliased.)
+aliased.)  
 
 =item *
 
@@ -1074,7 +1074,7 @@ You can also use this to set two variables with the same name:
 	                           ]
                           );
 
-This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>.
+This sets C<$v> to C<"The King"> and C<@v> to C<(1,2,3)>.	
 
 =item C<BROKEN>
 
@@ -1082,13 +1082,13 @@ If any of the program fragments fails to compile or aborts for any
 reason, and you have set the C<BROKEN> option to a function reference,
 C<Text::Template> will invoke the function.  This function is called
 the I<C<BROKEN> function>.  The C<BROKEN> function will tell
-C<Text::Template> what to do next.
+C<Text::Template> what to do next.  
 
 If the C<BROKEN> function returns C<undef>, C<Text::Template> will
 immediately abort processing the template and return the text that it
 has accumulated so far.  If your function does this, it should set a
 flag that you can examine after C<fill_in> returns so that you can
-tell whether there was a premature return or not.
+tell whether there was a premature return or not. 
 
 If the C<BROKEN> function returns any other value, that value will be
 interpolated into the template as if that value had been the return
@@ -1150,7 +1150,7 @@ If you supply the C<BROKEN_ARG> option to C<fill_in>, the value of the
 option is passed to the C<BROKEN> function whenever it is called.  The
 default C<BROKEN> function ignores the C<BROKEN_ARG>, but you can
 write a custom C<BROKEN> function that uses the C<BROKEN_ARG> to get
-more information about what went wrong.
+more information about what went wrong. 
 
 The C<BROKEN> function could also use the C<BROKEN_ARG> as a reference
 to store an error message or some other information that it wants to
@@ -1158,7 +1158,7 @@ communicate back to the caller.  For example:
 
 	$error = '';
 
-	sub my_broken {
+	sub my_broken {	
 	   my %args = @_;
 	   my $err_ref = $args{arg};
 	   ...
@@ -1191,7 +1191,7 @@ operations that can be performed in them.
 
 If you use the C<PACKAGE> option with C<SAFE>, the package you specify
 will be placed into the safe compartment and evaluation will take
-place in that package as usual.
+place in that package as usual.  
 
 If not, C<SAFE> operation is a little different from the default.
 Usually, if you don't specify a package, evaluation of program
@@ -1235,11 +1235,11 @@ If this option is present, its value should be a reference to a list
 of two strings.  The first string is the string that signals the
 beginning of each program fragment, and the second string is the
 string that signals the end of each program fragment.  See
-L<"Alternative Delimiters">, below.
+L<"Alternative Delimiters">, below.  
 
 If you specify C<DELIMITERS> in the call to C<fill_in>, they override
 any delimiters you set when you created the template object with
-C<new>.
+C<new>. 
 
 =back
 
@@ -1266,7 +1266,7 @@ An example:
 
 	$text = Text::Template->fill_this_in( <<'EOM', PACKAGE => Q);
 	Dear {$name},
-	You owe me \\${sprintf('%.2f', $amount)}.
+	You owe me \\${sprintf('%.2f', $amount)}.  
 	Pay or I will break your {$part}.
 		Love,
 		Grand Vizopteryx of Irkutsk.
@@ -1371,7 +1371,7 @@ The text C<The King> doesn't get into the form letter.  Why not?
 Because C<$recipient> is a C<my> variable, and the whole point of
 C<my> variables is that they're private and inaccessible except in the
 scope in which they're declared.  The template is not part of that
-scope, so the template can't see C<$recipient>.
+scope, so the template can't see C<$recipient>.  
 
 If that's not the behavior you want, don't use C<my>.  C<my> means a
 private variable, and in this case you don't want the variable to be
@@ -1380,7 +1380,7 @@ package, and use the C<PACKAGE> option to C<fill_in>:
 
 	$Q::recipient = $recipient;
 	my $text = fill_in_file('formletter.tmpl', PACKAGE => 'Q');
-
+	
 
 or pass the names and values in a hash with the C<HASH> option:
 
@@ -1397,8 +1397,8 @@ rest of your program and wreck something.
 Nevertheless, there's really no way (except with C<Safe>) to protect
 against a template that says
 
-	{ $Important::Secret::Security::Enable = 0;
-	  # Disable security checks in this program
+	{ $Important::Secret::Security::Enable = 0; 
+	  # Disable security checks in this program 
 	}
 
 or
@@ -1462,12 +1462,12 @@ you may be able to make it work by doing this instead:
 	--@]
 
 It may be safer to choose delimiters that begin with a newline
-character.
+character.  
 
 Because the parsing of templates is simplified by the absence of
 backslash escapes, using alternative C<DELIMITERS> may speed up the
 parsing process by 20-25%.  This shows that my original choice of C<{>
-and C<}> was very bad.
+and C<}> was very bad. 
 
 =head2 C<PREPEND> feature and using C<strict> in templates
 
@@ -1492,11 +1492,11 @@ each and every code fragment:
 Because we didn't put C<use strict> at the top of the second fragment,
 it was only active in the first fragment, and we didn't get any
 C<strict> checking in the second fragment.  Then we mispelled C<$foo>
-and the error wasn't caught.
+and the error wasn't caught.  
 
 C<Text::Template> version 1.22 and higher has a new feature to make
 this easier.  You can specify that any text at all be automatically
-added to the beginning of each program fragment.
+added to the beginning of each program fragment.  
 
 When you make a call to C<fill_in>, you can specify a
 
@@ -1541,7 +1541,7 @@ except where overridden by C<PREPEND> options to C<new> or C<fill_in>.
 =head2 Prepending in Derived Classes
 
 This section is technical, and you should skip it on the first few
-readings.
+readings. 
 
 Normally there are three places that prepended text could come from.
 It could come from the C<PREPEND> option in the C<fill_in> call, from
@@ -1551,12 +1551,12 @@ C<Text::Template> looks for these three things in order and takes the
 first one that it finds.
 
 In a subclass of C<Text::Template>, this last possibility is
-ambiguous.  Suppose C<S> is a subclass of C<Text::Template>.  Should
+ambiguous.  Suppose C<S> is a subclass of C<Text::Template>.  Should 
 
 	Text::Template->always_prepend(...);
 
 affect objects in class C<Derived>?  The answer is that you can have it
-either way.
+either way.  
 
 The C<always_prepend> value for C<Text::Template> is normally stored
 in  a hash variable named C<%GLOBAL_PREPEND> under the key
@@ -1587,7 +1587,7 @@ method to get an arbitrary effect.
 Jennifer D. St Clair asks:
 
 	> Most of my pages contain JavaScript and Stylesheets.
-        > How do I change the template identifier?
+        > How do I change the template identifier?  
 
 Jennifer is worried about the braces in the JavaScript being taken as
 the delimiters of the Perl program fragments.  Of course, disaster
@@ -1600,13 +1600,13 @@ some reason, there are  two easy workarounds:
 1. You can put C<\> in front of C<{>, C<}>, or C<\> to remove its
 special meaning.  So, for example, instead of
 
-	    if (br== "n3") {
+	    if (br== "n3") { 
 		// etc.
 	    }
 
 you can put
 
-	    if (br== "n3") \{
+	    if (br== "n3") \{ 
 		// etc.
 	    \}
 
@@ -1627,21 +1627,21 @@ So if we wrote
 
 	    {q{foo}}
 
-it would turn into
+it would turn into 
 
 	    foo
 
 So for your JavaScript, just write
 
-	    {q{if (br== "n3") {
-		 // etc.
+	    {q{if (br== "n3") { 
+	  	 // etc.
 	       }}
 	    }
 
 and it'll come out as
 
-	      if (br== "n3") {
-		  // etc.
+	      if (br== "n3") { 
+	  	  // etc.
 	      }
 
 which is what you want.
@@ -1657,7 +1657,7 @@ their templates, like this:
 	}
 
 Then they complain because there is a C<17> at the top of the output
-that they didn't want to have there.
+that they didn't want to have there.  
 
 Remember that a program fragment is replaced with its own return
 value, and that in Perl the return value of a code block is the value
@@ -1723,14 +1723,14 @@ complicated to remember, but probably easier to use.  The rule is now:
 Backslashes are always passed to Perl unchanged I<unless> they occur
 as part of a sequence like C<\\\\\\{> or C<\\\\\\}>.  In these
 contexts, they are special; C<\\> is replaced with C<\>, and C<\{> and
-C<\}> signal a literal brace.
+C<\}> signal a literal brace. 
 
 Examples:
 
 	\{ foo \}
 
 is I<not> evaluated, because the C<\> before the braces signals that
-they should be taken literally.  The result in the output looks like this:
+they should be taken literally.  The result in the output looks like this: 
 
 	{ foo }
 
@@ -1797,7 +1797,7 @@ It's totally straightforward.  Just call the C<CGI> functions from
 inside the template:
 
 	{ $q->checkbox_group(NAME => 'toppings',
-			     LINEBREAK => true,
+		  	     LINEBREAK => true,
 			     COLUMNS => 3,
 			     VALUES => \@toppings,
 			    );
@@ -1864,7 +1864,7 @@ of the mailing list.  The mailing list address is a secret.)
 =head1 THANKS
 
 Many thanks to the following people for offering support,
-encouragement, advice, bug reports, and all the other good stuff.
+encouragement, advice, bug reports, and all the other good stuff.  
 
 David H. Adler /
 Joel Appelbaum /
@@ -1895,7 +1895,7 @@ Matt X. Hunter /
 Robert M. Ioffe /
 Daniel LaLiberte /
 Reuven M. Lerner /
-Trip Lilley /
+Trip Lilley / 
 Yannis Livassof /
 Val Luck /
 Kevin Madsen /
@@ -1941,12 +1941,12 @@ Special thanks to:
 
 =over 2
 
-=item Jonathan Roy
+=item Jonathan Roy 
 
 for telling me how to do the C<Safe> support (I spent two years
 worrying about it, and then Jonathan pointed out that it was trivial.)
 
-=item Ranjit Bhatnagar
+=item Ranjit Bhatnagar 
 
 for demanding less verbose fragments like they have in ASP, for
 helping me figure out the Right Thing, and, especially, for talking me
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm b/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm
index c6e3298ee2..1e41037bd3 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/lib/Text/Template/Preprocess.pm
@@ -28,7 +28,7 @@ sub preprocessor {
 1;
 
 
-=head1 NAME
+=head1 NAME 
 
 Text::Template::Preprocess - Expand template text with embedded Perl
 
@@ -82,8 +82,8 @@ this:
         Plain text here...
         { perl code }
         <script language=JavaScript>
-	      if (br== "n3") {
-		  // etc.
+     	      if (br== "n3") { 
+	  	  // etc.
 	      }
         </script>
         { more perl code }
@@ -96,7 +96,7 @@ JavaScript program with executable Perl code.  One strategy:
           s(<script(.*?)</script>)(q{$1})gsi;
         }
 
-Then use C<PREPROCESSOR =E<gt> \&quote_scripts>.  This will transform
+Then use C<PREPROCESSOR =E<gt> \&quote_scripts>.  This will transform 
 
 
 
@@ -141,3 +141,4 @@ For updates, visit C<http://www.plover.com/~mjd/perl/Template/>.
 
 
 =cut
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t
index 4784ba008e..5f9560f898 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/00-version.t
@@ -8,3 +8,4 @@ if ($Text::Template::VERSION == 1.46) {
 } else {
         print "not ok 1\n";
 }
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t
index d983797786..be43390c67 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/01-basic.t
@@ -33,12 +33,12 @@ if (defined($template)) {
 $n++;
 
 # (3) Fill in template from file
-$X::v = "abc";
+$X::v = "abc";	
 $resultX = <<EOM;
 We will put value of \$v (which is "abc") here -> abc
 We will evaluate 1+1 here -> 2
 EOM
-$Y::v = "ABC";
+$Y::v = "ABC";	
 $resultY = <<EOM;
 We will put value of \$v (which is "abc") here -> ABC
 We will evaluate 1+1 here -> 2
@@ -74,7 +74,7 @@ $n++;
 
 # (6) test creation of template from filehandle
 if (open (TMPL, "< $TEMPFILE")) {
-  $template = new Text::Template ('type' => 'FILEHANDLE',
+  $template = new Text::Template ('type' => 'FILEHANDLE', 
 				  'source' => *TMPL);
   if (defined($template)) {
     print "ok $n\n";
@@ -109,9 +109,9 @@ if (open (TMPL, "< $TEMPFILE")) {
 
 
 # (9) test creation of template from array
-$template = new Text::Template
-    ('type' => 'ARRAY',
-     'source' => [
+$template = new Text::Template 
+    ('type' => 'ARRAY', 
+     'source' => [ 
 		  'We will put value of $v (which is "abc") here -> {$v}',
 		  "\n",
 		  'We will evaluate 1+1 here -> {1+1}',
@@ -209,7 +209,7 @@ for ($i=0; $i<@tests; $i+=2) {
 # MJD 20010827
 # (28) test creation of template from filehandle
 if (open (TMPL, "< $TEMPFILE")) {
-  $template = new Text::Template ('type' => 'FILEHANDLE',
+  $template = new Text::Template ('type' => 'FILEHANDLE', 
 				  'source' => \*TMPL);
   if (defined($template)) {
     print "ok $n\n";
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t
index 050638c853..29ba51a40e 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/02-hash.t
@@ -68,13 +68,13 @@ my $WARNINGS = 0;
   local $^W = 1;       # Make sure this is on for this test
   $template8 = 'We will put value of $v (which is "good") here -> {defined $v ? "bad" : "good"}';
   $result8 = 'We will put value of $v (which is "good") here -> good';
-  my $template =
+  my $template = 
     new Text::Template ('type' => 'STRING', 'source' => $template8);
   my $text = $template->fill_in(HASH => {'v' => undef});
   # (8) Did we generate a warning?
   print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n";
   $n++;
-
+  
   # (9) Was the output correct?
   print +($text eq $result8 ? '' : 'not '), "ok $n\n";
   $n++;
@@ -85,7 +85,7 @@ my $WARNINGS = 0;
   # (10) Did we generate a warning?
   print +($WARNINGS == 0 ? '' : 'not '), "ok $n\n";
   $n++;
-
+  
   # (11) Was the output correct?
   if ($] < 5.005) {
     print "ok $n # skipped -- not supported before 5.005\n";
@@ -98,7 +98,7 @@ my $WARNINGS = 0;
 
 # (12) Now we'll test the multiple-hash option  (Added for 1.20.)
 $text = Text::Template::fill_in_string(q{$v: {$v}.  @v: [{"@v"}].},
-				       HASH => [{'v' => 17},
+				       HASH => [{'v' => 17}, 
 						{'v' => ['a', 'b', 'c']},
 						{'v' => \23},
 					       ]);
@@ -108,3 +108,4 @@ $n++;
 
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t
index 8094392dca..0ba65a54dc 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/03-out.t
@@ -46,10 +46,11 @@ $textOUT = $templateOUT->fill_in()
 print +($text eq $textOUT ? '' : 'not '), "ok $n\n";
 $n++;
 
-# Missing:  Test this feature in Safe compartments;
+# Missing:  Test this feature in Safe compartments; 
 # it's a totally different code path.
 # Decision: Put that into safe.t, because that file should
 # be skipped when Safe.pm is unavailable.
 
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t
index 6d94820d2a..4c07121b44 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/04-safe.t
@@ -141,13 +141,13 @@ print +($text1 eq $text2 ? '' : 'not '), "ok $n\n";
 $n++;
 
 # (16) Try the BROKEN routine in safe compartments
-sub my_broken {
+sub my_broken { 
   my %a = @_; $a{error} =~ s/ at.*//s;
   "OK! text:$a{text} error:$a{error} lineno:$a{lineno} arg:$a{arg}" ;
 }
 $templateB = new Text::Template (TYPE => 'STRING', SOURCE => '{die}')
     or die;
-$text1 = $templateB->fill_in(BROKEN => \&my_broken,
+$text1 = $templateB->fill_in(BROKEN => \&my_broken, 
 			     BROKEN_ARG => 'barg',
 			     SAFE => new Safe,
 			     );
@@ -158,3 +158,4 @@ $n++;
 
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t
index 71f242592f..03534770f1 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/05-safe2.t
@@ -96,7 +96,10 @@ print +($Q::H eq 'good7' ? '' : 'not '), "ok $n\n";
 $Q::H = $Q::H;
 $n++;
 
-# (12)
+# (12) 
 print +($Q2::H eq 'good8' ? '' : 'not '), "ok $n\n";
 $Q2::H = $Q2::H;
 $n++;
+
+
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t
index 22d4a1c841..6865ad1945 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/06-ofh.t
@@ -36,3 +36,4 @@ print +($t eq "My process ID is $$" ? '' : 'not '), "ok $n\n";
 $n++;
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t
index 8baaf7ad44..5f438f6148 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/07-safe3.t
@@ -88,3 +88,4 @@ $n++;
 }
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t
index 6014400840..ef9cfafdee 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/08-exported.t
@@ -14,7 +14,7 @@ Aborting"
 print "1..6\n";
 
 $n=1;
-$Q::n = $Q::n = 119;
+$Q::n = $Q::n = 119; 
 
 # (1) Test fill_in_string
 $out = fill_in_string('The value of $n is {$n}.', PACKAGE => 'Q' );
@@ -26,7 +26,7 @@ $TEMPFILE = "tt$$";
 open F, "> $TEMPFILE" or die "Couldn't open test file: $!; aborting";
 print F 'The value of $n is {$n}.', "\n";
 close F or die "Couldn't write test file: $!; aborting";
-$R::n = $R::n = 8128;
+$R::n = $R::n = 8128; 
 
 $out = fill_in_file($TEMPFILE, PACKAGE => 'R');
 print +($out eq "The value of \$n is 8128.\n" ? '' : 'not '), "ok $n\n";
@@ -42,7 +42,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n";
 $n++;
 
 # (4) It probably occurs in fill_this_in also:
-$out =
+$out = 
   Text::Template->fill_this_in("With a message here? [% \$var %]\n",
                       DELIMITERS => ['[%', '%]'],
                       HASH => { "var" => \"It is good!" });
@@ -50,7 +50,7 @@ print +($out eq "With a message here? It is good!\n" ? '' : 'not '), "ok $n\n";
 $n++;
 
 # (5) This test failed in 1.25.  It was supplied by Donald L. Greer Jr.
-# Note that it's different from (1)  in that there's no explicit
+# Note that it's different from (1)  in that there's no explicit 
 # package=> argument.
 use vars qw($string $foo $r);
 $string='Hello {$foo}';
@@ -72,3 +72,4 @@ package main;
 END { $TEMPFILE && unlink $TEMPFILE }
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t
index c9d03f27f8..40f9fac6cb 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/09-error.t
@@ -49,14 +49,15 @@ if ($@ =~ /^\QIllegal value `WLUNCH' for TYPE parameter/) {
 $n++;
 
 # (4-5) File does not exist
-my $o = Text::Template->new(TYPE => 'file',
+my $o = Text::Template->new(TYPE => 'file', 
                             SOURCE => 'this file does not exist');
 print $o ? "not ok $n\n" : "ok $n\n";
 $n++;
-print defined($Text::Template::ERROR)
+print defined($Text::Template::ERROR) 
       && $Text::Template::ERROR =~ /^Couldn't open file/
   ? "ok $n\n" : "not ok $n\n";
 $n++;
 
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t
index 4b32ce0411..f74d591cc7 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/10-delimiters.t
@@ -19,7 +19,7 @@ $n = 1;
 $V = $V = 119;
 $template = q{The value of $V is <<$V>>.};
 $result = q{The value of $V is 119.};
-$template1 = Text::Template->new(TYPE => STRING,
+$template1 = Text::Template->new(TYPE => STRING, 
 				 SOURCE => $template,
 				 DELIMITERS => ['<<', '>>']
 				)
@@ -37,7 +37,7 @@ $n++;
 # (3) Now we'll try using regex metacharacters
 # First with the delimiters specified at object creation time
 $template = q{The value of $V is [$V].};
-$template1 = Text::Template->new(TYPE => STRING,
+$template1 = Text::Template->new(TYPE => STRING, 
 				 SOURCE => $template,
 				 DELIMITERS => ['[', ']']
 				)
@@ -63,10 +63,10 @@ my @tests = ('{""}' => '',	# (5)
 	     '{"}"}' => undef,
 	     '{"\\}"}' => undef,	# One backslash
 	     '{"\\\\}"}' => undef, # Two backslashes
-	     '{"\\\\\\}"}' => undef, # Three backslashes
+	     '{"\\\\\\}"}' => undef, # Three backslashes 
 	     '{"\\\\\\\\}"}' => undef, # Four backslashes (10)
 	     '{"\\\\\\\\\\}"}' => undef, # Five backslashes
-
+	     
 	     # Backslashes are always passed directly to Perl
 	     '{"x20"}' => 'x20',
 	     '{"\\x20"}' => ' ',	# One backslash
@@ -96,3 +96,4 @@ for ($i=0; $i<@tests; $i+=2) {
 
 
 exit;
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t
index 833a5fa444..fe242e5898 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/11-prepend.t
@@ -22,11 +22,11 @@ my $tin = q{The value of $foo is: {$foo}};
 Text::Template->always_prepend(q{$foo = "global"});
 
 $tmpl1 = Text::Template->new(TYPE => 'STRING',
-				SOURCE => $tin,
+				SOURCE => $tin,		
 			      );
 
 $tmpl2 = Text::Template->new(TYPE => 'STRING',
-			     SOURCE => $tin,
+			     SOURCE => $tin,		
 			     PREPEND => q{$foo = "template"},
 			     );
 
@@ -46,11 +46,11 @@ print "ok $n\n"; $n++;
 
 Emptyclass1->always_prepend(q{$foo = 'Emptyclass global';});
 $tmpl1 = Emptyclass1->new(TYPE => 'STRING',
-				SOURCE => $tin,
+				SOURCE => $tin,		
 			      );
 
 $tmpl2 = Emptyclass1->new(TYPE => 'STRING',
-			     SOURCE => $tin,
+			     SOURCE => $tin,		
 			     PREPEND => q{$foo = "template"},
 			     );
 
@@ -69,11 +69,11 @@ print "ok $n\n"; $n++;
 print "ok $n\n"; $n++;
 
 $tmpl1 = Emptyclass2->new(TYPE => 'STRING',
-				SOURCE => $tin,
+				SOURCE => $tin,		
 			      );
 
 $tmpl2 = Emptyclass2->new(TYPE => 'STRING',
-			     SOURCE => $tin,
+			     SOURCE => $tin,		
 			     PREPEND => q{$foo = "template"},
 			     );
 
@@ -90,3 +90,5 @@ print "ok $n\n"; $n++;
 print "ok $n\n"; $n++;
 ($t3 eq 'The value of $foo is: fillin') or print "not ";
 print "ok $n\n"; $n++;
+
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t
index 422b10ec9a..60b6b0c65b 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/12-preprocess.t
@@ -32,16 +32,16 @@ for my $trial (1, 0) {
   for my $test (0 .. 3) {
     my $tmpl;
     if ($trial == 0) {
-      $tmpl = new Text::Template::Preprocess
+      $tmpl = new Text::Template::Preprocess 
 	(TYPE => 'STRING', SOURCE => $t) or die;
     } else {
       open TF, "< $TMPFILE" or die "Couldn't open test file: $!; aborting";
-      $tmpl = new Text::Template::Preprocess
+      $tmpl = new Text::Template::Preprocess 
 	(TYPE => 'FILEHANDLE', SOURCE => \*TF) or die;
     }
     $tmpl->preprocessor($py) if ($test & 1) == 1;
     my @args = ((($test & 2) == 2) ? (PREPROCESSOR => $pz) : ());
-    my $o = $tmpl->fill_in(@args,
+    my $o = $tmpl->fill_in(@args, 
 			   HASH => {x => 119, 'y' => 23, z => 5});
 #    print STDERR "$o/$result[$test]\n";
     print +(($o eq $result[$test]) ? '' : 'not '), "ok $n\n";
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t
index 30664993ac..d92a37463a 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/13-taint.t
@@ -58,14 +58,14 @@ sub should_be_tainted {
   if (Text::Template::_is_clean($_[0])) {
     print "not ok $n\n"; $n++; return;
   }
-  print "ok $n\n"; $n++; return;
+  print "ok $n\n"; $n++; return; 
 }
 
 sub should_be_clean {
   unless (Text::Template::_is_clean($_[0])) {
     print "not ok $n\n"; $n++; return;
   }
-  print "ok $n\n"; $n++; return;
+  print "ok $n\n"; $n++; return; 
 }
 
 # Tainted filename should die with and without UNTAINT option
@@ -116,3 +116,4 @@ Text::Template::_unconditionally_untaint($tfile);
 should_be_clean($tfile);
 
 END { unlink $file }
+
diff --git a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t
index db88a0711f..d362395cfb 100644
--- a/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t
+++ b/deps/openssl/openssl/external/perl/Text-Template-1.46/t/14-broken.t
@@ -68,7 +68,7 @@ Aborting"
 # (5) BROKEN sub passed correct args when called in ->fill_in?
 { my $r = Text::Template->new(TYPE => 'string',
                               SOURCE => '{1/0}',
-                             )->fill_in(BROKEN =>
+                             )->fill_in(BROKEN => 
                                         sub { my %a = @_;
                                               qq{$a{lineno},$a{error},$a{text}}
                                             });
@@ -79,3 +79,4 @@ Aborting"
   }
   $n++;
 }
+
diff --git a/deps/openssl/openssl/external/perl/transfer/Text/Template.pm b/deps/openssl/openssl/external/perl/transfer/Text/Template.pm
index 7dbfe3f84f..b21f875312 100644
--- a/deps/openssl/openssl/external/perl/transfer/Text/Template.pm
+++ b/deps/openssl/openssl/external/perl/transfer/Text/Template.pm
@@ -1,4 +1,4 @@
-# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2018 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
@@ -7,6 +7,9 @@
 
 # Quick transfer to the downloaded Text::Template
 
+package transfer::Text::Template;
+$VERSION = 1.46;
+
 BEGIN {
     use File::Spec::Functions;
     use File::Basename;