Input ik,ck keys for add_sa() function are not zero terminated that cause - des3_ede encryption key expansion possible buffer overflow. Also: - sha1 authentication key expansion has been corrected.
<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [X] Commit message has the format required by CONTRIBUTING guide - [ X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3121
-- Commit Summary --
* ims_ipsec_pcscf: ik and ck keys expansion fixes
-- File Changes --
M src/modules/ims_ipsec_pcscf/ipsec.c (50)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3121.patch https://github.com/kamailio/kamailio/pull/3121.diff
@alexyosifov: maybe you have time to check this one and see if all ok to merge.
@riccardv: it seems this PR has now conflicts because an older PR was just merged. Can you review and see how the conflicts can be resolved then do a force push to update this PR?
@riccardv pushed 1 commit.
ab58649393713c0291e1fa6f0dc3d39359858587 Merge branch 'master' into ims_ipsec_keys_expansion_fixes
Hi @miconda , done
Looks OK to me. Thanks!
Merged #3121 into master.