diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:55 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-02-19 19:32:55 +0000 |
| commit | a1284b1dc0edb9df01bb78070c6cc172383aa4f2 (patch) | |
| tree | 129805116cfb1915290b29a701da1d678cc5e469 /sbin/isakmpd/ike_phase_1.c | |
| parent | 608e69f177c007956605ba38af06aff9ccf9d266 (diff) | |
cert.c: Merge with EOM 1.14
ike_auth.c: Merge with EOM 1.43
ike_phase_1.c: Merge with EOM 1.21
init.c: Merge with EOM 1.24
ipsec.c: Merge with EOM 1.117
isakmpd.c: Merge with EOM 1.44
math_group.c: Merge with EOM 1.22
author: niklas
Copyright 2000
author: niklas
Allow isakmpd builders to remove optional parts and save bytes.
Diffstat (limited to 'sbin/isakmpd/ike_phase_1.c')
| -rw-r--r-- | sbin/isakmpd/ike_phase_1.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sbin/isakmpd/ike_phase_1.c b/sbin/isakmpd/ike_phase_1.c index 04018f331a6..7e137ca9933 100644 --- a/sbin/isakmpd/ike_phase_1.c +++ b/sbin/isakmpd/ike_phase_1.c @@ -1,8 +1,8 @@ -/* $OpenBSD: ike_phase_1.c,v 1.13 2000/02/11 10:22:25 niklas Exp $ */ -/* $EOM: ike_phase_1.c,v 1.19 2000/02/07 02:08:13 ho Exp $ */ +/* $OpenBSD: ike_phase_1.c,v 1.14 2000/02/19 19:32:53 niklas Exp $ */ +/* $EOM: ike_phase_1.c,v 1.21 2000/02/19 07:58:55 niklas Exp $ */ /* - * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -234,6 +234,16 @@ ike_phase_1_initiator_send_SA (struct message *msg) goto bail_out; } } + + /* We need to check that we actually support our configuration. */ + if (attribute_map (transform[i] + ISAKMP_TRANSFORM_SA_ATTRS_OFF, + transform_len[i] - ISAKMP_TRANSFORM_SA_ATTRS_OFF, + exchange->doi->is_attribute_incompatible, msg)) + { + log_error ("ike_phase_1_initiator_send_SA: " + "section [%s] has unsupported attribute(s)"); + goto bail_out; + } } /* XXX I don't like exchange-specific stuff in here. */ |