mirror of
https://github.com/containers/skopeo.git
synced 2025-04-27 19:05:32 +00:00
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č <mitr@redhat.com>
112 lines
2.3 KiB
C
112 lines
2.3 KiB
C
#include "go_gpgme.h"
|
|
|
|
gpgme_error_t gogpgme_data_new_from_cbs(gpgme_data_t *dh, gpgme_data_cbs_t cbs, uintptr_t handle) {
|
|
return gpgme_data_new_from_cbs(dh, cbs, (void *)handle);
|
|
}
|
|
|
|
void gogpgme_set_passphrase_cb(gpgme_ctx_t ctx, gpgme_passphrase_cb_t cb, uintptr_t handle) {
|
|
gpgme_set_passphrase_cb(ctx, cb, (void *)handle);
|
|
}
|
|
|
|
gpgme_off_t gogpgme_data_seek(gpgme_data_t dh, gpgme_off_t offset, int whence) {
|
|
return gpgme_data_seek(dh, offset, whence);
|
|
}
|
|
|
|
gpgme_error_t gogpgme_op_assuan_transact_ext(
|
|
gpgme_ctx_t ctx,
|
|
char* cmd,
|
|
uintptr_t data_h,
|
|
uintptr_t inquiry_h,
|
|
uintptr_t status_h,
|
|
gpgme_error_t *operr
|
|
){
|
|
return gpgme_op_assuan_transact_ext(
|
|
ctx,
|
|
cmd,
|
|
(gpgme_assuan_data_cb_t) gogpgme_assuan_data_callback, (void *)data_h,
|
|
(gpgme_assuan_inquire_cb_t) gogpgme_assuan_inquiry_callback, (void *)inquiry_h,
|
|
(gpgme_assuan_status_cb_t) gogpgme_assuan_status_callback, (void *)status_h,
|
|
operr
|
|
);
|
|
}
|
|
|
|
unsigned int key_revoked(gpgme_key_t k) {
|
|
return k->revoked;
|
|
}
|
|
|
|
unsigned int key_expired(gpgme_key_t k) {
|
|
return k->expired;
|
|
}
|
|
|
|
unsigned int key_disabled(gpgme_key_t k) {
|
|
return k->disabled;
|
|
}
|
|
|
|
unsigned int key_invalid(gpgme_key_t k) {
|
|
return k->invalid;
|
|
}
|
|
|
|
unsigned int key_can_encrypt(gpgme_key_t k) {
|
|
return k->can_encrypt;
|
|
}
|
|
|
|
unsigned int key_can_sign(gpgme_key_t k) {
|
|
return k->can_sign;
|
|
}
|
|
|
|
unsigned int key_can_certify(gpgme_key_t k) {
|
|
return k->can_certify;
|
|
}
|
|
|
|
unsigned int key_secret(gpgme_key_t k) {
|
|
return k->secret;
|
|
}
|
|
|
|
unsigned int key_can_authenticate(gpgme_key_t k) {
|
|
return k->can_authenticate;
|
|
}
|
|
|
|
unsigned int key_is_qualified(gpgme_key_t k) {
|
|
return k->is_qualified;
|
|
}
|
|
|
|
unsigned int signature_wrong_key_usage(gpgme_signature_t s) {
|
|
return s->wrong_key_usage;
|
|
}
|
|
|
|
unsigned int signature_pka_trust(gpgme_signature_t s) {
|
|
return s->pka_trust;
|
|
}
|
|
|
|
unsigned int signature_chain_model(gpgme_signature_t s) {
|
|
return s->chain_model;
|
|
}
|
|
|
|
unsigned int subkey_revoked(gpgme_subkey_t k) {
|
|
return k->revoked;
|
|
}
|
|
|
|
unsigned int subkey_expired(gpgme_subkey_t k) {
|
|
return k->expired;
|
|
}
|
|
|
|
unsigned int subkey_disabled(gpgme_subkey_t k) {
|
|
return k->disabled;
|
|
}
|
|
|
|
unsigned int subkey_invalid(gpgme_subkey_t k) {
|
|
return k->invalid;
|
|
}
|
|
|
|
unsigned int subkey_secret(gpgme_subkey_t k) {
|
|
return k->secret;
|
|
}
|
|
|
|
unsigned int uid_revoked(gpgme_user_id_t u) {
|
|
return u->revoked;
|
|
}
|
|
|
|
unsigned int uid_invalid(gpgme_user_id_t u) {
|
|
return u->invalid;
|
|
}
|