From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Sat, 9 Jan 2016 22:11:18 +0000 (-0500)
Subject: Future-proof deprecated declartion parsing
X-Git-Tag: OpenSSL_1_1_0-pre2~86
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=ca0004e5610df4333d06908c5c5788f93a971ffa

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@openssl.org>
---

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 0c38934ba4..31822e167d 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;