diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-06-27 06:00:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 06:00:15 -0700 |
| commit | e238ae999b90b771f662ac15e6cceff8aa0b721f (patch) | |
| tree | 4c2b5e884fe0361d8940f4c79ea0e957557a8fc7 /contrib | |
| parent | e7e091d1542fe598d7a7fbb2f51c360aaf9920cd (diff) | |
| download | ansible-e238ae999b90b771f662ac15e6cceff8aa0b721f.tar.gz | |
Cyptography pr 20566 rebase (#25560)
Make pyca/cryptography the preferred backend for cryptographic needs (mainly vault) falling back to pycrypto
pyca/cryptography is already implicitly a dependency in many cases
through paramiko (2.0+) as well as the new openssl_publickey module,
which requires pyOpenSSL 16.0+. Additionally, pyca/cryptography is
an optional dep for better performance with vault already.
This commit leverages cryptography's padding, constant time comparisons,
and CBC/CTR modes to reduce the amount of code ansible needs to
maintain.
* Handle wrong password given for VaultAES format
* Do not display deprecation warning for cryptography on python-2.6
* Namespace all of the pycrypto imports and always import them
Makes unittests better and the code less likely to get stupid mistakes
(like using HMAC from cryptogrpahy when the one from pycrypto is needed)
* Add back in atfork since we need pycrypto to reinitialize its RNG just in case we're being used with old paramiko
* contrib/inventory/gce: Remove spurious require on pycrypto
(cherry picked from commit 9e16b9db275263b3ea8d1b124966fdebfc9ab271)
* Add cryptography to ec2_win_password module requirements
* Fix python3 bug which would pass text strings to a function which
requires byte strings.
* Attempt to add pycrypto version to setup deps
* Change hacking README for dual pycrypto/cryptography
* update dependencies for various CI scripts
* additional CI dockerfile/script updates
* add paramiko to the windows and sanity requirement set
This is needed because ansible lists it as a requirement. Previously
the missing dep wasn't enforced, but cryptography imports pkg_resources
so you can't ignore a requirement any more
* Add integration test cases for old vault and for wrong passwords
* helper script for manual testing of pycrypto/cryptography
* Skip the pycrypto tests so that users without it installed can still run the unittests
* Run unittests for vault with both cryptography and pycrypto backend
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/inventory/gce.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py index f46a0d8a4e..076e69c5ad 100755 --- a/contrib/inventory/gce.py +++ b/contrib/inventory/gce.py @@ -74,7 +74,6 @@ Contributors: Matt Hite <mhite@hotmail.com>, Tom Melendez <supertom@google.com> Version: 0.0.3 ''' -__requires__ = ['pycrypto>=2.6'] try: import pkg_resources except ImportError: |