projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the record layer to use TLSv1.3 style record construction
[openssl.git]
/
util
/
dofile.pl
diff --git
a/util/dofile.pl
b/util/dofile.pl
index 76dfe2b607f44f011c0a490a1554a6b8c2c07f99..8b0c7b41c0667749aa9030252225886ff303210b 100644
(file)
--- a/
util/dofile.pl
+++ b/
util/dofile.pl
@@
-1,5
+1,11
@@
-#! /usr/bin/perl
+#! /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
+
# Reads one or more template files and runs it through Text::Template
#
# It is assumed that this scripts is called with -Mconfigdata, a module
# Reads one or more template files and runs it through Text::Template
#
# It is assumed that this scripts is called with -Mconfigdata, a module
@@
-35,7
+41,9
@@
use File::Spec::Functions;
use lib catdir(dirname(__FILE__));
use with_fallback qw(Text::Template);
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 {
# Override constructor
sub new {
@@
-151,7
+159,11
@@
my @autowarntext = ("WARNING: do not edit!",
my $prev_linecount = 0;
my $text =
@ARGV
my $prev_linecount = 0;
my $text =
@ARGV
- ? join("", map { my $x = "{- output_reset_on() -}".Text::Template::_load_text($_);
+ ? join("", map { my $x = Text::Template::_load_text($_);
+ if (!defined($x)) {
+ die $Text::Template::ERROR, "\n";
+ }
+ $x = "{- output_reset_on() -}" . $x;
my $linecount = $x =~ tr/\n//;
$prev_linecount = ($linecount += $prev_linecount);
$lines{$linecount} = $_;
my $linecount = $x =~ tr/\n//;
$prev_linecount = ($linecount += $prev_linecount);
$lines{$linecount} = $_;
@@
-181,6
+193,7
@@
sub output_off {
$template->fill_in(OUTPUT => \*STDOUT,
HASH => { config => \%config,
target => \%target,
$template->fill_in(OUTPUT => \*STDOUT,
HASH => { config => \%config,
target => \%target,
+ disabled => \%disabled,
withargs => \%withargs,
unified_info => \%unified_info,
autowarntext => \@autowarntext,
withargs => \%withargs,
unified_info => \%unified_info,
autowarntext => \@autowarntext,