From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 3 Mar 2000 00:06:40 +0000 (+0000)
Subject: Move the 'file scope' argument in set_label to
X-Git-Tag: OpenSSL_0_9_5a-beta1~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9c88a3902bcd9513ca99dfd8383e054494d03b2;p=openssl

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 bd9a73c281..8265c8826e 100644
--- 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 252a57bdb5..206452341d 100644
--- 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 48d9192a4e..09df993ecd 100644
--- 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");