Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Several small bug fixes and tidies, along with a fix for non-resumable
  memory errors triggered by userspace"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Handle PIO & MEM non-resumable errors.
  sparc64: Zero pages on allocation for mondo and error queues.
  sparc: Fixed typo in sstate.c. Replaced panicing with panicking
  sparc: use symbolic names for tsb indexing

1 files changed, 4 insertions, 0 deletions

diff --git a/keypair.c b/keypair.c
index e61482c..724bf05 100644
--- a/keypair.c
+++ b/keypair.c
@@ -22,6 +22,8 @@ void generate_keypair(void)
 	xmemset(publickey, 0, sizeof(publickey));
 	xmemset(secretkey, 0, sizeof(secretkey));
 
+	curve25519_selftest();
+
 	printf("Reading from %s (this may take a while) ...\n",
 	       HIG_ENTROPY_SOURCE);
 
@@ -49,6 +51,8 @@ void verify_keypair(void)
 	unsigned char secretkey[crypto_box_sec_key_size];
 	char file[128];
 
+	curve25519_selftest();
+
 	xmemset(publickey, 0, sizeof(publickey));
 	xmemset(publicres, 0, sizeof(publicres));
 	xmemset(secretkey, 0, sizeof(secretkey));