From 0bacb77c22c1a789cafb435d8b781dc33873fe06 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Thu, 12 Aug 2010 11:28:17 +0200
Subject: Fix prime testing

Upstream commit a53ea341274300323cd2e664440d8bc0c4d8328a
---
 libtommath/bn_mp_prime_next_prime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libtommath/bn_mp_prime_next_prime.c b/libtommath/bn_mp_prime_next_prime.c
index daf2ec7c647..bc31cc72086 100644
--- a/libtommath/bn_mp_prime_next_prime.c
+++ b/libtommath/bn_mp_prime_next_prime.c
@@ -143,7 +143,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
 
       /* is this prime? */
       for (x = 0; x < t; x++) {
-          mp_set(&b, ltm_prime_tab[t]);
+          mp_set(&b, ltm_prime_tab[x]);
           if ((err = mp_prime_miller_rabin(a, &b, &res)) != MP_OKAY) {
              goto LBL_ERR;
           }
-- 
cgit 


From 508e34701e23dbceaacdfd673fa0259fe1bc4165 Mon Sep 17 00:00:00 2001
From: Miloslav Trmač <mitr@redhat.com>
Date: Tue, 17 Aug 2010 20:11:44 +0200
Subject: Drop unnecessary "file *" argument to ncr_ioctl()

---
 cryptodev_main.c | 2 +-
 ncr-int.h        | 3 +--
 ncr.c            | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/cryptodev_main.c b/cryptodev_main.c
index a056b447731..da75672615a 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -828,7 +828,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp,
 			return 0;
 
 		default:
-			return ncr_ioctl(pcr->ncr, filp, cmd, arg_);
+			return ncr_ioctl(pcr->ncr, cmd, arg_);
 	}
 }
 
diff --git a/ncr-int.h b/ncr-int.h
index 06c5e62d092..75e06efe524 100644
--- a/ncr-int.h
+++ b/ncr-int.h
@@ -109,8 +109,7 @@ struct ncr_lists {
 void* ncr_init_lists(void);
 void ncr_deinit_lists(struct ncr_lists *lst);
 
-int ncr_ioctl(struct ncr_lists*, struct file *filp,
-		unsigned int cmd, unsigned long arg);
+int ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg);
 
 /* key derivation */
 int ncr_key_derive(struct list_sem_st* key_lst, void __user* arg);
diff --git a/ncr.c b/ncr.c
index 1cbe2158070..e6a22776ab5 100644
--- a/ncr.c
+++ b/ncr.c
@@ -117,8 +117,7 @@ struct ncr_master_key_st st;
 }
 
 int
-ncr_ioctl(struct ncr_lists* lst, struct file *filp,
-		unsigned int cmd, unsigned long arg_)
+ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg_)
 {
 	void __user *arg = (void __user *)arg_;
 
-- 
cgit