diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:23:33 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:23:33 +0000 |
| commit | aa6e0c949f33ccf6d9f0a55c0bb36394b6520d98 (patch) | |
| tree | fb5e58b0f291544df3d6363937010c167a5a374a /sbin | |
| parent | fef6946559516a458ed226e53a2e5fb607ce61a0 (diff) | |
Merge with EOM 1.115
author: ho
Blowfish needs the KEY_LENGTH attribute accepted.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index a0f5e8397f3..36f4996ec25 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ipsec.c,v 1.22 1999/07/13 15:46:43 niklas Exp $ */ -/* $EOM: ipsec.c,v 1.114 1999/07/13 15:43:21 niklas Exp $ */ +/* $OpenBSD: ipsec.c,v 1.23 2000/01/26 15:23:32 niklas Exp $ */ +/* $EOM: ipsec.c,v 1.115 1999/12/20 10:12:17 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -881,7 +881,8 @@ ipsec_is_attribute_incompatible (u_int16_t type, u_int8_t *value, return decode_16 (value) < IPSEC_AUTH_HMAC_MD5 || decode_16 (value) > IPSEC_AUTH_KPDK; case IPSEC_ATTR_KEY_LENGTH: - return 1; + /* XXX Blowfish needs '0'. Others appear to disregard this attr? */ + return 0; case IPSEC_ATTR_KEY_ROUNDS: return 1; case IPSEC_ATTR_COMPRESS_DICTIONARY_SIZE: |