33c33
< __FBSDID("$FreeBSD: head/contrib/telnet/libtelnet/pk.c 102250 2002-08-22 06:19:07Z nsayer $");
---
> __FBSDID("$FreeBSD: head/contrib/telnet/libtelnet/pk.c 189092 2009-02-26 21:43:15Z ed $");
71,73c71,73
< z = itom(0);
< a = itom(0);
< madd(ck, z, a);
---
> z = mp_itom(0);
> a = mp_itom(0);
> mp_madd(ck, z, a);
75c75
< sdiv(a, base, a, &r);
---
> mp_sdiv(a, base, a, &r);
79c79
< sdiv(a, base, a, &r);
---
> mp_sdiv(a, base, a, &r);
82,83c82,83
< mfree(z);
< mfree(a);
---
> mp_mfree(z);
> mp_mfree(a);
100,102c100,102
< z = itom(0);
< a = itom(0);
< madd(ck, z, a);
---
> z = mp_itom(0);
> a = mp_itom(0);
> mp_madd(ck, z, a);
104c104
< sdiv(a, base, a, &r);
---
> mp_sdiv(a, base, a, &r);
108c108
< sdiv(a, base, a, &r);
---
> mp_sdiv(a, base, a, &r);
111,112c111,112
< mfree(z);
< mfree(a);
---
> mp_mfree(z);
> mp_mfree(a);
124c124
< MINT *modulus = xtom(HEXMODULUS);
---
> MINT *modulus = mp_xtom(HEXMODULUS);
126,129c126,129
< public = xtom(xpublic);
< secret = xtom(xsecret);
< common = itom(0);
< pow(public, secret, modulus, common);
---
> public = mp_xtom(xpublic);
> secret = mp_xtom(xsecret);
> common = mp_itom(0);
> mp_pow(public, secret, modulus, common);
133,136c133,136
< mfree(common);
< mfree(secret);
< mfree(public);
< mfree(modulus);
---
> mp_mfree(common);
> mp_mfree(secret);
> mp_mfree(public);
> mp_mfree(modulus);
164,165c164,165
< MINT *pk = itom(0);
< MINT *sk = itom(0);
---
> MINT *pk = mp_itom(0);
> MINT *sk = mp_itom(0);
167,169c167,169
< MINT *base = itom(BASE);
< MINT *root = itom(PROOT);
< MINT *modulus = xtom(HEXMODULUS);
---
> MINT *base = mp_itom(BASE);
> MINT *root = mp_itom(PROOT);
> MINT *modulus = mp_xtom(HEXMODULUS);
177,180c177,180
< tmp = itom(r);
< mult(sk, base, sk);
< madd(sk, tmp, sk);
< mfree(tmp);
---
> tmp = mp_itom(r);
> mp_mult(sk, base, sk);
> mp_madd(sk, tmp, sk);
> mp_mfree(tmp);
182,186c182,186
< tmp = itom(0);
< mdiv(sk, modulus, tmp, sk);
< mfree(tmp);
< pow(root, sk, modulus, pk);
< xkey = mtox(sk);
---
> tmp = mp_itom(0);
> mp_mdiv(sk, modulus, tmp, sk);
> mp_mfree(tmp);
> mp_pow(root, sk, modulus, pk);
> xkey = mp_mtox(sk);
188c188
< xkey = mtox(pk);
---
> xkey = mp_mtox(pk);
190,194c190,194
< mfree(sk);
< mfree(base);
< mfree(pk);
< mfree(root);
< mfree(modulus);
---
> mp_mfree(sk);
> mp_mfree(base);
> mp_mfree(pk);
> mp_mfree(root);
> mp_mfree(modulus);