20080611-1331

4 files changed, 17 insertions, 17 deletions

diff --git a/libkeyring/dsaalg.c b/libkeyring/dsaalg.c
index f94647bd..2af1edc9 100644
--- a/libkeyring/dsaalg.c
+++ b/libkeyring/dsaalg.c
@@ -154,13 +154,13 @@ dsa_freesig(void *a)
 }
 
 static void*
-dsa_sign(BigInt md, void *key)
+dsa_sign(mpint* md, void *key)
 {
 	return dsasign((DSApriv*)key, md);
 }
 
 static int
-dsa_verify(BigInt md, void *sig, void *key)
+dsa_verify(mpint* md, void *sig, void *key)
 {
 	return dsaverify((DSApub*)key, (DSAsig*)sig, md) == 0;
 }
diff --git a/libkeyring/egalg.c b/libkeyring/egalg.c
index 98567c95..3a914d0f 100644
--- a/libkeyring/egalg.c
+++ b/libkeyring/egalg.c
@@ -145,13 +145,13 @@ eg_genfrompk(void *vpub)
 }
 
 static void*
-eg_sign(BigInt mp, void *key)
+eg_sign(mpint* mp, void *key)
 {
 	return egsign((EGpriv*)key, mp);
 }
 
 static int
-eg_verify(BigInt mp, void *sig, void *key)
+eg_verify(mpint* mp, void *sig, void *key)
 {
 	return egverify((EGpub*)key, (EGsig*)sig, mp) == 0;
 }
diff --git a/libkeyring/keys.h b/libkeyring/keys.h
index fc57fd5c..ff1eb149 100644
--- a/libkeyring/keys.h
+++ b/libkeyring/keys.h
@@ -20,7 +20,7 @@ enum
 struct IPint
 {
 	Keyring_IPint x;
-	BigInt	b;
+	mpint*	b;
 };
 
 /* generic certificate */
@@ -98,8 +98,8 @@ struct SigAlgVec {
 
 	void*	(*gensk)(int);
 	void*	(*genskfrompk)(void*);
-	void*	(*sign)(BigInt, void*);
-	int	(*verify)(BigInt, void*, void*);
+	void*	(*sign)(mpint*, void*);
+	int	(*verify)(mpint*, void*, void*);
 
 	void	(*skfree)(void*);
 	void	(*pkfree)(void*);
@@ -112,7 +112,7 @@ struct SigAlg
 	SigAlgVec	*vec;
 };
 
-int	bigtobase64(BigInt b, char *buf, int blen);
-BigInt	base64tobig(char *str, char **strp);
+int	bigtobase64(mpint* b, char *buf, int blen);
+mpint*	base64tobig(char *str, char **strp);
 SigAlgVec*	findsigalg(char*);
-Keyring_IPint*	newIPint(BigInt);
+Keyring_IPint*	newIPint(mpint*);
diff --git a/libkeyring/rsaalg.c b/libkeyring/rsaalg.c
index 3a1d8ae1..44c3c262 100644
--- a/libkeyring/rsaalg.c
+++ b/libkeyring/rsaalg.c
@@ -50,7 +50,7 @@ rsa_str2pk(char *str, char **strp)
 static void*
 rsa_str2sig(char *str, char **strp)
 {
-	BigInt rsa;
+	mpint *rsa;
 	char *p;
 
 	rsa = base64tobig(str, &p);
@@ -101,7 +101,7 @@ rsa_pk2str(void *vrsa, char *buf, int len)
 static int
 rsa_sig2str(void *vrsa, char *buf, int len)
 {
-	BigInt rsa;
+	mpint *rsa;
 	char *cp, *ep;
 
 	rsa = vrsa;
@@ -145,18 +145,18 @@ rsa_genfrompk(void *vpub)
 }
 
 static void*
-rsa_sign(BigInt m, void *key)
+rsa_sign(mpint* m, void *key)
 {
 	return rsadecrypt((RSApriv*)key, m, nil);
 }
 
 static int
-rsa_verify(BigInt m, void *sig, void *key)
+rsa_verify(mpint* m, void *sig, void *key)
 {
-	BigInt t;
+	mpint *t;
 	int r;
 
-	t = rsaencrypt((RSApub*)key, (BigInt)sig, nil);
+	t = rsaencrypt((RSApub*)key, (mpint*)sig, nil);
 	r = mpcmp(t, m) == 0;
 	mpfree(t);
 	return r;
@@ -177,7 +177,7 @@ rsa_freepub(void *a)
 static void
 rsa_freesig(void *a)
 {
-	mpfree((BigInt)a);
+	mpfree(a);
 }
 
 SigAlgVec*