Skip to content
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

Fixes #5898 Adds latest cryptography #5964

Merged
merged 2 commits into from
Jun 1, 2021
Merged

Conversation

kushaldas
Copy link
Contributor

@kushaldas kushaldas commented May 27, 2021

Status

Ready for review.

Description of Changes

Fixes #5898

This commit brings in the rust compiler toolchain during the package
build and also updates the cryptography package to the latest 3.4.7

For my old T470 laptop, the build time is 13m12.645s. Need someone else to record the time
on their system.

Testing

Deployment

Any special considerations for deployment? Consider both:

  1. Upgrading existing production instances.
  2. New installs.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you added or removed a file deployed with the application:

  • I have updated AppArmor rules to include the change

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

Choose one of the following:

  • I have opened a PR in the docs repo for these changes, or will do so later
  • I would appreciate help with the documentation
  • These changes do not require documentation

If you added or updated a code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review

@rmol rmol self-assigned this May 27, 2021
@conorsch
Copy link
Contributor

Regarding the run time, locally I'm seeing


real	14m3.100s
user	13m31.686s
sys	1m36.340s

for make build-debs. Hardly a prohibitively long build time—debs usually take 10-15 minutes on my machine.

@zenmonkeykstop
Copy link
Contributor

running docker system prune && make clean && time make build-debs, I get 10m12s for develop and 12m38s for this branch.

@kushaldas kushaldas mentioned this pull request May 28, 2021
12 tasks
@kushaldas kushaldas force-pushed the crptography_update_with_rust branch from 38ffa20 to a9c09d8 Compare June 1, 2021 12:48
@eloquence eloquence added this to the 2.0.0 milestone Jun 1, 2021
@kushaldas kushaldas marked this pull request as ready for review June 1, 2021 16:06
@kushaldas kushaldas requested a review from a team as a code owner June 1, 2021 16:07
Copy link
Contributor

@rmol rmol left a comment

Choose a reason for hiding this comment

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

👍 The securedrop-app-code contains a functioning cryptography 3.4.7; I tested staging manually and with make testinfra and all looks normal.

@rmol rmol merged commit fdf2c28 into develop Jun 1, 2021
@rmol rmol deleted the crptography_update_with_rust branch June 1, 2021 17:51
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.

Update cryptography dependency
5 participants