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

Update to github.com/mtrmac/gpgme v0.1.2 #828

Merged
merged 5 commits into from
Feb 27, 2020

Conversation

mtrmac
Copy link
Contributor

@mtrmac mtrmac commented Feb 21, 2020

This fixes CVE-2020-8945 by incorporating proglottis/gpgme#23 .

Other changes included by the rebase:

  • Support for gpgme_off_t (~no-op on Linux)
  • Wrapping a few more GPGME functions (irrelevant if we don't call them)

Given how invasive the CVE fix is (affecting basically all binding code), it seems safer to just update the package (and be verifiably equivalent with upstream) than to backport and try to back out the few other changes.

Performed by updating vendor.conf and

$ vndr github.com/mtrmac/gpgme

mtrmac and others added 4 commits February 21, 2020 16:29
... which was for some uknown reason removed in the previous backport.

Signed-off-by: Miloslav Trmač <[email protected]>
v1 is a branch, not a tag, so (make vendor) was updating it,
bringing unexpected (not necessarily unwanted, but unexpected)
changes.

Signed-off-by: Miloslav Trmač <[email protected]>
This fixes CVE-2020-8945 by incorporating proglottis/gpgme#23 .

Other changes included by the rebase:
- Support for gpgme_off_t (~no-op on Linux)
- Wrapping a few more GPGME functions (irrelevant if we don't call them)

Given how invasive the CVE fix is (affecting basically all binding
code), it seems safer to just update the package (and be verifiably
equivalent with upstream) than to backport and try to back out the few
other changes.

Performed by updating vendor conf and
$ vndr github.com/mtrmac/gpgme

Signed-off-by: Miloslav Trmač <[email protected]>
the package was renamed on Fedora 31.

Signed-off-by: Giuseppe Scrivano <[email protected]>
@mtrmac mtrmac force-pushed the gpgme-update-0.1.37 branch from 3718495 to 14f5abb Compare February 21, 2020 15:31
 - start_registry() - use bash builtins, not curl, to test
   if registry port is open.

   curl on Fedora now barfs with "Received HTTP/0.9 when not
   allowed" when the registry is run with SSL, because the
   response is not valid HTTP. One workaround would be 'curl
   --http0.9' but (surprise) that option doesn't exist on rhel8;
   and even with that option we would need --output /dev/null
   to silence a different curl warning. Curl is overkill
   for this purpose anyway, all we really need is netcat
   or some simple binary is-port-listening-or-not test.
   Fortunately, bash provides a /dev/tcp/<host>/<port>
   emulator that does the right thing and works on Fedora
   as well as RHEL8.

 - new log_and_run() helper

   This is the noisiest yet least critical part of this PR.
   I'm sorry. It's motivated by my frustration in trying
   to reproduce the curl problem above: getting just the
   right incantation of openssl + podman-run cost me time.
   With this enhancement, important commands are logged
   as part of the output of failing tests, making it
   easy[*] for maintenance programmers to figure out a
   recipe for reproducing the failure.

     [*] "easy" as long as the test-writing developer
         uses log_and_run() wisely.

Signed-off-by: Ed Santiago <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Feb 27, 2020

LGTM

@rhatdan rhatdan merged commit c79a5b4 into containers:release-0.1.37-rhel Feb 27, 2020
@mtrmac mtrmac deleted the gpgme-update-0.1.37 branch February 27, 2020 14:54
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants