matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip/xfrm: Command syntax should not expect a key for compression 

Compression algorithms do not use a key.

Signed-off-by: David Ward <david.ward@ll.mit.edu>
This commit is contained in:
David Ward 2013-03-25 04:23:17 +00:00 committed by Stephen Hemminger
parent 8dbe67d2fe
commit f3b9aa3df8
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ip/xfrm_state.c
View File

@ -78,13 +78,14 @@ static void usage(void)
fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n"); fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");
fprintf(stderr, "ALGO := { "); fprintf(stderr, "ALGO := { ");
fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_CRYPT)); fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_CRYPT));
fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AUTH)); fprintf(stderr, "%s", strxf_algotype(XFRMA_ALG_AUTH));
fprintf(stderr, "%s", strxf_algotype(XFRMA_ALG_COMP));
fprintf(stderr, " } ALGO-NAME ALGO-KEY |\n"); fprintf(stderr, " } ALGO-NAME ALGO-KEY |\n");
fprintf(stderr, " %s", strxf_algotype(XFRMA_ALG_AUTH_TRUNC));
fprintf(stderr, " ALGO-NAME ALGO-KEY ALGO-TRUNC-LEN |\n");
fprintf(stderr, " %s", strxf_algotype(XFRMA_ALG_AEAD)); fprintf(stderr, " %s", strxf_algotype(XFRMA_ALG_AEAD));
fprintf(stderr, " ALGO-NAME ALGO-KEY ALGO-ICV-LEN |\n"); fprintf(stderr, " ALGO-NAME ALGO-KEY ALGO-ICV-LEN |\n");
fprintf(stderr, " %s", strxf_algotype(XFRMA_ALG_AUTH_TRUNC)); fprintf(stderr, " %s", strxf_algotype(XFRMA_ALG_COMP));
fprintf(stderr, " ALGO-NAME ALGO-KEY ALGO-TRUNC-LEN\n"); fprintf(stderr, " ALGO-NAME\n");
fprintf(stderr, "MODE := transport | tunnel | ro | in_trigger | beet\n"); fprintf(stderr, "MODE := transport | tunnel | ro | in_trigger | beet\n");
fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n"); fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
fprintf(stderr, "FLAG := noecn | decap-dscp | nopmtudisc | wildrecv | icmp | af-unspec | align4\n"); fprintf(stderr, "FLAG := noecn | decap-dscp | nopmtudisc | wildrecv | icmp | af-unspec | align4\n");
@ -374,7 +375,7 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
int len; int len;
__u32 icvlen, trunclen; __u32 icvlen, trunclen;
char *name; char *name;
char *key; char *key = "";
char *buf; char *buf;
switch (type) { switch (type) {
@ -409,10 +410,17 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
name = *argv; name = *argv;
if (!NEXT_ARG_OK()) switch (type) {
missarg("ALGO-KEY"); case XFRMA_ALG_AEAD:
NEXT_ARG(); case XFRMA_ALG_CRYPT:
key = *argv; case XFRMA_ALG_AUTH:
case XFRMA_ALG_AUTH_TRUNC:
if (!NEXT_ARG_OK())
missarg("ALGO-KEY");
NEXT_ARG();
key = *argv;
break;
}
buf = alg.u.alg.alg_key; buf = alg.u.alg.alg_key;
len = sizeof(alg.u.alg); len = sizeof(alg.u.alg);

13
man/man8/ip-xfrm.8
View File

@ -117,14 +117,17 @@ ip-xfrm \- transform configuration
.ti -8 .ti -8
.IR ALGO " :=" .IR ALGO " :="
.RB "{ " enc " | " auth " | " comp " } " .RB "{ " enc " | " auth " } "
.IR ALGO-NAME " " ALGO-KEY " |" .IR ALGO-NAME " " ALGO-KEY " |"
.br .br
.B aead
.IR ALGO-NAME " " ALGO-KEY " " ALGO-ICV-LEN " |"
.br
.B auth-trunc .B auth-trunc
.IR ALGO-NAME " " ALGO-KEY " " ALGO-TRUNC-LEN .IR ALGO-NAME " " ALGO-KEY " " ALGO-TRUNC-LEN " |"
.br
.B aead
.IR ALGO-NAME " " ALGO-KEY " " ALGO-ICV-LEN " |"
.br
.B comp
.IR ALGO-NAME
.ti -8 .ti -8
.IR MODE " := " .IR MODE " := "