diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-26 22:28:55 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-08-26 22:28:55 +0000 |
| commit | cf4faf807950d2a8d4c9408e95a349db95ea608a (patch) | |
| tree | 9b30b90f12b174a231eb841925d0858276d683ba | |
| parent | 09bb016af4dcabef1a0ceda956f2f35224a63d92 (diff) | |
Merge with EOM 1.3
author: angelos
Revert order of handling KE/NONCE and IDs, such that we can use the ID
to lookup for the shared secret...
| -rw-r--r-- | sbin/isakmpd/ike_aggressive.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/ike_aggressive.c b/sbin/isakmpd/ike_aggressive.c index a4ff4436746..64f9ce1ac81 100644 --- a/sbin/isakmpd/ike_aggressive.c +++ b/sbin/isakmpd/ike_aggressive.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ike_aggressive.c,v 1.2 1999/04/27 21:11:53 niklas Exp $ */ -/* $EOM: ike_aggressive.c,v 1.2 1999/04/25 22:12:33 niklas Exp $ */ +/* $OpenBSD: ike_aggressive.c,v 1.3 1999/08/26 22:28:54 niklas Exp $ */ +/* $EOM: ike_aggressive.c,v 1.3 1999/08/19 01:14:04 angelos Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -138,10 +138,10 @@ responder_recv_SA_KE_NONCE_ID (struct message *msg) if (ike_phase_1_responder_recv_SA (msg)) return -1; - if (ike_phase_1_recv_KE_NONCE (msg)) + if (ike_phase_1_recv_ID (msg)) return -1; - return ike_phase_1_recv_ID (msg); + return ike_phase_1_recv_KE_NONCE (msg); } /* |