aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--crypto/perlasm/x86ms.pl2
-rw-r--r--crypto/sha/asm/sha1-586.pl2
3 files changed, 7 insertions, 2 deletions
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");