diff options
Diffstat (limited to 'src/libstrongswan/credentials/sets/auth_cfg_wrapper.c')
| -rw-r--r-- | src/libstrongswan/credentials/sets/auth_cfg_wrapper.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c b/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c index 046ccfd12..225fabe31 100644 --- a/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c +++ b/src/libstrongswan/credentials/sets/auth_cfg_wrapper.c @@ -132,12 +132,8 @@ static bool enumerate(wrapper_enumerator_t *this, certificate_t **cert) } } else if (rule != AUTH_HELPER_SUBJECT_CERT && -<<<<<<< HEAD - rule != AUTH_HELPER_IM_CERT) -======= rule != AUTH_HELPER_IM_CERT && rule != AUTH_HELPER_REVOCATION_CERT) ->>>>>>> upstream/4.5.1 { /* handle only HELPER certificates */ continue; } |