Assignments for SHA2 and AES encryption and data integrity schemes, from

Yaniv Kaul.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2476 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index a0593af321fdc9ee665e8cd625b817a1cd0d1184..2b7081124a8e76825f0eef58cc2805e500de857c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -316,10 +316,8 @@ Ralf Schneider <ralf.schneider@alcatel.se> {
        OSI ESIS support
 }
 
-Yaniv Kaul <ykaul@checkpoint.com> {
-       ISAKMP Configuration Method support
-       Support for ISAKMP Hybrid mode authentication draft
-       Support for ISAKMP XAUTH authentication
+Yaniv Kaul <ykaul@netvision.net.il> {
+       Enhancements to ISAKMP
 }
 
 Paul Ionescu <ipaul@romsys.ro> {

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index b09884a757a8b3132a1db78d5b7892e2410f482e..ceb8c60979074a4f070a659a5dca1c5714c9e95f 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -969,7 +969,7 @@ B<http://ethereal.zing.org>.
   Mark Muhlestein          <mmm@netapp.com>
   Graham Bloice            <graham.bloice@trihedral.com>
   Ralf Schneider           <ralf.schneider@alcatel.se>
-  Yaniv Kaul               <ykaul@checkpoint.com>
+  Yaniv Kaul               <ykaul@netvision.net.il>
   Paul Ionescu             <ipaul@romsys.ro>
   Mark Burton              <markb@ordern.com>
   Stefan Raab              <stefan.raab@nextel.com>

diff --git a/packet-isakmp.c b/packet-isakmp.c
index f8272bf0227400e7bc80ca9f98f756ad41385861..87a670c0b86afc51b16c3f54007d3f554863d416 100644 (file)
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -3,7 +3,7 @@
  * (ISAKMP) (RFC 2408)
  * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
  *
- * $Id: packet-isakmp.c,v 1.27 2000/10/02 18:38:50 gram Exp $
+ * $Id: packet-isakmp.c,v 1.28 2000/10/03 22:49:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -91,7 +91,7 @@ static const char *p1_atttypestr[NUM_P1_ATT_TYPES] = {
   "Group-Order"
 };
 
-#define NUM_ATT_TYPES  10
+#define NUM_ATT_TYPES  11
 #define atttype2str(t) \
   ((t < NUM_ATT_TYPES) ? atttypestr[t] : "UNKNOWN-ATTRIBUTE-TYPE")
 
@@ -105,7 +105,8 @@ static const char *atttypestr[NUM_ATT_TYPES] = {
   "Key-Length",
   "Key-Rounds",
   "Compress-Dictinary-Size",
-  "Compress-Private-Algorithm"
+  "Compress-Private-Algorithm",
+  "ECN Tunnel"
 };
 
 #define NUM_TRANS_TYPES        2
@@ -117,7 +118,7 @@ static const char *transtypestr[NUM_TRANS_TYPES] = {
   "KEY_IKE"
 };
 
-#define NUM_AH_TRANS_TYPES     5
+#define NUM_AH_TRANS_TYPES     8
 #define ah_trans2str(t)                \
   ((t < NUM_AH_TRANS_TYPES) ? ah_transtypestr[t] : "UNKNOWN-AH-TRANS-TYPE")
 
@@ -126,10 +127,13 @@ static const char *ah_transtypestr[NUM_AH_TRANS_TYPES] = {
   "RESERVED",
   "MD5",
   "SHA",
-  "DES"
+  "DES",
+  "SHA2-256",
+  "SHA2-384",
+  "SHA2-512"
 };
 
-#define NUM_ESP_TRANS_TYPES    12
+#define NUM_ESP_TRANS_TYPES    13
 #define esp_trans2str(t)       \
   ((t < NUM_ESP_TRANS_TYPES) ? esp_transtypestr[t] : "UNKNOWN-ESP-TRANS-TYPE")
 
@@ -145,7 +149,8 @@ static const char *esp_transtypestr[NUM_ESP_TRANS_TYPES] = {
   "3IDEA",
   "DES-IV32",
   "RC4",
-  "NULL"
+  "NULL",
+  "AES"
 };
 
 #define NUM_ID_TYPES   12
@@ -1252,6 +1257,9 @@ value2str(int ike_p1, guint16 att_type, guint16 value) {
         case 2:  return "HMAC-SHA";
         case 3:  return "DES-MAC";
         case 4:  return "KPDK";
+       case 5:  return "HMAC-SHA2-256";
+       case 6:  return "HMAC-SHA2-384";
+       case 7:  return "HMAC-SHA2-512";
         default: return "UNKNOWN-AUTHENTICATION-VALUE";
       }
     case 6:
@@ -1273,6 +1281,7 @@ value2str(int ike_p1, guint16 att_type, guint16 value) {
           case 4:  return "RC5-R16-B64-CBC";
           case 5:  return "3DES-CBC";
           case 6:  return "CAST-CBC";
+         case 7:  return "AES-CBC";
           default: return "UNKNOWN-ENCRYPTION-ALG";
         }
       case 2:
@@ -1280,6 +1289,9 @@ value2str(int ike_p1, guint16 att_type, guint16 value) {
           case 1:  return "MD5";
           case 2:  return "SHA";
           case 3:  return "TIGER";
+         case 4:  return "SHA2-256";
+         case 5:  return "SHA2-384";
+         case 6:  return "SHA2-512";
           default: return "UNKNOWN-HASH-ALG";
         }
       case 3: