aboutsummaryrefslogtreecommitdiffstats
path: root/src/pluto/kernel.c
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2008-04-18 17:01:45 +0000
committerAndreas Steffen <andreas.steffen@strongswan.org>2008-04-18 17:01:45 +0000
commit1da277f04502901e99c4442e5e42ade4208fb311 (patch)
tree881414d4e80dd84cb4abb97d4784ea7d2aa25b28 /src/pluto/kernel.c
parent855c9a908904a836a9ff16f2c1e90103c97f1085 (diff)
downloadstrongswan-1da277f04502901e99c4442e5e42ade4208fb311.tar.bz2
strongswan-1da277f04502901e99c4442e5e42ade4208fb311.tar.xz
support of AES_XCBC and CAMELLIA ESP cipher by pluto
Diffstat (limited to 'src/pluto/kernel.c')
-rw-r--r--src/pluto/kernel.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/pluto/kernel.c b/src/pluto/kernel.c
index 1b74ad697..09b4bbaaf 100644
--- a/src/pluto/kernel.c
+++ b/src/pluto/kernel.c
@@ -1827,30 +1827,30 @@ setup_half_ipsec_sa(struct state *st, bool inbound)
static const struct esp_info esp_info[] = {
{ ESP_NULL, AUTH_ALGORITHM_HMAC_MD5,
0, HMAC_MD5_KEY_LEN,
- SADB_EALG_NULL, SADB_AALG_MD5_HMAC },
+ SADB_EALG_NULL, SADB_AALG_MD5HMAC },
{ ESP_NULL, AUTH_ALGORITHM_HMAC_SHA1,
0, HMAC_SHA1_KEY_LEN,
- SADB_EALG_NULL, SADB_AALG_SHA1_HMAC },
+ SADB_EALG_NULL, SADB_AALG_SHA1HMAC },
{ ESP_DES, AUTH_ALGORITHM_NONE,
DES_CBC_BLOCK_SIZE, 0,
- SADB_EALG_DES_CBC, SADB_AALG_NONE },
+ SADB_EALG_DESCBC, SADB_AALG_NONE },
{ ESP_DES, AUTH_ALGORITHM_HMAC_MD5,
DES_CBC_BLOCK_SIZE, HMAC_MD5_KEY_LEN,
- SADB_EALG_DES_CBC, SADB_AALG_MD5_HMAC },
+ SADB_EALG_DESCBC, SADB_AALG_MD5HMAC },
{ ESP_DES, AUTH_ALGORITHM_HMAC_SHA1,
DES_CBC_BLOCK_SIZE,
- HMAC_SHA1_KEY_LEN, SADB_EALG_DES_CBC, SADB_AALG_SHA1_HMAC },
+ HMAC_SHA1_KEY_LEN, SADB_EALG_DESCBC, SADB_AALG_SHA1HMAC },
{ ESP_3DES, AUTH_ALGORITHM_NONE,
DES_CBC_BLOCK_SIZE * 3, 0,
- SADB_EALG_3DES_CBC, SADB_AALG_NONE },
+ SADB_EALG_3DESCBC, SADB_AALG_NONE },
{ ESP_3DES, AUTH_ALGORITHM_HMAC_MD5,
DES_CBC_BLOCK_SIZE * 3, HMAC_MD5_KEY_LEN,
- SADB_EALG_3DES_CBC, SADB_AALG_MD5_HMAC },
+ SADB_EALG_3DESCBC, SADB_AALG_MD5HMAC },
{ ESP_3DES, AUTH_ALGORITHM_HMAC_SHA1,
DES_CBC_BLOCK_SIZE * 3, HMAC_SHA1_KEY_LEN,
- SADB_EALG_3DES_CBC, SADB_AALG_SHA1_HMAC },
+ SADB_EALG_3DESCBC, SADB_AALG_SHA1HMAC },
};
u_int8_t natt_type = 0;
@@ -1976,11 +1976,11 @@ setup_half_ipsec_sa(struct state *st, bool inbound)
switch (st->st_ah.attrs.auth)
{
case AUTH_ALGORITHM_HMAC_MD5:
- authalg = SADB_AALG_MD5_HMAC;
+ authalg = SADB_AALG_MD5HMAC;
break;
case AUTH_ALGORITHM_HMAC_SHA1:
- authalg = SADB_AALG_SHA1_HMAC;
+ authalg = SADB_AALG_SHA1HMAC;
break;
default: