diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-03-05 09:29:19 +0100 |
| commit | 365e71f706b40c32173fa06c6feaac48c1527520 (patch) | |
| tree | 54fa72a914d18c9430eaa54f3de4a2d4419198af /src/libcharon/config/proposal.c | |
| parent | 5d7669b7b3563c50b3c86903e0a49373d597b8a0 (diff) | |
| parent | 568905f488e63e28778f87ac0e38d845f45bae79 (diff) | |
| download | vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.tar.gz vyos-strongswan-365e71f706b40c32173fa06c6feaac48c1527520.zip | |
Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion
Diffstat (limited to 'src/libcharon/config/proposal.c')
| -rw-r--r-- | src/libcharon/config/proposal.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index 5b8294599..aba7feede 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -560,6 +560,10 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg) if (token == NULL) { +<<<<<<< HEAD +======= + DBG1(DBG_CFG, "algorithm '%.*s' not recognized", alg.len, alg.ptr); +>>>>>>> upstream/4.5.1 return FAILED; } @@ -740,9 +744,16 @@ static void proposal_add_supported_ike(private_proposal_t *this) integrity_algorithm_t integrity; pseudo_random_function_t prf; diffie_hellman_group_t group; +<<<<<<< HEAD enumerator = lib->crypto->create_crypter_enumerator(lib->crypto); while (enumerator->enumerate(enumerator, &encryption)) +======= + const char *plugin_name; + + enumerator = lib->crypto->create_crypter_enumerator(lib->crypto); + while (enumerator->enumerate(enumerator, &encryption, &plugin_name)) +>>>>>>> upstream/4.5.1 { switch (encryption) { @@ -777,7 +788,11 @@ static void proposal_add_supported_ike(private_proposal_t *this) enumerator->destroy(enumerator); enumerator = lib->crypto->create_signer_enumerator(lib->crypto); +<<<<<<< HEAD while (enumerator->enumerate(enumerator, &integrity)) +======= + while (enumerator->enumerate(enumerator, &integrity, &plugin_name)) +>>>>>>> upstream/4.5.1 { switch (integrity) { @@ -796,7 +811,11 @@ static void proposal_add_supported_ike(private_proposal_t *this) enumerator->destroy(enumerator); enumerator = lib->crypto->create_prf_enumerator(lib->crypto); +<<<<<<< HEAD while (enumerator->enumerate(enumerator, &prf)) +======= + while (enumerator->enumerate(enumerator, &prf, &plugin_name)) +>>>>>>> upstream/4.5.1 { switch (prf) { @@ -815,7 +834,11 @@ static void proposal_add_supported_ike(private_proposal_t *this) enumerator->destroy(enumerator); enumerator = lib->crypto->create_dh_enumerator(lib->crypto); +<<<<<<< HEAD while (enumerator->enumerate(enumerator, &group)) +======= + while (enumerator->enumerate(enumerator, &group, &plugin_name)) +>>>>>>> upstream/4.5.1 { switch (group) { |