From f3b834d5366011e1e4b340c7acdbd582c7e50689 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Thu, 11 Jan 2007 02:22:00 +0000
Subject: Update to LibTomCrypt 1.16

--HG--
branch : libtomcrypt-orig
extra : convert_revision : 52840647ac7f5c707c3bd158d119a15734a7ef28
---
 demos/timing.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'demos/timing.c')

diff --git a/demos/timing.c b/demos/timing.c
index 368d6e4..becc7c0 100644
--- a/demos/timing.c
+++ b/demos/timing.c
@@ -2,12 +2,26 @@
 
 int main(void)
 {
+
 init_timer();
 reg_algs();
+
+#ifdef USE_LTM
+   ltc_mp = ltm_desc;
+#elif defined(USE_TFM)
+   ltc_mp = tfm_desc;
+#elif defined(USE_GMP)
+   ltc_mp = gmp_desc;
+#else
+   extern ltc_math_descriptor EXT_MATH_LIB;
+   ltc_mp = EXT_MATH_LIB;
+#endif
+
 time_keysched();
 time_cipher();
 time_cipher2();
 time_cipher3();
+time_cipher4();
 time_hash();
 time_macs();
 time_encmacs();
@@ -16,11 +30,13 @@ time_mult();
 time_sqr();
 time_rsa();
 time_ecc();
-time_dh();
+#ifdef USE_LTM
+time_katja();
+#endif
 return EXIT_SUCCESS;
 
 }
 
 /* $Source: /cvs/libtom/libtomcrypt/demos/timing.c,v $ */
-/* $Revision: 1.17 $ */
-/* $Date: 2005/06/23 02:16:26 $ */
+/* $Revision: 1.61 $ */
+/* $Date: 2006/12/03 03:08:35 $ */
-- 
cgit v1.2.3