updates.

[silc.git] / lib / silcske / payload_internal.h

diff --git a/lib/silcske/payload_internal.h b/lib/silcske/payload_internal.h
index c91b3aeedf860de0ba64f4eb9c916dd16cae07eb..3312d1ea63b12cb15e17c4e21d09abb4d7df0bc8 100644 (file)
--- a/lib/silcske/payload_internal.h
+++ b/lib/silcske/payload_internal.h
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 
-  Copyright (C) 2000 Pekka Riikonen
+  Copyright (C) 2000 - 2001 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -24,49 +24,43 @@
 /* SILC Key Exchange Start Payload */
 typedef struct {
   unsigned char flags;
-  unsigned short len;
+  uint16 len;
 
   unsigned char *cookie;
-  unsigned short cookie_len;
+  uint16 cookie_len;
 
   unsigned char *version;
-  unsigned short version_len;
+  uint16 version_len;
 
-  unsigned short ke_grp_len;
+  uint16 ke_grp_len;
   unsigned char *ke_grp_list;
 
-  unsigned short pkcs_alg_len;
+  uint16 pkcs_alg_len;
   unsigned char *pkcs_alg_list;
 
-  unsigned short enc_alg_len;
+  uint16 enc_alg_len;
   unsigned char *enc_alg_list;
   
-  unsigned short hash_alg_len;
+  uint16 hash_alg_len;
   unsigned char *hash_alg_list;
 
-  unsigned short comp_alg_len;
+  uint16 hmac_alg_len;
+  unsigned char *hmac_alg_list;
+
+  uint16 comp_alg_len;
   unsigned char *comp_alg_list;
 } SilcSKEStartPayload;
 
-/* SILC Key Exchange 1 Payload */
-typedef struct {
-  unsigned short pk_len;
-  unsigned char *pk_data;
-  unsigned short pk_type;
-
-  SilcInt e;
-} SilcSKEOnePayload;
-
-/* SILC Key Exchange 2 Payload */
+/* SILC Key Exchange Payload */
 typedef struct {
-  unsigned short pk_len;
+  uint16 pk_len;
   unsigned char *pk_data;
-  unsigned short pk_type;
+  uint16 pk_type;
 
-  SilcInt f;
+  SilcMPInt x;
 
-  unsigned short sign_len;
+  uint16 sign_len;
   unsigned char *sign_data;
-} SilcSKETwoPayload;
+} SilcSKEKEPayload;
 
 #endif