check if the null encryption is supported or not.

Requested by:	bms
Obtained from:	KAME
This commit is contained in:
Hajimu UMEMOTO 2004-05-13 15:46:28 +00:00
parent 43f5a160a5
commit 8b205f5e0a
2 changed files with 22 additions and 2 deletions
sbin/setkey
usr.sbin/setkey

@ -1,5 +1,5 @@
/* $FreeBSD$ */
/* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */
/* $KAME: parse.y,v 1.82 2004/04/15 08:03:57 sakane Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@ -323,6 +323,11 @@ enc_alg
p_key_enc_len = 0;
p_key_enc = NULL;
if (ipsec_check_keylen(SADB_EXT_SUPPORTED_ENCRYPT,
p_alg_enc, PFKEY_UNUNIT64(p_key_enc_len)) < 0) {
yyerror(ipsec_strerror());
return -1;
}
}
| ALG_ENC key_string {
if ($1 < 0) {
@ -349,6 +354,11 @@ enc_alg
p_key_enc_len = 0;
p_key_enc = NULL;
if (ipsec_check_keylen(SADB_EXT_SUPPORTED_ENCRYPT,
p_alg_enc, PFKEY_UNUNIT64(p_key_enc_len)) < 0) {
yyerror(ipsec_strerror());
return -1;
}
}
| ALG_ENC_DESDERIV key_string
{

@ -1,5 +1,5 @@
/* $FreeBSD$ */
/* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */
/* $KAME: parse.y,v 1.82 2004/04/15 08:03:57 sakane Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@ -323,6 +323,11 @@ enc_alg
p_key_enc_len = 0;
p_key_enc = NULL;
if (ipsec_check_keylen(SADB_EXT_SUPPORTED_ENCRYPT,
p_alg_enc, PFKEY_UNUNIT64(p_key_enc_len)) < 0) {
yyerror(ipsec_strerror());
return -1;
}
}
| ALG_ENC key_string {
if ($1 < 0) {
@ -349,6 +354,11 @@ enc_alg
p_key_enc_len = 0;
p_key_enc = NULL;
if (ipsec_check_keylen(SADB_EXT_SUPPORTED_ENCRYPT,
p_alg_enc, PFKEY_UNUNIT64(p_key_enc_len)) < 0) {
yyerror(ipsec_strerror());
return -1;
}
}
| ALG_ENC_DESDERIV key_string
{