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

cryptography support: improve Python 2 Unicode handling #313

Merged
merged 1 commit into from
Oct 22, 2021

Conversation

felixfontein
Copy link
Contributor

SUMMARY

Fixes #312.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/module_utils/crypto/cryptography_support.py

Copy link
Collaborator

@Ajpantuso Ajpantuso left a comment

Choose a reason for hiding this comment

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

LGTM

@felixfontein felixfontein merged commit eb8dabc into ansible-collections:main Oct 22, 2021
@felixfontein felixfontein deleted the unicode branch October 22, 2021 05:15
@felixfontein
Copy link
Contributor Author

@Ajpantuso thanks for reviewing this!

@patchback
Copy link

patchback bot commented Oct 22, 2021

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply eb8dabc on top of patchback/backports/stable-1/eb8dabce84302621351b409e7e52594e03937a17/pr-313

Backporting merged PR #313 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.crypto.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/eb8dabce84302621351b409e7e52594e03937a17/pr-313 upstream/stable-1
  4. Now, cherry-pick PR cryptography support: improve Python 2 Unicode handling #313 contents into that branch:
    $ git cherry-pick -x eb8dabce84302621351b409e7e52594e03937a17
    If it'll yell at you with something like fatal: Commit eb8dabce84302621351b409e7e52594e03937a17 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x eb8dabce84302621351b409e7e52594e03937a17
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR cryptography support: improve Python 2 Unicode handling #313 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/eb8dabce84302621351b409e7e52594e03937a17/pr-313
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

felixfontein added a commit to felixfontein/community.crypto that referenced this pull request Oct 22, 2021
felixfontein added a commit that referenced this pull request Oct 29, 2021
)

* Improve Python 2 Unicode handling. (#313)

(cherry picked from commit eb8dabc)

* Remove test since it doesn't work with pyOpenSSL.

* Completely remove test.

* Update plugins/module_utils/crypto/cryptography_support.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using x509_certificate_info on certificates with unicode SANs fails
2 participants