X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=blobdiff_plain;f=lib%2Fsilcmath%2Fmp_tfm.c;fp=lib%2Fsilcmath%2Fmp_tfm.c;h=9424ad97e7618a1e7ef605fe29fef1cce4531148;hp=f636ab1dda1df2126b340f7f4c6c833756281c3b;hb=abd261065eac46a2d2c970833f3fa701bc1516e3;hpb=63da89e60c01aa62254648b3aafc88261181da65

diff --git a/lib/silcmath/mp_tfm.c b/lib/silcmath/mp_tfm.c
index f636ab1d..9424ad97 100644
--- a/lib/silcmath/mp_tfm.c
+++ b/lib/silcmath/mp_tfm.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2005 - 2006 Pekka Riikonen
+  Copyright (C) 2005 - 2008 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,226 +20,384 @@
 #include "silccrypto.h"
 #include "mp_tfm.h"
 
-void silc_mp_init(SilcMPInt *mp)
+static void silc_mp_set_errno(int err)
 {
-  fp_init(mp);
+  if (err == TFM_FP_VAL)
+    silc_set_errno(SILC_ERR_INVALID_ARGUMENT);
+  else if (err == TFM_FP_MEM)
+    silc_set_errno(SILC_ERR_OUT_OF_MEMORY);
+}
+
+SilcBool silc_mp_init(SilcMPInt *mp)
+{
+  tfm_fp_init(mp);
+  return TRUE;
+}
+
+SilcBool silc_mp_sinit(SilcStack stack, SilcMPInt *mp)
+{
+  if (stack)
+    stack = silc_stack_alloc(0, stack);
+  tfm_fp_sinit(stack, mp);
+  return TRUE;
 }
 
 void silc_mp_uninit(SilcMPInt *mp)
 {
-  fp_zero(mp);
+  tfm_fp_zero(mp);
 }
 
 size_t silc_mp_size(SilcMPInt *mp)
 {
-  return fp_unsigned_bin_size(mp);
+  return tfm_fp_unsigned_bin_size(mp);
 }
 
 size_t silc_mp_sizeinbase(SilcMPInt *mp, int base)
 {
   int size = 0;
-  fp_radix_size(mp, base, &size);
+  tfm_fp_radix_size(mp, base, &size);
   if (size > 1)
     size--;
   return size;
 }
 
-void silc_mp_set(SilcMPInt *dst, SilcMPInt *src)
+SilcBool silc_mp_set(SilcMPInt *dst, SilcMPInt *src)
 {
-  fp_copy(src, dst);
+  int ret;
+  if ((ret = tfm_fp_copy(src, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_set_ui(SilcMPInt *dst, SilcUInt32 ui)
+SilcBool silc_mp_set_ui(SilcMPInt *dst, SilcUInt32 ui)
 {
-  fp_set(dst, ui);
+  int ret;
+  if ((ret = tfm_fp_set(dst, ui))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_set_si(SilcMPInt *dst, SilcInt32 si)
+SilcBool silc_mp_set_si(SilcMPInt *dst, SilcInt32 si)
 {
-  fp_set(dst, si);
+  int ret;
+  if ((ret = tfm_fp_set(dst, si))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_set_str(SilcMPInt *dst, const char *str, int base)
+SilcBool silc_mp_set_str(SilcMPInt *dst, const char *str, int base)
 {
-  fp_read_radix(dst, str, base);
+  int ret;
+  if ((ret = tfm_fp_read_radix(dst, (char *)str, base))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
 SilcUInt32 silc_mp_get_ui(SilcMPInt *mp)
 {
-  fp_int *tmp = mp;
+  tfm_fp_int *tmp = mp;
   return tmp->used > 0 ? tmp->dp[0] : 0;
 }
 
 char *silc_mp_get_str(char *str, SilcMPInt *mp, int base)
 {
-  if (fp_toradix(mp, str, base) != MP_OKAY)
+  if (tfm_fp_toradix(mp, str, base) != TFM_FP_OKAY)
     return NULL;
   return str;
 }
 
-void silc_mp_add(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_add(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_add(mp1, mp2, dst);
+  int ret;
+  if ((ret = tfm_fp_add(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_add_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
+SilcBool silc_mp_add_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  mp_add_d(mp1, (mp_digit)ui, dst);
+  int ret;
+  if ((ret = tfm_fp_add_d(mp1, (tfm_fp_digit)ui, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_sub(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_sub(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_sub(mp1, mp2, dst);
+  int ret;
+  if ((ret = tfm_fp_sub(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_sub_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
+SilcBool silc_mp_sub_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  fp_sub_d(mp1, (mp_digit)ui, dst);
+  int ret;
+  if ((ret = tfm_fp_sub_d(mp1, (tfm_fp_digit)ui, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_mul(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_mul(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_mul(mp1, mp2, dst);
+  int ret;
+  if ((ret = tfm_fp_mul(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_mul_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
+SilcBool silc_mp_mul_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  fp_mul_d(mp1, (mp_digit)ui, dst);
+  int ret;
+  if ((ret = tfm_fp_mul_d(mp1, (tfm_fp_digit)ui, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_mul_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
+SilcBool silc_mp_mul_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
 {
-  fp_mul_2d(mp1, exp, dst);
+  int ret;
+  if ((ret = tfm_fp_mul_2d(mp1, exp, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_sqrt(SilcMPInt *dst, SilcMPInt *src)
+SilcBool silc_mp_sqrt(SilcMPInt *dst, SilcMPInt *src)
 {
-  fp_sqrt(src, dst);
+  int ret;
+  if ((ret = tfm_fp_sqrt(src, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_div(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_div(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_div(mp1, mp2, dst, NULL);
+  int ret;
+  if ((ret = tfm_fp_div(mp1, mp2, dst, NULL))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_div_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
+SilcBool silc_mp_div_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  fp_div_d(mp1, (mp_digit)ui, dst, NULL);
+  int ret;
+  if ((ret = tfm_fp_div_d(mp1, (tfm_fp_digit)ui, dst, NULL))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_div_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
+SilcBool silc_mp_div_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
 		    SilcMPInt *mp2)
 {
-  fp_div(mp1, mp2, q, r);
+  int ret;
+  if ((ret = tfm_fp_div(mp1, mp2, q, r))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_div_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
+SilcBool silc_mp_div_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
 {
-  fp_div_2d(mp1, exp, dst, NULL);
+  int ret;
+  if ((ret = tfm_fp_div_2d(mp1, exp, dst, NULL))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_div_2exp_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
+SilcBool silc_mp_div_2exp_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
 			 SilcUInt32 exp)
 {
-  fp_div_2d(mp1, exp, q, r);
+  int ret;
+  if ((ret = tfm_fp_div_2d(mp1, exp, q, r))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_mod(mp1, mp2, dst);
+  int ret;
+  if ((ret = tfm_fp_mod(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
+SilcBool silc_mp_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  fp_digit d;
-  fp_mod_d(mp1, ui, &d);
-  silc_mp_set_ui(dst, d);
-}
+  tfm_fp_digit d;
+  int ret;
 
-void silc_mp_mod_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
-{
-  fp_mod_2d(mp1, ui, dst);
+  if ((ret = tfm_fp_mod_d(mp1, ui, &d))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  if ((ret = silc_mp_set_ui(dst, d))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_pow(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp)
+SilcBool silc_mp_mod_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
 {
-  SILC_NOT_IMPLEMENTED("silc_mp_pow");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_mod_2d(mp1, ui, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_pow_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
+SilcBool silc_mp_pow_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
 {
-  SILC_NOT_IMPLEMENTED("silc_mp_pow_ui");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_expt_d(mp1, (tfm_fp_digit)exp, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_pow_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp,
+SilcBool silc_mp_pow_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp,
 		     SilcMPInt *mod)
 {
-  fp_exptmod(mp1, exp, mod, dst);
+  int ret;
+  if ((ret = tfm_fp_exptmod(mp1, exp, mod, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_pow_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp,
-			SilcMPInt *mod)
+SilcBool silc_mp_pow_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp,
+			    SilcMPInt *mod)
 {
   SilcMPInt tmp;
-  silc_mp_init(&tmp);
-  silc_mp_set_ui(&tmp, exp);
-  silc_mp_pow_mod(dst, mp1, &tmp, mod);
+  int ret;
+
+  if ((ret = silc_mp_init(&tmp))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  if ((ret = silc_mp_set_ui(&tmp, exp))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  if ((ret = silc_mp_pow_mod(dst, mp1, &tmp, mod))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
   silc_mp_uninit(&tmp);
+  return TRUE;
 }
 
-void silc_mp_gcd(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_gcd(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_gcd(mp1, mp2, dst);
-}
-
-void silc_mp_gcdext(SilcMPInt *g, SilcMPInt *s, SilcMPInt *t, SilcMPInt *mp1,
-		    SilcMPInt *mp2)
-{
-  SILC_NOT_IMPLEMENTED("silc_mp_gcdext");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_gcd(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
 int silc_mp_cmp(SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  return fp_cmp(mp1, mp2);
+  return tfm_fp_cmp(mp1, mp2);
 }
 
 int silc_mp_cmp_si(SilcMPInt *mp1, SilcInt32 si)
 {
-  return fp_cmp_d(mp1, si);
+  return tfm_fp_cmp_d(mp1, si);
 }
 
 int silc_mp_cmp_ui(SilcMPInt *mp1, SilcUInt32 ui)
 {
-  return fp_cmp_d(mp1, ui);
+  return tfm_fp_cmp_d(mp1, ui);
+}
+
+SilcBool silc_mp_abs(SilcMPInt *dst, SilcMPInt *src)
+{
+  tfm_fp_abs(src, dst);
+  return TRUE;
 }
 
-void silc_mp_abs(SilcMPInt *dst, SilcMPInt *src)
+SilcBool silc_mp_neg(SilcMPInt *dst, SilcMPInt *src)
 {
-  fp_abs(src, dst);
+  tfm_fp_neg(src, dst);
+  return TRUE;
 }
 
-void silc_mp_neg(SilcMPInt *dst, SilcMPInt *src)
+SilcBool silc_mp_and(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  fp_neg(src, dst);
+  int ret;
+  if ((ret = tfm_fp_and(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_and(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_or(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  SILC_NOT_IMPLEMENTED("silc_mp_and");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_or(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_or(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_xor(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
 {
-  SILC_NOT_IMPLEMENTED("silc_mp_or");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_xor(mp1, mp2, dst))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }
 
-void silc_mp_xor(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
+SilcBool silc_mp_modinv(SilcMPInt *inv, SilcMPInt *a, SilcMPInt *n)
 {
-  SILC_NOT_IMPLEMENTED("silc_mp_xor");
-  assert(FALSE);
+  int ret;
+  if ((ret = tfm_fp_invmod(a, n, inv))) {
+    silc_mp_set_errno(ret);
+    return FALSE;
+  }
+  return TRUE;
 }