[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  ca0004e5610df4333d06908c5c5788f93a971ffa (commit)
      from  d594199bb47362306060db0e185582ffcfd7b6a6 (commit)


- Log -----------------------------------------------------------------
commit ca0004e5610df4333d06908c5c5788f93a971ffa
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sat Jan 9 17:11:18 2016 -0500

    Future-proof deprecated declartion parsing
    
    Support two-digest major/minor/micro numbers and die when the input
    fails to parse
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

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

Summary of changes:
 util/mkdef.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 0c38934..31822e1 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1681,7 +1681,8 @@ sub check_version_lte()
 sub do_deprecated()
 {
 	my ($decl, $plats, $algs) = @_;
-	$decl =~ /^\s*(DEPRECATEDIN_\d_\d_\d)\s*\((.*)\)\s*$/;
+	$decl =~ /^\s*(DEPRECATEDIN_\d+_\d+_\d+)\s*\((.*)\)\s*$/
+            or die "Bad DEPRECTEDIN: $decl\n";
 	my $info1 .= "#INFO:";
 	$info1 .= join(',', @{$plats}) . ":";
 	my $info2 = $info1;