github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-22 02:18:41 +00:00
Code Issues Projects Releases Wiki Activity

Rerun hack/vendor.sh to pick up gpgme changes

Browse Source 
See https://github.com/proglottis/gpgme/pull/7 for the full discussion.

Resolves #42 .
This commit is contained in:
Miloslav Trmač
2016-05-06 22:39:20 +02:00
parent 28973c0a2d
commit fe37c71a4f
5 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/mtrmac/gpgme/gpgme.go generated vendored
View File

@@ -26,7 +26,7 @@ type Callback func(uidHint string, prevWasBad bool, f *os.File) error
//export gogpgme_passfunc
func gogpgme_passfunc(hook unsafe.Pointer, uid_hint, passphrase_info *C.char, prev_was_bad, fd C.int) C.gpgme_error_t {
c := callbackLookup(*(*int)(hook)).(*Context)
c := callbackLookup(uintptr(hook)).(*Context)
go_uid_hint := C.GoString(uid_hint)
f := os.NewFile(uintptr(fd), go_uid_hint)
defer f.Close()
@@ -259,7 +259,7 @@ type Context struct {
KeyError error
callback Callback
cbc int
cbc uintptr
ctx C.gpgme_ctx_t
}
@@ -333,10 +333,10 @@ func (c *Context) SetCallback(callback Callback) error {
if callback != nil {
cbc := callbackAdd(c)
c.cbc = cbc
_, err = C.gpgme_set_passphrase_cb(c.ctx, C.gpgme_passphrase_cb_t(C.gogpgme_passfunc), unsafe.Pointer(&c.cbc))
_, err = C.gogpgme_set_passphrase_cb(c.ctx, C.gpgme_passphrase_cb_t(C.gogpgme_passfunc), C.uintptr_t(cbc))
} else {
c.cbc = 0
_, err = C.gpgme_set_passphrase_cb(c.ctx, nil, nil)
_, err = C.gogpgme_set_passphrase_cb(c.ctx, nil, 0)
}
return err
}