Handle the new format OpenSSL 1.0.0c uses for public key size.

InCommon · Feb 1, 2011 · d3e0f5b · d3e0f5b
1 parent 15d5d81
commit d3e0f5b
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/build/check_embedded.pl b/build/check_embedded.pl
@@ -177,7 +177,18 @@ sub comment {
 				next;
 			}
 
-			if (/RSA Public Key: \((\d+) bit\)/) {
+			#
+			# Extract the public key size.  This is displayed differently
+			# in different versions of OpenSSL.
+			#
+			if (/RSA Public Key: \((\d+) bit\)/) { # OpenSSL 0.9x
+				$pubSize = $1;
+				# print "   Public key size: $pubSize\n";
+				if ($pubSize < 1024) {
+					error('PUBLIC KEY TOO SHORT');
+				}
+				next;
+			} elsif (/^\s*Public-Key: \((\d+) bit\)/) { # OpenSSL 1.0
 				$pubSize = $1;
 				# print "   Public key size: $pubSize\n";
 				if ($pubSize < 1024) {