Upgrade to tpm-emulator version 0.7.

crypto/bn.c

-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2006 Mario Strasser <mast@gmx.net>,
- *                    Swiss Federal Institute of Technology (ETH) Zurich
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
  *
  * This module is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
  *
  * This module is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * $Id$
+ * $Id: bn.c 406 2010-02-19 11:08:30Z mast $
  */
  
 #include "bn.h"
 
 void tpm_bn_init(tpm_bn_t a)
 {
   mpz_init(a);
 }
 
 void tpm_bn_init2(tpm_bn_t a, size_t nbits)
 {
-  mpz_init2(a, nbits + + GMP_NUMB_BITS);
+  mpz_init2(a, nbits + GMP_NUMB_BITS);
 }
 
 void tpm_bn_init_set(tpm_bn_t a, tpm_bn_t val)
 {
   mpz_init_set(a, val);     
 }
 
 void tpm_bn_init_set_ui(tpm_bn_t a, uint32_t val)
 {
   mpz_init_set_ui(a, val);
@@ skipping 19 matching lines @@
   return mpz_sizeinbase(a, 2);
 }
 
 void tpm_bn_import(tpm_bn_t out, size_t count, int order, const void *in)
 {
   mpz_import(out, count, order, 1, 0, 0, in);
 }
 
 void tpm_bn_export(void *out, size_t *count, int order, tpm_bn_t in)
 {
-  mpz_export(out, count, order, 1, 0, 0, in);
+  size_t count_out;
+  mpz_export(out, &count_out, order, 1, 0, 0, in);
+  if (count != NULL) *count = count_out;
 }
 
 int tpm_bn_cmp(tpm_bn_t a, tpm_bn_t b)
 {
   return mpz_cmp(a, b);
 }
 
 int tpm_bn_cmp_ui(tpm_bn_t a, uint32_t b)
 {
   return mpz_cmp_ui(a, b);
@@ skipping 68 matching lines @@
 {
   mpz_invert(res, a, b);
 }
 
 void tpm_bn_nextprime(tpm_bn_t res, tpm_bn_t a)
 {
   mpz_nextprime(res, a);
 }