[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Rich Salz]

The branch OpenSSL_1_0_1-stable has been updated
       via  32b2ad7e071d0e766da6956f5b0c9cf2ccb18388 (commit)
      from  1977240204fbb85087d15a75c4a2169820eff787 (commit)


- Log -----------------------------------------------------------------
commit 32b2ad7e071d0e766da6956f5b0c9cf2ccb18388
Author: Annie Yousar <a.yousar at informatik.hu-berlin.de>
Date:   Sun May 3 09:05:47 2015 -0400

    RT3230: Better test for C identifier
    
    objects.pl only looked for a space to see if the name could be
    used as a C identifier.  Improve the test to match the real C
    rules.
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (cherry picked from commit 591b7aef05b22cba09b179e5787a9bf40dfc9508)

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

Summary of changes:
 crypto/objects/objects.README | 8 ++++----
 crypto/objects/objects.pl     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/objects/objects.README b/crypto/objects/objects.README
index 4d74550..cb1d216 100644
--- a/crypto/objects/objects.README
+++ b/crypto/objects/objects.README
@@ -8,9 +8,9 @@ The basic syntax for adding an object is as follows:
 
 	1 2 3 4		: shortName	: Long Name
 
-		If the long name doesn't contain spaces, or no short name
-		exists, the long name is used as basis for the base name
-		in C.  Otherwise, the short name is used.
+		If Long Name contains only word characters and hyphen-minus
+		(0x2D) or full stop (0x2E) then Long Name is used as basis
+		for the base name in C. Otherwise, the shortName is used.
 
 		The base name (let's call it 'base') will then be used to
 		create the C macros SN_base, LN_base, NID_base and OBJ_base.
@@ -22,7 +22,7 @@ Then there are some extra commands:
 
 	!Alias foo 1 2 3 4
 
-		This juts makes a name foo for an OID.  The C macro
+		This just makes a name foo for an OID.  The C macro
 		OBJ_foo will be created as a result.
 
 	!Cname foo
diff --git a/crypto/objects/objects.pl b/crypto/objects/objects.pl
index d0ed459..389dc34 100644
--- a/crypto/objects/objects.pl
+++ b/crypto/objects/objects.pl
@@ -67,7 +67,7 @@ while (<IN>)
 		$myoid = &process_oid($myoid);
 		}
 
-	if ($Cname eq "" && !($myln =~ / /))
+	if ($Cname eq "" && ($myln =~ /^[_A-Za-z][\w.-]*$/ ))
 		{
 		$Cname = $myln;
 		$Cname =~ s/\./_/g;