AC_PROG_CC
AC_PROG_LIBTOOL
-AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [Use OpenSSL instead of GMP (beware of the OpenSSL license)]), [enable_openssl=$enableval], [enable_openssl=no])
-AM_CONDITIONAL(ENABLE_OPENSSL, [test x$enable_openssl = xyes])
+AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [Use OpenSSL instead of GMP (beware of the OpenSSL license)]), [with_openssl=$enableval], [with_openssl=no])
+AM_CONDITIONAL(WITH_OPENSSL, [test x"$with_openssl" != xno])
-if test x$enable_openssl = xyes
-then
- AC_SEARCH_LIBS(BN_init, ssl, , [AC_MSG_ERROR([OpenSSL not found, see http://www.openssl.org/, or try --without-openssl])])
-else
- AC_SEARCH_LIBS(__gmpz_init, gmp, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/, or try --with-openssl])])
-fi
+AS_IF([test x"$with_openssl" != xno],
+ [AC_SEARCH_LIBS(BN_init, ssl, , [AC_MSG_ERROR([OpenSSL not found, see http://www.openssl.org/, or try --without-openssl])])],
+ [AC_SEARCH_LIBS(__gmpz_init, gmp, , [AC_MSG_ERROR([GNU MP not found, see http://gmplib.org/, or try --with-openssl])])])
AC_ARG_ENABLE(rijndael, AS_HELP_STRING([--disable-rijndael], [Disable build of the d0_rijndael library]), [enable_aes=$enableval], [enable_aes=yes])
AM_CONDITIONAL(ENABLE_RIJNDAEL, [test x$enable_aes = xyes])
#include "d0_bignum.h"
+#include <assert.h>
+#include <string.h>
#include <openssl/bn.h>
struct d0_bignum_s
};
static d0_bignum_t temp;
-static BN_CTX ctx;
+static BN_CTX *ctx;
#include <time.h>
#include <stdio.h>
WARN_UNUSED_RESULT BOOL d0_bignum_INITIALIZE(void)
{
- BN_CTX_init(&ctx);
+ ctx = BN_CTX_new();
d0_bignum_init(&temp);
return 1;
}
void d0_bignum_SHUTDOWN(void)
{
d0_bignum_clear(&temp);
- BN_CTX_free(&ctx);
+ BN_CTX_free(ctx);
+ ctx = NULL;
}
BOOL d0_iobuf_write_bignum(d0_iobuf_t *buf, const d0_bignum_t *bignum)
count = BN_num_bytes(&bignum->z);
if(count > sizeof(numbuf) - 1)
return 0;
- BN_bn2bin(numbuf+1, &bignum->z);
+ BN_bn2bin(&bignum->z, numbuf+1);
}
return d0_iobuf_write_packet(buf, numbuf, count + 1);
}
d0_bignum_t *d0_bignum_mul(d0_bignum_t *r, const d0_bignum_t *a, const d0_bignum_t *b)
{
if(!r) r = d0_bignum_new(); if(!r) return NULL;
- BN_mul(&r->z, &a->z, &b->z);
+ BN_mul(&r->z, &a->z, &b->z, ctx);
return r;
}
if(q)
{
if(m)
- BN_div(&q->z, &m->z, &a->z, &b->z, &ctx);
+ BN_div(&q->z, &m->z, &a->z, &b->z, ctx);
else
- BN_div(&q->z, NULL, &a->z, &b->z, &ctx);
+ BN_div(&q->z, NULL, &a->z, &b->z, ctx);
assert(!"I know this code is broken (rounds towards zero), need handle negative correctly");
}
else
- BN_nnmod(&q->z, NULL, &a->z, &b->z, &ctx);
+ BN_nnmod(&q->z, &a->z, &b->z, ctx);
if(m)
return m;
else
d0_bignum_t *d0_bignum_mod_add(d0_bignum_t *r, const d0_bignum_t *a, const d0_bignum_t *b, const d0_bignum_t *m)
{
if(!r) r = d0_bignum_new(); if(!r) return NULL;
- BN_mod_add(&r->z, &a->z, &b->z, &m->z, &ctx);
+ BN_mod_add(&r->z, &a->z, &b->z, &m->z, ctx);
return r;
}
d0_bignum_t *d0_bignum_mod_mul(d0_bignum_t *r, const d0_bignum_t *a, const d0_bignum_t *b, const d0_bignum_t *m)
{
if(!r) r = d0_bignum_new(); if(!r) return NULL;
- BN_mod_mul(&r->z, &a->z, &b->z, &m->z, &ctx);
+ BN_mod_mul(&r->z, &a->z, &b->z, &m->z, ctx);
return r;
}
d0_bignum_t *d0_bignum_mod_pow(d0_bignum_t *r, const d0_bignum_t *a, const d0_bignum_t *b, const d0_bignum_t *m)
{
if(!r) r = d0_bignum_new(); if(!r) return NULL;
- BN_mod_exp(&r->z, &a->z, &b->z, &m->z, &ctx);
+ BN_mod_exp(&r->z, &a->z, &b->z, &m->z, ctx);
return r;
}
BOOL d0_bignum_mod_inv(d0_bignum_t *r, const d0_bignum_t *a, const d0_bignum_t *m)
{
// here, r MUST be set, as otherwise we cannot return error state!
- return !!BN_mod_inverse(&r->z, &a->z, &m->z, &ctx);
+ return !!BN_mod_inverse(&r->z, &a->z, &m->z, ctx);
}
int d0_bignum_isprime(d0_bignum_t *r, int param)
{
- return BN_is_prime(&r->z, param, NULL, &ctx, NULL);
+ return BN_is_prime(&r->z, param, NULL, ctx, NULL);
}
d0_bignum_t *d0_bignum_gcd(d0_bignum_t *r, d0_bignum_t *s, d0_bignum_t *t, const d0_bignum_t *a, const d0_bignum_t *b)
else if(t)
assert(!"Extended gcd not implemented");
else
- BN_gcd(&r->z, &a->z, &b->z, &ctx);
+ BN_gcd(&r->z, &a->z, &b->z, ctx);
return r;
}