From d3e0f5bee41847338eefaba6b58811a6300d974c Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 1 Feb 2011 13:55:37 +0000
Subject: [PATCH] Handle the new format OpenSSL 1.0.0c uses for public key
 size.

---
 build/check_embedded.pl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build/check_embedded.pl b/build/check_embedded.pl
index 61963e93..30b5b399 100755
--- 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) {