From: Martin Storsjö <martin@martin.st>
Date: Tue, 23 Apr 2013 14:54:59 +0000 (+0300)
Subject: sha: Add the missing W64_EXIT epilogue macro
X-Git-Tag: nettle_2.7_release_20130424~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c508beb65e73e3308bd2448398322be9a55ca39;p=thirdparty%2Fnettle.git

sha: Add the missing W64_EXIT epilogue macro
---

diff --git a/ChangeLog b/ChangeLog
index 8dc48dee..4a1b169d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2013-04-23  Niels Möller  <nisse@lysator.liu.se>
 
 	From Martin Storsjö:
+	* x86_64/sha256-compress.asm: Add forgotten W64_EXIT.
+	* x86_64/sha512-compress.asm: Likewise.
 	* x86_64/salsa20-crypt.asm (Lpartial): Don't return via W64_EXIT
 	within this subfunction.
 	* x86_64/machine.m4 (W64_ENTRY): Use movdqu instead of movdqa for
diff --git a/x86_64/sha256-compress.asm b/x86_64/sha256-compress.asm
index 6bfb7a78..385654c2 100644
--- a/x86_64/sha256-compress.asm
+++ b/x86_64/sha256-compress.asm
@@ -192,5 +192,6 @@ PROLOGUE(_nettle_sha256_compress)
 	mov	112(%rsp),%r15
 
 	add	$120, %rsp
+	W64_EXIT(3, 0)
 	ret
 EPILOGUE(_nettle_sha256_compress)
diff --git a/x86_64/sha512-compress.asm b/x86_64/sha512-compress.asm
index 21df82a2..663e68e9 100644
--- a/x86_64/sha512-compress.asm
+++ b/x86_64/sha512-compress.asm
@@ -192,5 +192,6 @@ PROLOGUE(_nettle_sha512_compress)
 	mov	176(%rsp),%r15
 
 	add	$184, %rsp
+	W64_EXIT(3, 0)
 	ret
 EPILOGUE(_nettle_sha512_compress)