Improve own gcrypt function.

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@711 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-05-04 13:52:27 +00:00
parent ff60d8ce22
commit 61ebfcfa5c

View File

@@ -27,53 +27,74 @@
#include "libssh/priv.h" #include "libssh/priv.h"
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
int my_gcry_dec2bn(bignum *bn, const char *data) int my_gcry_dec2bn(bignum *bn, const char *data) {
{
int count; int count;
*bn = bignum_new(); *bn = bignum_new();
if (*bn == NULL) {
return 0;
}
gcry_mpi_set_ui(*bn, 0); gcry_mpi_set_ui(*bn, 0);
for (count = 0; data[count]; ++count) for (count = 0; data[count]; count++) {
{
gcry_mpi_mul_ui(*bn, *bn, 10); gcry_mpi_mul_ui(*bn, *bn, 10);
gcry_mpi_add_ui(*bn, *bn, data[count] - '0'); gcry_mpi_add_ui(*bn, *bn, data[count] - '0');
} }
return count; return count;
} }
char *my_gcry_bn2dec(bignum bn) char *my_gcry_bn2dec(bignum bn) {
{ bignum bndup, num, ten;
char *ret;
int count, count2; int count, count2;
int size, rsize; int size, rsize;
char *ret;
bignum bndup, num, ten;
char decnum; char decnum;
size = gcry_mpi_get_nbits(bn) * 3; size = gcry_mpi_get_nbits(bn) * 3;
rsize = size / 10 + size / 1000 + 2; rsize = size / 10 + size / 1000 + 2;
ret = malloc(rsize + 1); ret = malloc(rsize + 1);
if (!gcry_mpi_cmp_ui(bn, 0)) if (ret == NULL) {
return NULL;
}
if (!gcry_mpi_cmp_ui(bn, 0)) {
strcpy(ret, "0"); strcpy(ret, "0");
else } else {
{ ten = bignum_new();
for (bndup = gcry_mpi_copy(bn), ten = bignum_new(), num = bignum_new(), if (ten == NULL) {
bignum_set_word(ten, 10), count = rsize; count; --count) SAFE_FREE(ret);
{ return NULL;
}
num = bignum_new();
if (num == NULL) {
SAFE_FREE(ret);
bignum_free(ten);
return NULL;
}
for (bndup = gcry_mpi_copy(bn), bignum_set_word(ten, 10), count = rsize;
count; count--) {
gcry_mpi_div(bndup, num, bndup, ten, 0); gcry_mpi_div(bndup, num, bndup, ten, 0);
for (decnum = 0, count2 = gcry_mpi_get_nbits(num); count2; decnum *= 2, for (decnum = 0, count2 = gcry_mpi_get_nbits(num); count2;
decnum += (gcry_mpi_test_bit(num, count2 - 1) ? 1 : 0), --count2) decnum *= 2, decnum += (gcry_mpi_test_bit(num, count2 - 1) ? 1 : 0),
; count2--)
;
ret[count - 1] = decnum + '0'; ret[count - 1] = decnum + '0';
} }
for (count = 0; count < rsize && ret[count] == '0'; ++count) for (count = 0; count < rsize && ret[count] == '0'; count++)
; ;
for (count2 = 0; count2 < rsize - count; ++count2) for (count2 = 0; count2 < rsize - count; ++count2) {
ret[count2] = ret[count2 + count]; ret[count2] = ret[count2 + count];
}
ret[count2] = 0; ret[count2] = 0;
bignum_free(num); bignum_free(num);
bignum_free(bndup); bignum_free(bndup);
bignum_free(ten); bignum_free(ten);
} }
return ret; return ret;
} }
#endif #endif