From: mdw <mdw>
Date: Sun, 13 Jan 2002 14:54:58 +0000 (+0000)
Subject: Provide MGF macros.
X-Git-Tag: 1.0.0pre3~20
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/1d27afe6fc7ec7ba96b1ea2b74e3500ea509fa76

Provide MGF macros.
---

diff --git a/tripe.h b/tripe.h
index 06fbf8f1..2e1c630a 100644
--- a/tripe.h
+++ b/tripe.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: tripe.h,v 1.9 2001/06/22 19:40:36 mdw Exp $
+ * $Id: tripe.h,v 1.10 2002/01/13 14:54:58 mdw Exp $
  *
  * Main header file for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: tripe.h,v $
+ * Revision 1.10  2002/01/13 14:54:58  mdw
+ * Provide MGF macros.
+ *
  * Revision 1.9  2001/06/22 19:40:36  mdw
  * Support expiry of other peers' public keys.
  *
@@ -244,6 +247,7 @@
 
 #include <catacomb/blowfish.h>
 #include <catacomb/blowfish-cbc.h>
+#include <catacomb/blowfish-counter.h>
 #include <catacomb/rmd160.h>
 #include <catacomb/rmd160-hmac.h>
 
@@ -257,6 +261,10 @@
 #define HASH_DONE rmd160_done
 #define HASHSZ RMD160_HASHSZ
 
+#define MGF_CTX blowfish_counterctx
+#define MGF_INIT blowfish_counterinit
+#define MGF_CRYPT blowfish_counterencrypt
+
 #define SEQSZ 4
 #define IVSZ BLOWFISH_BLKSZ
 #define MACSZ 10
@@ -324,7 +332,7 @@ typedef struct kxchal {
   unsigned f;				/* Various useful flags */
   sel_timer t;				/* Response timer for challenge */
   octet hc[HASHSZ];			/* Hash of his challenge */
-  octet hrx[HASHSZ];			/* My expected reply hash */
+  mp *ck;				/* The check value */
   octet hswrq_in[HASHSZ];		/* Inbound switch request message */
   octet hswok_in[HASHSZ];		/* Inbound switch confirmation */
   octet hswrq_out[HASHSZ];		/* Outbound switch request message */