projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integer type name change.
[silc.git]
/
lib
/
silcmath
/
mpbin.c
diff --git
a/lib/silcmath/mpbin.c
b/lib/silcmath/mpbin.c
index 844cb038f4c108b1d9fdfeebef954a8b96a36ac7..29d80f7711e71e007b2ddb8d20dde27fd766cd9d 100644
(file)
--- a/
lib/silcmath/mpbin.c
+++ b/
lib/silcmath/mpbin.c
@@
-25,25
+25,26
@@
must be free'd by the caller. If `len' is provided the destination
buffer is allocated that large. If zero then the size is approximated. */
must be free'd by the caller. If `len' is provided the destination
buffer is allocated that large. If zero then the size is approximated. */
-unsigned char *silc_mp_mp2bin(Silc
Int *val, ui
nt32 len,
-
ui
nt32 *ret_len)
+unsigned char *silc_mp_mp2bin(Silc
MPInt *val, SilcUI
nt32 len,
+
SilcUI
nt32 *ret_len)
{
int i;
{
int i;
-
ui
nt32 size;
+
SilcUI
nt32 size;
unsigned char *ret;
unsigned char *ret;
- SilcInt tmp;
+ Silc
MP
Int tmp;
size = (len ? len : ((silc_mp_sizeinbase(val, 2) + 7) / 8));
ret = silc_calloc(size, sizeof(*ret));
size = (len ? len : ((silc_mp_sizeinbase(val, 2) + 7) / 8));
ret = silc_calloc(size, sizeof(*ret));
- silc_mp_init_set(&tmp, val);
+ silc_mp_init(&tmp);
+ silc_mp_set(&tmp, val);
for (i = size; i > 0; i--) {
ret[i - 1] = (unsigned char)(silc_mp_get_ui(&tmp) & 0xff);
for (i = size; i > 0; i--) {
ret[i - 1] = (unsigned char)(silc_mp_get_ui(&tmp) & 0xff);
- silc_mp_
fdiv_q
_2exp(&tmp, &tmp, 8);
+ silc_mp_
div
_2exp(&tmp, &tmp, 8);
}
}
- silc_mp_
clear
(&tmp);
+ silc_mp_
uninit
(&tmp);
if (ret_len)
*ret_len = size;
if (ret_len)
*ret_len = size;
@@
-54,27
+55,28
@@
unsigned char *silc_mp_mp2bin(SilcInt *val, uint32 len,
/* Samve as above but does not allocate any memory. The encoded data is
returned into `dst' and it's length to the `ret_len'. */
/* Samve as above but does not allocate any memory. The encoded data is
returned into `dst' and it's length to the `ret_len'. */
-void silc_mp_mp2bin_noalloc(SilcInt *val, unsigned char *dst,
-
ui
nt32 dst_len)
+void silc_mp_mp2bin_noalloc(Silc
MP
Int *val, unsigned char *dst,
+
SilcUI
nt32 dst_len)
{
int i;
{
int i;
-
ui
nt32 size = dst_len;
- SilcInt tmp;
+
SilcUI
nt32 size = dst_len;
+ Silc
MP
Int tmp;
- silc_mp_init_set(&tmp, val);
+ silc_mp_init(&tmp);
+ silc_mp_set(&tmp, val);
for (i = size; i > 0; i--) {
dst[i - 1] = (unsigned char)(silc_mp_get_ui(&tmp) & 0xff);
for (i = size; i > 0; i--) {
dst[i - 1] = (unsigned char)(silc_mp_get_ui(&tmp) & 0xff);
- silc_mp_
fdiv_q
_2exp(&tmp, &tmp, 8);
+ silc_mp_
div
_2exp(&tmp, &tmp, 8);
}
}
- silc_mp_
clear
(&tmp);
+ silc_mp_
uninit
(&tmp);
}
/* Decodes binary data into MP integer. The integer sent as argument
must be initialized. */
}
/* Decodes binary data into MP integer. The integer sent as argument
must be initialized. */
-void silc_mp_bin2mp(unsigned char *data,
uint32 len, Silc
Int *ret)
+void silc_mp_bin2mp(unsigned char *data,
SilcUInt32 len, SilcMP
Int *ret)
{
int i;
{
int i;