updates. New data types.

[silc.git] / lib / silcmath / mpbin.c

diff --git a/lib/silcmath/mpbin.c b/lib/silcmath/mpbin.c
index 6e0e6eadb384663e068cf60c28445d6f26c2d86e..844cb038f4c108b1d9fdfeebef954a8b96a36ac7 100644 (file)
--- a/lib/silcmath/mpbin.c
+++ b/lib/silcmath/mpbin.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 2000 Pekka Riikonen
+  Copyright (C) 2000 - 2001 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
@@ -22,18 +22,20 @@
 #include "silcincludes.h"
 
 /* Encodes MP integer into binary data. Returns allocated data that
-   must be free'd by the caller. */
+   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(SilcInt *val, unsigned int *ret_len)
+unsigned char *silc_mp_mp2bin(SilcInt *val, uint32 len,
+                             uint32 *ret_len)
 {
   int i;
-  unsigned int size;
+  uint32 size;
   unsigned char *ret;
   SilcInt tmp;
 
-  size = (silc_mp_sizeinbase(val, 2) + 7) / 8;
+  size = (len ? len : ((silc_mp_sizeinbase(val, 2) + 7) / 8));
   ret = silc_calloc(size, sizeof(*ret));
-
+  
   silc_mp_init_set(&tmp, val);
 
   for (i = size; i > 0; i--) {
@@ -49,10 +51,30 @@ unsigned char *silc_mp_mp2bin(SilcInt *val, unsigned int *ret_len)
   return ret;
 }
 
+/* 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,
+                           uint32 dst_len)
+{
+  int i;
+  uint32 size = dst_len;
+  SilcInt tmp;
+
+  silc_mp_init_set(&tmp, val);
+
+  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_clear(&tmp);
+}
+
 /* Decodes binary data into MP integer. The integer sent as argument
    must be initialized. */
 
-void silc_mp_bin2mp(unsigned char *data, unsigned int len, SilcInt *ret)
+void silc_mp_bin2mp(unsigned char *data, uint32 len, SilcInt *ret)
 {
   int i;