[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6b95a37833415d8fd1abb85f85e29fb57c05b11c (commit)
      from  b7cb76461492d49b7b7cba19068573db059f361f (commit)


- Log -----------------------------------------------------------------
commit 6b95a37833415d8fd1abb85f85e29fb57c05b11c
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jan 13 20:51:41 2016 +0000

    Fix test_ordinals
    
    This used to work but somewhere along the line it broke and was failing to
    detect duplicate ordinals - which was the whole point of the test!
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/01-test_ordinals.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/01-test_ordinals.t b/test/recipes/01-test_ordinals.t
index 53fb21d..6c5efff 100755
--- a/test/recipes/01-test_ordinals.t
+++ b/test/recipes/01-test_ordinals.t
@@ -89,7 +89,7 @@ sub testordinals
         $newqual =~ s/!//g;
         if ($cnt > $tokens[1]
                 || ($cnt == $tokens[1] && ($qualifier ne $newqual
-                                           || $qualifier eq "FUNCTION"))) {
+                                           || $qualifier eq ""))) {
             print STDERR "Invalid ordinal detected: ".$tokens[1]."\n";
             $ret = 0;
             last;