diff --git a/programs/pluto/ikev2_eap.c b/programs/pluto/ikev2_eap.c index 97b0bf17b7..e528879fc4 100644 --- a/programs/pluto/ikev2_eap.c +++ b/programs/pluto/ikev2_eap.c @@ -53,6 +53,7 @@ #include "ikev2_states.h" #include "ikev2_auth.h" #include "ikev2_notification.h" +#include "ikev2_ike_intermediate.h" /* for next_is_ikev2_ike_intermediate_exchange() */ static ikev2_llog_success_fn llog_success_process_v2_IKE_AUTH_EAP_request; @@ -444,6 +445,15 @@ stf_status process_v2_IKE_AUTH_request_EAP_start(struct ike_sa *ike, return STF_IGNORE; } + if (next_is_ikev2_ike_intermediate_exchange(ike)) { + llog(RC_LOG, ike->sa.logger, + "authentication failed, expecting IKE_INTERMEDIATE request"); + record_v2N_response(ike->sa.logger, ike, md, + v2N_AUTHENTICATION_FAILED, empty_shunk/*no data*/, + ENCRYPTED_PAYLOAD); + return STF_FATAL; + } + /* * XXX: hack so that incoming certs are ignored; should update * CERT code? diff --git a/programs/pluto/ikev2_ike_auth.c b/programs/pluto/ikev2_ike_auth.c index 38a205e6ea..f4c21bc13f 100644 --- a/programs/pluto/ikev2_ike_auth.c +++ b/programs/pluto/ikev2_ike_auth.c @@ -77,6 +77,7 @@ #include "peer_id.h" #include "ddos.h" #include "ikev2_nat.h" +#include "ikev2_ike_intermediate.h" /* for next_is_ikev2_ike_intermediate_exchange() */ static ikev2_llog_success_fn llog_success_process_v2_IKE_AUTH_response; static ikev2_llog_success_fn llog_success_initiate_v2_IKE_AUTH_request; @@ -521,6 +522,15 @@ stf_status process_v2_IKE_AUTH_request(struct ike_sa *ike, return STF_IGNORE; } + if (next_is_ikev2_ike_intermediate_exchange(ike)) { + llog(RC_LOG, ike->sa.logger, + "authentication failed, expecting IKE_INTERMEDIATE request"); + record_v2N_response(ike->sa.logger, ike, md, + v2N_AUTHENTICATION_FAILED, empty_shunk/*no data*/, + ENCRYPTED_PAYLOAD); + return STF_FATAL; + } + if (ike->sa.st_v2_resume_session != NULL) { ldbg(ike->sa.logger, "resuming, skipping cert decode"); return process_v2_IKE_AUTH_request_skip_cert_decode(ike, md); diff --git a/programs/pluto/ikev2_ike_intermediate.c b/programs/pluto/ikev2_ike_intermediate.c index 7cf1176a2b..b62f0e9565 100644 --- a/programs/pluto/ikev2_ike_intermediate.c +++ b/programs/pluto/ikev2_ike_intermediate.c @@ -706,8 +706,13 @@ stf_status process_v2_IKE_INTERMEDIATE_request(struct ike_sa *ike, struct logger *logger = ike->sa.logger; PEXPECT(logger, null_child == NULL); - if (!PEXPECT(logger, next_ikev2_ike_intermediate_exchange(ike))) { - return STF_INTERNAL_ERROR; + if (!next_ikev2_ike_intermediate_exchange(ike)) { + llog(RC_LOG, ike->sa.logger, + "authentication failed, initiator sent unsolicited IKE_INTERMEDIATE request"); + record_v2N_response(ike->sa.logger, ike, md, + v2N_AUTHENTICATION_FAILED, empty_shunk/*no data*/, + ENCRYPTED_PAYLOAD); + return STF_FATAL; } natify_ikev2_ike_responder_endpoints(ike, md);