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 with the RHEL 7 GPGME 1.3.2)
- Wrapping a few more GPGME functions (irrelevant if we don't call them)
- Better error reporting in Context.GetKey

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
$ mkdir -p _build/src/github.com/docker
$ ln -s $(pwd) _build/src/github.com/docker/docker
$ GOPATH=$(pwd)/_build:$GOPATH vndr github.com/mtrmac/gpgme

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
  • Loading branch information
mtrmac committed Feb 20, 2020
1 parent 31b404f commit 2c7552e
Show file tree
Hide file tree
Showing 9 changed files with 378 additions and 78 deletions.
2 changes: 1 addition & 1 deletion vendor.conf
Expand Up @@ -147,7 +147,7 @@ github.com/opencontainers/image-spec v1.0.0-rc4
k8s.io/kubernetes 4a3f9c5b19c7ff804cbc1bf37a15c044ca5d2353 https://github.com/openshift/kubernetes
github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed
github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee
github.com/mtrmac/gpgme master
github.com/mtrmac/gpgme v0.1.2
github.com/containers/storage master
github.com/opencontainers/go-digest master

Expand Down
13 changes: 13 additions & 0 deletions vendor/github.com/mtrmac/gpgme/README.md

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

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 2c7552e

Please sign in to comment.