diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-06 17:08:54 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-04-06 17:08:54 +0000 |
| commit | e558f5499253259cf085adeeabe6f4dd95e98577 (patch) | |
| tree | 0690dea106614ea9c482e9ab1f6d4fc1a76b9584 /sbin | |
| parent | 18a6f684b3784c0630b0f2311e3acb584c0e09f4 (diff) | |
Merge with EOM 1.81
Too much removed in last commit
Actually save the DH values in inititor mode
Non-PFS case for initiators bailed out wrongly.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/ike_quick_mode.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c index 6ce58c86c6b..75d49c7a2c7 100644 --- a/sbin/isakmpd/ike_quick_mode.c +++ b/sbin/isakmpd/ike_quick_mode.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ike_quick_mode.c,v 1.11 1999/04/05 20:58:52 niklas Exp $ */ -/* $EOM: ike_quick_mode.c,v 1.78 1999/04/05 20:18:32 niklas Exp $ */ +/* $OpenBSD: ike_quick_mode.c,v 1.12 1999/04/06 17:08:53 niklas Exp $ */ +/* $EOM: ike_quick_mode.c,v 1.81 1999/04/06 14:11:35 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -502,8 +502,6 @@ initiator_send_HASH_SA_NONCE (struct message *msg) ie->group = 0; return -1; } - group_free (ie->group); - ie->group = 0; } /* Generate optional client ID payloads. XXX Share with responder. */ @@ -725,10 +723,10 @@ initiator_recv_HASH_SA_NONCE (struct message *msg) hashp->flags |= PL_MARK; isa = sa->data; - ie->group = group_get (isa->group_desc); - if (!ie->group) + if ((isa->group_desc && (!ie->group || ie->group->id != isa->group_desc)) + || (!isa->group_desc && ie->group)) { - /* XXX Notify peer? */ + log_print ("initiator_recv_HASH_SA_NONCE: disagreement on PFS"); return -1; } |