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

openssl_pkcs12: handle pyOpenSSL 23.3.0, which removed PKCS#12 support #666

Merged
merged 1 commit into from
Oct 28, 2023

Conversation

felixfontein
Copy link
Contributor

SUMMARY

See https:/pyca/pyopenssl/blob/main/CHANGELOG.rst#2330-2023-10-25.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

openssl_pkcs12

@github-actions
Copy link

github-actions bot commented Oct 28, 2023

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and the docs are now incorporated into main:
https://ansible-collections.github.io/community.crypto/branch/main

@felixfontein felixfontein merged commit d1299c1 into ansible-collections:main Oct 28, 2023
126 checks passed
@felixfontein felixfontein deleted the pkcs12 branch October 28, 2023 13:38
@patchback
Copy link

patchback bot commented Oct 28, 2023

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

❌ Failed to cleanly apply d1299c1 on top of patchback/backports/stable-1/d1299c11d6ff6d61ef97b0330c4520f04b3171be/pr-666

Backporting merged PR #666 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:/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/d1299c11d6ff6d61ef97b0330c4520f04b3171be/pr-666 upstream/stable-1
  4. Now, cherry-pick PR openssl_pkcs12: handle pyOpenSSL 23.3.0, which removed PKCS#12 support #666 contents into that branch:
    $ git cherry-pick -x d1299c11d6ff6d61ef97b0330c4520f04b3171be
    If it'll yell at you with something like fatal: Commit d1299c11d6ff6d61ef97b0330c4520f04b3171be is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d1299c11d6ff6d61ef97b0330c4520f04b3171be
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR openssl_pkcs12: handle pyOpenSSL 23.3.0, which removed PKCS#12 support #666 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/d1299c11d6ff6d61ef97b0330c4520f04b3171be/pr-666
  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:/sanitizers/patchback-github-app.

@felixfontein
Copy link
Contributor Author

Manual backport to stable-1 in #668.

felixfontein added a commit that referenced this pull request Oct 28, 2023
…S#12 support (#668)

* Handle pyOpenSSL 23.3.0, which removed PKCS#12 support (at least partially). (#666)

(cherry picked from commit d1299c1)

* Try to fix FreeBSD 13.1 failures in CI.
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.

1 participant