Skip to content

[SecurityBundle] use libsodium to run Argon2i related tests #26057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2018

Conversation

xabbuh
Copy link
Member

@xabbuh xabbuh commented Feb 5, 2018

Q A
Branch? 3.4
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #26038
License MIT
Doc PR

.travis.yml Outdated
# install libsodium
- sudo add-apt-repository ppa:ondrej/php -y
- sudo apt-get update -q
- sudo apt-get install libsodium-dev -y
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest to move these 3 lines below Install extra PHP extensions, in the same block (no dashes before)

Copy link
Member

@nicolas-grekas nicolas-grekas Feb 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, and move them in the "elif" below, and wrap them in another "if" that checks if the sodium.so exists in the cache already or not (see tpecl)

@@ -149,7 +149,13 @@ before_install:
([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI")
tfold ext.apcu tpecl apcu-4.0.11 apcu.so
elif [[ ! $skip && $PHP = 7.* ]]; then
# install libsodium
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [[ ! -e ~/php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@nicolas-grekas
Copy link
Member

Thank you @xabbuh.

@nicolas-grekas nicolas-grekas merged commit 5f9471e into symfony:3.4 Feb 6, 2018
nicolas-grekas added a commit that referenced this pull request Feb 6, 2018
…s (xabbuh)

This PR was merged into the 3.4 branch.

Discussion
----------

[SecurityBundle] use libsodium to run Argon2i related tests

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #26038
| License       | MIT
| Doc PR        |

Commits
-------

5f9471e use libsodium to run Argon2i related tests
@xabbuh xabbuh deleted the issue-26038 branch February 6, 2018 10:14
This was referenced Mar 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants