In mkdef.pl ignore trailing whitespace in #ifdef lines

diff --git a/util/libeay.num b/util/libeay.num
index a6be820d773fb15deb33095e3a433984918824c2..562b338cf61725d3fa36ddb10574878f240842b0 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2845,13 +2845,13 @@ X509_check_ca                           3286    EXIST::FUNCTION:
 private_idea_set_encrypt_key            3287   EXIST:OPENSSL_FIPS:FUNCTION:IDEA
 HMAC_CTX_set_flags                      3288   EXIST::FUNCTION:HMAC
 private_SHA_Init                        3289   EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
-private_CAST_set_key                    3290   EXIST::FUNCTION:CAST
+private_CAST_set_key                    3290   EXIST:OPENSSL_FIPS:FUNCTION:CAST
 private_RIPEMD160_Init                  3291   EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
-private_RC5_32_set_key                  3292   EXIST::FUNCTION:RC5
+private_RC5_32_set_key                  3292   EXIST:OPENSSL_FIPS:FUNCTION:RC5
 private_MD5_Init                        3293   EXIST:OPENSSL_FIPS:FUNCTION:MD5
 private_RC4_set_key                     3294   EXIST:OPENSSL_FIPS:FUNCTION:RC4
 private_MDC2_Init                       3295   EXIST:OPENSSL_FIPS:FUNCTION:MDC2
-private_RC2_set_key                     3296   EXIST::FUNCTION:RC2
+private_RC2_set_key                     3296   EXIST:OPENSSL_FIPS:FUNCTION:RC2
 private_MD4_Init                        3297   EXIST:OPENSSL_FIPS:FUNCTION:MD4
-private_BF_set_key                      3298   EXIST::FUNCTION:BF
+private_BF_set_key                      3298   EXIST:OPENSSL_FIPS:FUNCTION:BF
 private_MD2_Init                        3299   EXIST:OPENSSL_FIPS:FUNCTION:MD2

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 443d74d4481a1d2b9f9623ceeabeaf8047c91143..9918c3d549c46b9f17c5088f0d863f818e3de6ec 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -472,7 +472,7 @@ sub do_defs
                                        push(@tag,$1);
                                        $tag{$1}=-1;
                                }
-                       } elsif (/^\#\s*ifdef\s+(.*)/) {
+                       } elsif (/^\#\s*ifdef\s+(\S*)/) {
                                push(@tag,"-");
                                push(@tag,$1);
                                $tag{$1}=1;