Skip to content

Commit

Permalink
Update to github.com/mtrmac/gpgme v0.1.2
Browse files Browse the repository at this point in the history
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,
$ vndr github.com/mtrmac/gpgme
and manually backing out unrelated deletions of files.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
  • Loading branch information
mtrmac committed Feb 21, 2020
1 parent fd338a6 commit 29835bb
Show file tree
Hide file tree
Showing 8 changed files with 357 additions and 78 deletions.
2 changes: 1 addition & 1 deletion vendor.conf
Expand Up @@ -49,7 +49,7 @@ github.com/xeipuuv/gojsonpointer master
go4.org master https://github.com/camlistore/go4
github.com/ostreedev/ostree-go aeb02c6b6aa2889db3ef62f7855650755befd460
# -- end OCI image validation requirements
github.com/mtrmac/gpgme master
github.com/mtrmac/gpgme v0.1.2
# openshift/origin' k8s dependencies as of OpenShift v1.1.5
k8s.io/client-go master
github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
Expand Down
18 changes: 12 additions & 6 deletions vendor/github.com/mtrmac/gpgme/data.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/mtrmac/gpgme/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/mtrmac/gpgme/go_gpgme.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions vendor/github.com/mtrmac/gpgme/go_gpgme.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 29835bb

Please sign in to comment.