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

Remove m2crypto #23348

Merged
merged 7 commits into from May 5, 2015
Merged

Remove m2crypto #23348

merged 7 commits into from May 5, 2015

Conversation

msteed
Copy link
Contributor

@msteed msteed commented May 4, 2015

Remove M2Crypto as a dependency. Backward-compatible functionality is implemented using PyCrypto and calls into OpenSSL libcrypto.

msteed added 3 commits May 4, 2015 15:09
- RSA key generation and import/export using PyCrypto
- PKCS1 v1.5 signature generation and verification using PyCrypto
- SHA1 using PyCrypto
- RSA ANSI X9.31 signature generation & verification using OpenSSL
  libcrypto via ctypes

Still needed:

- rework salt/modules/x509.py
- test :)
@cachedout
Copy link
Contributor

Awesome!

@rallytime
Copy link
Contributor

Gah! I was going to apply the Awesome label, but @cachedout beat me to it.

AWESOME!

@msteed
Copy link
Contributor Author

msteed commented May 5, 2015

Failures are due to the PyCrypto RNG not being re-initialized after a fork(). Doing this is a one-liner but after looking at the stack traces I'm not sure where to put it. Maybe @cachedout or @thatch45 can help?

@techhat
Copy link
Contributor

techhat commented May 5, 2015

+1

@thatch45
Copy link
Member

thatch45 commented May 5, 2015

Yes, good call @msteed! PyCrypto needs the RNG to be massaged. Likely in the MWorker in master.py, maybe in the start method

thatch45 added a commit that referenced this pull request May 5, 2015
@thatch45 thatch45 merged commit a7e417c into saltstack:develop May 5, 2015
@msteed msteed deleted the remove-m2crypto branch May 7, 2015 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants