ESP_NULL redefined

wes> constants.h:199:1: warning: "ESP_NULL" redefined
wes> In file included from sadb_util.c:23:
wes> /usr/src/cerberus/net/ipsec/ipsec.h:30:1: warning: this is the location
wes> of the previous definition
wes> that could be a hard to find problem someday

Indeed. I took a look at this, and it seems that sadb_util.c compiles fine without this header, so I've removed it. The only other file including the header was sadb_ui.c, and nobody uses any of the functions in this file, so I'm going to remove it from the makefile.

A more interesting question is: why do plutoplus and cerberus use different values for cipher algorithms?

As far as I can tell, cerberus is only using these defines in local structures, as identifiers. They are not used for anything that goes over the wire. This makes sense, as the values do not match the ISAKMP ESP transform values.

So, I'd like to update cerberus to use the same values as pp, to eliminate possible confusion. Any objections?

cerberus ipsec.h:
-----------------
/* Cipher algorithms */
#define RFC_1829 1 /* no longer supported */
#define ESP_DES_CBC 2
#define ESP_3DES_CBC 3
#define ESP_RC5_CBC 4
#define ESP_BLOWFISH_CBC 5
#define ESP_IDEA_CBC 6
#define ESP_NULL 7
#define ESP_MARS_CBC 8
#define ESP_RC6_CBC 9
#define ESP_RIJNDAEL_CBC 10
#define ESP_SERPENT_CBC 11
#define ESP_TWOFISH_CBC 12


plutoplus constants.h:
----------------------
/* ISAKMP ESP transform values */
#define ESP_DES_IV64             1
#define ESP_DES                  2
#define ESP_3DES                 3
#define ESP_RC5                  4
#define ESP_IDEA                 5
#define ESP_CAST                 6
#define ESP_BLOWFISH             7
#define ESP_3IDEA                8
#define ESP_DES_IV32             9
#define ESP_RC4                  10
#define ESP_NULL                 11
#define ESP_AES                  12
#define ESP_MARS                249
#define ESP_RC6                 250
#define ESP_SERPENT             252
#define ESP_TWOFISH             253


-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5