Move the 'file scope' argument in set_label to

the third argument: the second was being used
already.

diff --git a/CHANGES b/CHANGES
index bd9a73c2813f1f07049c0a56a488d034511a6d47..8265c8826e101a444e1c44745bf0e9cf22e773b1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.5 and 0.9.6  [XX XXX 2000]
 
+  *) The second argument to set_label in perlasm was already being used
+     so couldn't be used as a "file scope" flag. Moved to third argument
+     which was free.
+     [Steve Henson]
+
   *) In PEM_ASN1_write_bio and some other functions, use RAND_pseudo_bytes
      instead of RAND_bytes for encryption IVs and salts.
      [Bodo Moeller]

diff --git a/crypto/perlasm/x86ms.pl b/crypto/perlasm/x86ms.pl
index 252a57bdb514f7dd5287f94ebcf6a14f6cb2004f..206452341d1faf5c444be80d68282bb34f338d5d 100644 (file)
--- a/crypto/perlasm/x86ms.pl
+++ b/crypto/perlasm/x86ms.pl
@@ -341,7 +341,7 @@ sub main'set_label
                $label{$_[0]}="${label}${_[0]}";
                $label++;
                }
-       if((defined $_[1]) && ($_[1] == 1))
+       if((defined $_[2]) && ($_[2] == 1))
                {
                push(@out,"$label{$_[0]}::\n");
                }

diff --git a/crypto/sha/asm/sha1-586.pl b/crypto/sha/asm/sha1-586.pl
index 48d9192a4e6bbd94057f49474f9b3a435c1330fe..09df993ecd4e09b91523db2f81ad968e2993cac6 100644 (file)
--- a/crypto/sha/asm/sha1-586.pl
+++ b/crypto/sha/asm/sha1-586.pl
@@ -392,7 +392,7 @@ sub sha1_block_data
        &X_expand("esi");
         &mov(&wparam(1),"esi");
 
-       &set_label("shortcut", 1);
+       &set_label("shortcut", 0, 1);
        &comment("");
        &comment("Start processing");