Commit Graph

19 Commits

Author SHA1 Message Date
Anders Broman 505465d5a4 From Frédéric Roudaut:
as requested  here is a patch  in order to take into account  Encryption 
and Authentication keys for ESP in hexa. 
You only have to write your key with 0x first. In this case if the key 
is not in 8-bit unit, it will be considered as starting with a "0" (4 bits). Excepted this case, the key should be completely written, even if it 
starts with "0x00".

svn path=/trunk/; revision=19181
2006-09-08 07:32:13 +00:00
Gerald Combs 0e5e0c4453 Fix two remaining off-by-one errors. Remove a static buffer.
svn path=/trunk/; revision=18943
2006-08-18 00:22:48 +00:00
Gerald Combs a0f21609b8 Fix CIDs 204 - 208.
svn path=/trunk/; revision=18915
2006-08-15 19:28:07 +00:00
Gerald Combs f6802d35c8 Put protocol preferences in a scrolled window, in case a particular
protocol has a lot of preference items.  Change the number of
configurable ESP SAs to 16 (in case someone needs do decrypt many
sessions in a single trace file).  Fix up whitespace.

svn path=/trunk/; revision=18903
2006-08-14 22:34:46 +00:00
Gerald Combs 4f16b6b178 Point to the newest (1.5.0-1) GnuTLS package. Since it contains
libgcrypt, enable it in the Windows build.

In packet-ipsec.c:

  - Remove non-constants from variable declaration initializations.
  - Use ep_alloc() in a couple of places.
  - Fix an off-by-one error.
  - Reduce the number of SAs in the preferences from 4 to 2.  4 made the
    preferences window absolutely enormous.  This is probably the wrong
    way to fix this.
  - Fix up whitespace.

svn path=/trunk/; revision=18856
2006-08-09 02:00:05 +00:00
Jörg Mayer 49e50f70d0 configure.in:
Check for libgcrypt 1.1.0 (note: I don't know which version
        is required, so maybe the version number needs to be changed
        for this test to work reliably).

packet-ipsec.c:
        - Replace __USE_LIBGCRYPT__ by HAVE_LIBGCRYPT to follow
          conventions.
        - Warning fixes: signedness in sscanf (%i -> %u)
        - Warning fixes: mixed declaration and code


svn path=/trunk/; revision=18460
2006-06-14 08:04:43 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Guy Harris e5001116f1 Do the ESP payload decoding, and pass it to the subdissector, regardless
of whether we're building a protocol tree or not - you have to call
subdissectors in either case.

svn path=/trunk/; revision=18078
2006-05-02 19:58:19 +00:00
Anders Broman 93e95ca62b From Frederic Roudaut:
I updated my previous patch of ESP :

* It now check authentication for (similar to the ICMP checksum):

- NULL Authentication
- HMAC-SHA1-96 [RFC2404]
- HMAC-SHA256
- HMAC-MD5-96 [RFC2403] (2)

I put aside AES-XCBC-MAC-96 [RFC3566] because I did not succeed to have 
a working implementation.
I added a field for any authenticator of 12bytes length (without 
authentication process)

* I also correct the printing of this authenticator field which was 
decrypted :-[ .


Thus, with this patch  if libgcrypt is linked withe ethereal you should 
have the availability to :
- decrypt packets
- check authentication
 at the same time or not.
If noone of these options are set (or libgcrypt is not available) you 
also may use the previous heuristic.

svn path=/trunk/; revision=17858
2006-04-13 22:26:13 +00:00
Luis Ontanon cb24ac2121 Some compilers do not handle very long lines...
Shouldn't this  preference description be somewhere else?


svn path=/trunk/; revision=17748
2006-03-27 22:37:11 +00:00
Anders Broman 4facedb3ee From Frederic Roudaut:
With a change :

#ifdef HAVE_LIBCRYPT
#define __USE_LIBGCRYPT__ 
#endif

>> > finally, I have updated my dissector using libgcrypt.
>> > It does not use openssl anymore.
>> > If gnutls is installed, all should work.
>> > Thus, now it should decrypt and dissect (transport/tunnel/several 
>> > encapsulations ...) :
>> >
>> > - NULL Encryption Algorithm
>> > - TripleDES-CBC [RFC2451] : keylen 192 bits.
>> > - AES-CBC with 128-bit keys [RFC3602] : keylen 128 and 192/256 
>> > bits.
>> > - AES-CTR [RFC3686] : keylen 160/224/288 bits. The remaining
>> > 32 bits will be used as nonce.
>> > - DES-CBC [RFC2405] : keylen 64 bits
>> >
>> > I also have added :
>> >
>> > - BLOWFISH-CBC : keylen 128 bits.
>> > - TWOFISH-CBC : keylen 128/256 bits.
>> >
>> > You have to indicate the Authentication algorithm even if all 
>> > Algorithms since it uses 12 bytes in the Auth field should work 
>> > (have a look to the README to understand why I put it
>> > ;-) ). If you consider I have to throw it away please tell me.
>> >
>> > HMAC-SHA1-96 [RFC2404]
>> > NULL
>> > AES-XCBC-MAC-96 [RFC3566]
>> > HMAC-MD5-96 [RFC2403]

svn path=/trunk/; revision=17734
2006-03-27 16:25:35 +00:00
Guy Harris ab797734dd Get rid of the private "my_match_strval()" routine in many dissectors;
add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.

svn path=/trunk/; revision=14786
2005-06-26 19:56:52 +00:00
Ulf Lamping bb8006d371 bugfix: prevent a negative length, if ah.ah_len is zero
svn path=/trunk/; revision=13902
2005-03-25 21:19:18 +00:00
Ulf Lamping 78ff68d4b5 a lot of warnings removed, most of them about pointer to int casts without using the appropriate GLib macros
svn path=/trunk/; revision=12832
2004-12-25 13:49:30 +00:00
Guy Harris 5289391300 From Mark Phillips: optionally support decoding the payload of ESP
packets using null encryption (with a heuristic to detect null
encryption).

svn path=/trunk/; revision=12513
2004-11-12 10:03:53 +00:00
Guy Harris eaadcc4c62 Move various tables into the epan directory.
svn path=/trunk/; revision=12130
2004-09-29 00:52:45 +00:00
Guy Harris bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Guy Harris 3a583aeb59 From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).

svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00