Move the 'file scope' argument in set_label to
authorDr. Stephen Henson <steve@openssl.org>
Fri, 3 Mar 2000 00:06:40 +0000 (00:06 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Fri, 3 Mar 2000 00:06:40 +0000 (00:06 +0000)
the third argument: the second was being used
already.

CHANGES
crypto/perlasm/x86ms.pl
crypto/sha/asm/sha1-586.pl

diff --git a/CHANGES b/CHANGES
index bd9a73c..8265c88 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.5 and 0.9.6  [XX XXX 2000]
 
 
  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]
   *) In PEM_ASN1_write_bio and some other functions, use RAND_pseudo_bytes
      instead of RAND_bytes for encryption IVs and salts.
      [Bodo Moeller]
index 252a57b..2064523 100644 (file)
@@ -341,7 +341,7 @@ sub main'set_label
                $label{$_[0]}="${label}${_[0]}";
                $label++;
                }
                $label{$_[0]}="${label}${_[0]}";
                $label++;
                }
-       if((defined $_[1]) && ($_[1] == 1))
+       if((defined $_[2]) && ($_[2] == 1))
                {
                push(@out,"$label{$_[0]}::\n");
                }
                {
                push(@out,"$label{$_[0]}::\n");
                }
index 48d9192..09df993 100644 (file)
@@ -392,7 +392,7 @@ sub sha1_block_data
        &X_expand("esi");
         &mov(&wparam(1),"esi");
 
        &X_expand("esi");
         &mov(&wparam(1),"esi");
 
-       &set_label("shortcut", 1);
+       &set_label("shortcut", 0, 1);
        &comment("");
        &comment("Start processing");
 
        &comment("");
        &comment("Start processing");