projects
/
crypto.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[crypto.git]
/
lib
/
silcmath
/
mp_tma.c
diff --git
a/lib/silcmath/mp_mpi.c
b/lib/silcmath/mp_tma.c
similarity index 74%
rename from
lib/silcmath/mp_mpi.c
rename to
lib/silcmath/mp_tma.c
index 8ef0a40b5100e11ea8cfcecb3dfa6d0b974b1523..ba9f21205ef03e4673b17048fb9c83153eb3af22 100644
(file)
--- a/
lib/silcmath/mp_mpi.c
+++ b/
lib/silcmath/mp_tma.c
@@
-1,10
+1,10
@@
/*
/*
- mp_
mpi.c
+ mp_
tma.c
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 200
1
Pekka Riikonen
+ Copyright (C) 200
5
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
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
@@
-19,8
+19,7
@@
/* $Id$ */
#include "silcincludes.h"
/* $Id$ */
#include "silcincludes.h"
-#include "mpi.h"
-#include "mplogic.h"
+#include "mp_tma.h"
void silc_mp_init(SilcMPInt *mp)
{
void silc_mp_init(SilcMPInt *mp)
{
@@
-29,22
+28,21
@@
void silc_mp_init(SilcMPInt *mp)
void silc_mp_uninit(SilcMPInt *mp)
{
void silc_mp_uninit(SilcMPInt *mp)
{
-
(void)
mp_clear(mp);
+ mp_clear(mp);
}
size_t silc_mp_size(SilcMPInt *mp)
{
}
size_t silc_mp_size(SilcMPInt *mp)
{
- return mp_
raw
_size(mp);
+ return mp_
unsigned_bin
_size(mp);
}
size_t silc_mp_sizeinbase(SilcMPInt *mp, int base)
{
}
size_t silc_mp_sizeinbase(SilcMPInt *mp, int base)
{
- size_t sib = mp_unsigned_octet_size(mp);
- sib = s_mp_outlen(sib * CHAR_BIT, base);
- if (sib > 2)
- sib -= 2; /* Looks like MPI returns extra zero
- bytes for C-strings. */
- return sib;
+ int size = 0;
+ mp_radix_size(mp, base, &size);
+ if (size > 1)
+ size--;
+ return size;
}
void silc_mp_set(SilcMPInt *dst, SilcMPInt *src)
}
void silc_mp_set(SilcMPInt *dst, SilcMPInt *src)
@@
-54,7
+52,7
@@
void silc_mp_set(SilcMPInt *dst, SilcMPInt *src)
void silc_mp_set_ui(SilcMPInt *dst, SilcUInt32 ui)
{
void silc_mp_set_ui(SilcMPInt *dst, SilcUInt32 ui)
{
-
mp_se
t(dst, ui);
+
(void)mp_set_in
t(dst, ui);
}
void silc_mp_set_si(SilcMPInt *dst, SilcInt32 si)
}
void silc_mp_set_si(SilcMPInt *dst, SilcInt32 si)
@@
-64,12
+62,12
@@
void silc_mp_set_si(SilcMPInt *dst, SilcInt32 si)
void silc_mp_set_str(SilcMPInt *dst, const char *str, int base)
{
void silc_mp_set_str(SilcMPInt *dst, const char *str, int base)
{
- (void)mp_read_
variable_
radix(dst, str, base);
+ (void)mp_read_radix(dst, str, base);
}
SilcUInt32 silc_mp_get_ui(SilcMPInt *mp)
{
}
SilcUInt32 silc_mp_get_ui(SilcMPInt *mp)
{
- return (SilcUInt32)
MP_DIGIT(mp, 0
);
+ return (SilcUInt32)
mp_get_int(mp
);
}
char *silc_mp_get_str(char *str, SilcMPInt *mp, int base)
}
char *silc_mp_get_str(char *str, SilcMPInt *mp, int base)
@@
-86,7
+84,7
@@
void silc_mp_add(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
void silc_mp_add_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
void silc_mp_add_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
- mp_add_d(mp1, ui, dst);
+ mp_add_d(mp1,
(mp_digit)
ui, dst);
}
void silc_mp_sub(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
}
void silc_mp_sub(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
@@
-111,11
+109,7
@@
void silc_mp_mul_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
void silc_mp_mul_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
{
void silc_mp_mul_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
{
- SilcMPInt tmp;
- silc_mp_init(&tmp);
- (void)mp_2expt(&tmp, (mp_digit)exp);
- (void)mp_mul(mp1, &tmp, dst);
- silc_mp_uninit(&tmp);
+ (void)mp_mul_2d(mp1, exp, dst);
}
void silc_mp_sqrt(SilcMPInt *dst, SilcMPInt *src)
}
void silc_mp_sqrt(SilcMPInt *dst, SilcMPInt *src)
@@
-133,7
+127,7
@@
void silc_mp_div_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
(void)mp_div_d(mp1, (mp_digit)ui, dst, NULL);
}
(void)mp_div_d(mp1, (mp_digit)ui, dst, NULL);
}
-void silc_mp_div_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
+void silc_mp_div_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
SilcMPInt *mp2)
{
(void)mp_div(mp1, mp2, q, r);
SilcMPInt *mp2)
{
(void)mp_div(mp1, mp2, q, r);
@@
-141,20
+135,13
@@
void silc_mp_div_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
void silc_mp_div_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
{
void silc_mp_div_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
{
- SilcMPInt tmp;
- silc_mp_init(&tmp);
- (void)mp_2expt(&tmp, (mp_digit)exp);
- (void)mp_div(mp1, &tmp, dst, NULL);
- silc_mp_uninit(&tmp);
+ (void)mp_div_2d(mp1, exp, dst, NULL);
}
}
-void silc_mp_div_2exp_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
+void silc_mp_div_2exp_qr(SilcMPInt *q, SilcMPInt *r, SilcMPInt *mp1,
SilcUInt32 exp)
{
SilcUInt32 exp)
{
- if (q) {
- (void)mp_2expt(q, (mp_digit)exp);
- (void)mp_div(mp1, q, q, r);
- }
+ (void)mp_div_2d(mp1, exp, q, r);
}
void silc_mp_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
}
void silc_mp_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
@@
-164,23
+151,20
@@
void silc_mp_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
void silc_mp_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
void silc_mp_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
- mp_digit
uidst
;
- (void)mp_mod_d(mp1,
(mp_digit)ui, &uidst
);
-
mp_set(dst, uidst
);
+ mp_digit
d
;
+ (void)mp_mod_d(mp1,
ui, &d
);
+
silc_mp_set_ui(dst, d
);
}
void silc_mp_mod_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
}
void silc_mp_mod_2exp(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 ui)
{
- SilcMPInt tmp;
- silc_mp_init(&tmp);
- (void)mp_2expt(&tmp, (mp_digit)ui);
- (void)mp_mod(mp1, &tmp, dst);
- silc_mp_uninit(&tmp);
+ (void)mp_mod_2d(mp1, ui, dst);
}
void silc_mp_pow(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp)
{
}
void silc_mp_pow(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp)
{
- (void)mp_expt(mp1, exp, dst);
+ SILC_NOT_IMPLEMENTED("silc_mp_pow");
+ assert(FALSE);
}
void silc_mp_pow_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
}
void silc_mp_pow_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
@@
-188,16
+172,20
@@
void silc_mp_pow_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp)
(void)mp_expt_d(mp1, (mp_digit)exp, dst);
}
(void)mp_expt_d(mp1, (mp_digit)exp, dst);
}
-void silc_mp_pow_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp,
+void silc_mp_pow_mod(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *exp,
SilcMPInt *mod)
{
(void)mp_exptmod(mp1, exp, mod, dst);
}
SilcMPInt *mod)
{
(void)mp_exptmod(mp1, exp, mod, dst);
}
-void silc_mp_pow_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp,
+void silc_mp_pow_mod_ui(SilcMPInt *dst, SilcMPInt *mp1, SilcUInt32 exp,
SilcMPInt *mod)
{
SilcMPInt *mod)
{
- (void)mp_exptmod_d(mp1, (mp_digit)exp, mod, dst);
+ SilcMPInt tmp;
+ silc_mp_init(&tmp);
+ silc_mp_set_ui(&tmp, exp);
+ silc_mp_pow_mod(dst, mp1, &tmp, mod);
+ silc_mp_uninit(&tmp);
}
void silc_mp_gcd(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
}
void silc_mp_gcd(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
@@
-208,7
+196,7
@@
void silc_mp_gcd(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
void silc_mp_gcdext(SilcMPInt *g, SilcMPInt *s, SilcMPInt *t, SilcMPInt *mp1,
SilcMPInt *mp2)
{
void silc_mp_gcdext(SilcMPInt *g, SilcMPInt *s, SilcMPInt *t, SilcMPInt *mp1,
SilcMPInt *mp2)
{
- (void)mp_
xgcd(mp1, mp2, g, s, t
);
+ (void)mp_
exteuclid(mp1, mp2, s, t, g
);
}
int silc_mp_cmp(SilcMPInt *mp1, SilcMPInt *mp2)
}
int silc_mp_cmp(SilcMPInt *mp1, SilcMPInt *mp2)
@@
-218,7
+206,7
@@
int silc_mp_cmp(SilcMPInt *mp1, SilcMPInt *mp2)
int silc_mp_cmp_si(SilcMPInt *mp1, SilcInt32 si)
{
int silc_mp_cmp_si(SilcMPInt *mp1, SilcInt32 si)
{
- return mp_cmp_
int(mp1, (long)
si);
+ return mp_cmp_
d(mp1,
si);
}
int silc_mp_cmp_ui(SilcMPInt *mp1, SilcUInt32 ui)
}
int silc_mp_cmp_ui(SilcMPInt *mp1, SilcUInt32 ui)
@@
-228,25
+216,25
@@
int silc_mp_cmp_ui(SilcMPInt *mp1, SilcUInt32 ui)
void silc_mp_abs(SilcMPInt *dst, SilcMPInt *src)
{
void silc_mp_abs(SilcMPInt *dst, SilcMPInt *src)
{
- mp_abs(src, dst);
+
(void)
mp_abs(src, dst);
}
void silc_mp_neg(SilcMPInt *dst, SilcMPInt *src)
{
}
void silc_mp_neg(SilcMPInt *dst, SilcMPInt *src)
{
- mp_neg(src, dst);
+
(void)
mp_neg(src, dst);
}
void silc_mp_and(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
}
void silc_mp_and(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
-
mpl
_and(mp1, mp2, dst);
+
(void)mp
_and(mp1, mp2, dst);
}
void silc_mp_or(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
}
void silc_mp_or(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
-
mpl
_or(mp1, mp2, dst);
+
(void)mp
_or(mp1, mp2, dst);
}
void silc_mp_xor(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
}
void silc_mp_xor(SilcMPInt *dst, SilcMPInt *mp1, SilcMPInt *mp2)
{
-
mpl
_xor(mp1, mp2, dst);
+
(void)mp
_xor(mp1, mp2, dst);
}
}