github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-28 07:37:41 +00:00
Code Issues Projects Releases Wiki Activity

Update mtrmac/gpgme vendor to fix build on CentOS 7

Browse Source
This commit is contained in:
Miloslav Trmač 2016-04-26 17:57:40 +02:00
parent dfc6352108
commit e76eecd533
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ func NewDataReader(r io.Reader) (*Data, error) {
d.cbs.read = C.gpgme_data_read_cb_t(C.gogpgme_readfunc)
cbc := callbackAdd(d)
d.cbc = cbc
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&cbc)))
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&d.cbc)))
}
// NewDataWriter returns a new callback based data buffer
@ -116,7 +116,7 @@ func NewDataWriter(w io.Writer) (*Data, error) {
d.cbs.write = C.gpgme_data_write_cb_t(C.gogpgme_writefunc)
cbc := callbackAdd(d)
d.cbc = cbc
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&cbc)))
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&d.cbc)))
}
// NewDataReadWriter returns a new callback based data buffer
@ -128,7 +128,7 @@ func NewDataReadWriter(rw io.ReadWriter) (*Data, error) {
d.cbs.write = C.gpgme_data_write_cb_t(C.gogpgme_writefunc)
cbc := callbackAdd(d)
d.cbc = cbc
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&cbc)))
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&d.cbc)))
}
// NewDataReadWriteSeeker returns a new callback based data buffer
@ -142,7 +142,7 @@ func NewDataReadWriteSeeker(rw io.ReadWriteSeeker) (*Data, error) {
d.cbs.seek = C.gpgme_data_seek_cb_t(C.gogpgme_seekfunc)
cbc := callbackAdd(d)
d.cbc = cbc
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&cbc)))
return d, handleError(C.gpgme_data_new_from_cbs(&d.dh, &d.cbs, unsafe.Pointer(&d.cbc)))
}
// Close releases any resources associated with the data buffer

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

@ -53,13 +53,13 @@ const (
type PinEntryMode int
const (
PinEntryDefault PinEntryMode = C.GPGME_PINENTRY_MODE_DEFAULT
PinEntryAsk PinEntryMode = C.GPGME_PINENTRY_MODE_ASK
PinEntryCancel PinEntryMode = C.GPGME_PINENTRY_MODE_CANCEL
PinEntryError PinEntryMode = C.GPGME_PINENTRY_MODE_ERROR
PinEntryLoopback PinEntryMode = C.GPGME_PINENTRY_MODE_LOOPBACK
)
// const ( // Unavailable in 1.3.2
// PinEntryDefault PinEntryMode = C.GPGME_PINENTRY_MODE_DEFAULT
// PinEntryAsk PinEntryMode = C.GPGME_PINENTRY_MODE_ASK
// PinEntryCancel PinEntryMode = C.GPGME_PINENTRY_MODE_CANCEL
// PinEntryError PinEntryMode = C.GPGME_PINENTRY_MODE_ERROR
// PinEntryLoopback PinEntryMode = C.GPGME_PINENTRY_MODE_LOOPBACK
// )
type EncryptFlag uint
@ -314,13 +314,15 @@ func (c *Context) KeyListMode() KeyListMode {
return KeyListMode(C.gpgme_get_keylist_mode(c.ctx))
}
func (c *Context) SetPinEntryMode(m PinEntryMode) error {
return handleError(C.gpgme_set_pinentry_mode(c.ctx, C.gpgme_pinentry_mode_t(m)))
}
// Unavailable in 1.3.2:
// func (c *Context) SetPinEntryMode(m PinEntryMode) error {
// return handleError(C.gpgme_set_pinentry_mode(c.ctx, C.gpgme_pinentry_mode_t(m)))
// }
func (c *Context) PinEntryMode() PinEntryMode {
return PinEntryMode(C.gpgme_get_pinentry_mode(c.ctx))
}
// Unavailable in 1.3.2:
// func (c *Context) PinEntryMode() PinEntryMode {
// return PinEntryMode(C.gpgme_get_pinentry_mode(c.ctx))
// }
func (c *Context) SetCallback(callback Callback) error {
var err error
@ -331,7 +333,7 @@ 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(&cbc))
_, err = C.gpgme_set_passphrase_cb(c.ctx, C.gpgme_passphrase_cb_t(C.gogpgme_passfunc), unsafe.Pointer(&c.cbc))
} else {
c.cbc = 0
_, err = C.gpgme_set_passphrase_cb(c.ctx, nil, nil)