aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/context.h2
-rw-r--r--src/engine-assuan.c1
-rw-r--r--src/engine-backend.h2
-rw-r--r--src/engine-g13.c1
-rw-r--r--src/engine-gpg.c33
-rw-r--r--src/engine-gpgconf.c1
-rw-r--r--src/engine-gpgsm.c1
-rw-r--r--src/engine-spawn.c1
-rw-r--r--src/engine-uiserver.c1
-rw-r--r--src/engine.c13
-rw-r--r--src/engine.h4
-rw-r--r--src/gpgme.def3
-rw-r--r--src/gpgme.h.in6
-rw-r--r--src/libgpgme.vers3
-rw-r--r--src/setownertrust.c181
16 files changed, 252 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b17aac25..03708620 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -85,7 +85,7 @@ main_sources = \
key.c keylist.c keysign.c trust-item.c trustlist.c tofupolicy.c \
revsig.c \
import.c export.c genkey.c delete.c edit.c getauditlog.c \
- setexpire.c \
+ setexpire.c setownertrust.c \
opassuan.c passwd.c spawn.c assuan-support.c \
engine.h engine-backend.h engine.c engine-gpg.c status-table.c \
engine-gpgsm.c engine-assuan.c engine-gpgconf.c \
diff --git a/src/context.h b/src/context.h
index 454625e7..ea80f48f 100644
--- a/src/context.h
+++ b/src/context.h
@@ -39,7 +39,7 @@ typedef enum
OPDATA_IMPORT, OPDATA_GENKEY, OPDATA_KEYLIST, OPDATA_EDIT,
OPDATA_VERIFY, OPDATA_TRUSTLIST, OPDATA_ASSUAN, OPDATA_VFS_MOUNT,
OPDATA_PASSWD, OPDATA_EXPORT, OPDATA_KEYSIGN, OPDATA_TOFU_POLICY,
- OPDATA_QUERY_SWDB, OPDATA_SETEXPIRE, OPDATA_REVSIG
+ OPDATA_QUERY_SWDB, OPDATA_SETEXPIRE, OPDATA_REVSIG, OPDATA_SETOWNERTRUST
} ctx_op_data_id_t;
diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index ab9d05a9..ee28740d 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -839,6 +839,7 @@ struct engine_ops _gpgme_engine_ops_assuan =
NULL, /* verify */
NULL, /* getauditlog */
NULL, /* setexpire */
+ NULL, /* setownertrust */
llass_transact, /* opassuan_transact */
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine-backend.h b/src/engine-backend.h
index 8c98e5a3..d889d1a7 100644
--- a/src/engine-backend.h
+++ b/src/engine-backend.h
@@ -129,6 +129,8 @@ struct engine_ops
gpgme_error_t (*setexpire) (void *engine, gpgme_key_t key,
unsigned long expires, const char *subfprs,
unsigned int reserved);
+ gpgme_error_t (*setownertrust) (void *engine, gpgme_key_t key,
+ const char *value);
gpgme_error_t (*opassuan_transact) (void *engine,
const char *command,
gpgme_assuan_data_cb_t data_cb,
diff --git a/src/engine-g13.c b/src/engine-g13.c
index 3c111496..9852be88 100644
--- a/src/engine-g13.c
+++ b/src/engine-g13.c
@@ -810,6 +810,7 @@ struct engine_ops _gpgme_engine_ops_g13 =
NULL, /* verify */
NULL, /* getauditlog */
NULL, /* setexpire */
+ NULL, /* setownertrust */
g13_transact,
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 376dad0a..b099f566 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -4017,6 +4017,38 @@ gpg_setexpire (void *engine, gpgme_key_t key, unsigned long expires,
}
+static gpgme_error_t
+gpg_setownertrust (void *engine, gpgme_key_t key, const char *value)
+{
+ engine_gpg_t gpg = engine;
+ gpgme_error_t err;
+
+ if (!have_gpg_version (gpg, "2.4.6"))
+ return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
+ if (!key || !key->fpr)
+ return gpg_error (GPG_ERR_INV_VALUE);
+ if (!value || !*value)
+ return gpg_error (GPG_ERR_INV_VALUE);
+
+ err = add_arg (gpg, "--quick-set-ownertrust");
+
+ if (!err)
+ err = add_arg (gpg, "--");
+
+ if (!err)
+ err = add_arg (gpg, key->fpr);
+
+ if (!err)
+ err = add_arg (gpg, value);
+
+ if (!err)
+ err = start (gpg);
+
+ return err;
+}
+
+
struct engine_ops _gpgme_engine_ops_gpg =
{
@@ -4056,6 +4088,7 @@ struct engine_ops _gpgme_engine_ops_gpg =
gpg_verify,
gpg_getauditlog,
gpg_setexpire,
+ gpg_setownertrust,
NULL, /* opassuan_transact */
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index caf4d789..03999ddd 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -1310,6 +1310,7 @@ struct engine_ops _gpgme_engine_ops_gpgconf =
NULL, /* verify */
NULL, /* getauditlog */
NULL, /* setexpire */
+ NULL, /* setownertrust */
NULL, /* opassuan_transact */
gpgconf_conf_load,
gpgconf_conf_save,
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 8ee29de8..dfc51128 100644
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -2444,6 +2444,7 @@ struct engine_ops _gpgme_engine_ops_gpgsm =
gpgsm_verify,
gpgsm_getauditlog,
NULL, /* setexpire */
+ NULL, /* setownertrust */
NULL, /* opassuan_transact */
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine-spawn.c b/src/engine-spawn.c
index 368280f3..a6280cde 100644
--- a/src/engine-spawn.c
+++ b/src/engine-spawn.c
@@ -470,6 +470,7 @@ struct engine_ops _gpgme_engine_ops_spawn =
NULL, /* verify */
NULL, /* getauditlog */
NULL, /* setexpire */
+ NULL, /* setownertrust */
NULL, /* opassuan_transact */
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index 3e9836af..cdde41fd 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -1453,6 +1453,7 @@ struct engine_ops _gpgme_engine_ops_uiserver =
uiserver_verify,
NULL, /* getauditlog */
NULL, /* setexpire */
+ NULL, /* setownertrust */
NULL, /* opassuan_transact */
NULL, /* conf_load */
NULL, /* conf_save */
diff --git a/src/engine.c b/src/engine.c
index f1efdf34..287e182f 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1161,3 +1161,16 @@ _gpgme_engine_op_setexpire (engine_t engine, gpgme_key_t key,
return (*engine->ops->setexpire) (engine->engine, key, expires, subfprs, reserved);
}
+
+gpgme_error_t
+_gpgme_engine_op_setownertrust (engine_t engine, gpgme_key_t key,
+ const char *value)
+{
+ if (!engine)
+ return gpg_error (GPG_ERR_INV_VALUE);
+
+ if (!engine->ops->setownertrust)
+ return gpg_error (GPG_ERR_NOT_IMPLEMENTED);
+
+ return (*engine->ops->setownertrust) (engine->engine, key, value);
+}
diff --git a/src/engine.h b/src/engine.h
index ae57cbed..8c2d03ca 100644
--- a/src/engine.h
+++ b/src/engine.h
@@ -225,6 +225,8 @@ gpgme_error_t _gpgme_engine_op_setexpire (engine_t engine,
unsigned long expires,
const char *subfprs,
unsigned int reserved);
-
+gpgme_error_t _gpgme_engine_op_setownertrust (engine_t engine,
+ gpgme_key_t key,
+ const char *value);
#endif /* ENGINE_H */
diff --git a/src/gpgme.def b/src/gpgme.def
index 67c189c7..26cc7181 100644
--- a/src/gpgme.def
+++ b/src/gpgme.def
@@ -285,5 +285,8 @@ EXPORTS
gpgme_op_verify_ext @211
gpgme_op_verify_ext_start @212
+
+ gpgme_op_setownertrust @213
+ gpgme_op_setownertrust_start @214
; END
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index 0ee3e088..a01a24a6 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1969,6 +1969,12 @@ gpgme_error_t gpgme_op_setexpire (gpgme_ctx_t ctx,
gpgme_key_t key, unsigned long expires,
const char *subfprs, unsigned int reserved);
+/* Change the ownertrust of a key. */
+gpgme_error_t gpgme_op_setownertrust_start (gpgme_ctx_t ctx,
+ gpgme_key_t key, const char *value);
+gpgme_error_t gpgme_op_setownertrust (gpgme_ctx_t ctx,
+ gpgme_key_t key, const char *value);
+
/* Retrieve a pointer to the result of a genkey, createkey, or
* createsubkey operation. */
gpgme_genkey_result_t gpgme_op_genkey_result (gpgme_ctx_t ctx);
diff --git a/src/libgpgme.vers b/src/libgpgme.vers
index 20ae9fea..cae3c2fe 100644
--- a/src/libgpgme.vers
+++ b/src/libgpgme.vers
@@ -285,6 +285,9 @@ GPGME_1.0 {
gpgme_op_verify_ext;
gpgme_op_verify_ext_start;
+ gpgme_op_setownertrust;
+ gpgme_op_setownertrust_start;
+
local:
*;
diff --git a/src/setownertrust.c b/src/setownertrust.c
new file mode 100644
index 00000000..86bd2888
--- /dev/null
+++ b/src/setownertrust.c
@@ -0,0 +1,181 @@
+/* setownertrust.c - Set ownertrust helpers.
+ * Copyright (C) 2024 g10 Code GmbH
+ *
+ * This file is part of GPGME.
+ *
+ * GPGME is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * GPGME is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <https://gnu.org/licenses/>.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+
+#include "gpgme.h"
+#include "debug.h"
+#include "context.h"
+#include "ops.h"
+
+
+typedef struct
+{
+ /* The error code from a FAILURE status line or 0. */
+ gpg_error_t failure_code;
+
+ /* The error code from an ERROR status line or 0. */
+ gpg_error_t error_code;
+
+} *op_data_t;
+
+
+/* Parse an error status line. Return the error location and the
+ error code. The function may modify ARGS. */
+static char *
+parse_error (char *args, gpg_error_t *r_err)
+{
+ char *where = strchr (args, ' ');
+ char *which;
+
+ if (where)
+ {
+ *where = '\0';
+ which = where + 1;
+
+ where = strchr (which, ' ');
+ if (where)
+ *where = '\0';
+
+ where = args;
+ }
+ else
+ {
+ *r_err = trace_gpg_error (GPG_ERR_INV_ENGINE);
+ return NULL;
+ }
+
+ *r_err = atoi (which);
+
+ return where;
+}
+
+
+static gpgme_error_t
+setownertrust_status_handler (void *priv, gpgme_status_code_t code, char *args)
+{
+ gpgme_ctx_t ctx = (gpgme_ctx_t) priv;
+ gpgme_error_t err;
+ void *hook;
+ op_data_t opd;
+ char *loc;
+
+ err = _gpgme_op_data_lookup (ctx, OPDATA_SETOWNERTRUST, &hook, -1, NULL);
+ opd = hook;
+ if (err)
+ return err;
+
+ switch (code)
+ {
+ case GPGME_STATUS_ERROR:
+ loc = parse_error (args, &err);
+ if (!loc)
+ return err;
+ if (!opd->error_code)
+ opd->error_code = err;
+ break;
+
+ case GPGME_STATUS_FAILURE:
+ if (!opd->failure_code
+ || gpg_err_code (opd->failure_code) == GPG_ERR_GENERAL)
+ opd->failure_code = _gpgme_parse_failure (args);
+ break;
+
+ case GPGME_STATUS_EOF:
+ if (opd->error_code)
+ err = opd->error_code;
+ else if (opd->failure_code)
+ err = opd->failure_code;
+ break;
+
+ default:
+ break;
+ }
+
+ return err;
+}
+
+
+/* Set the ownertrust of a key or enable/disable a key. See
+ --quick-set-ownertrust in the gnupg documentation. */
+static gpg_error_t
+setownertrust (gpgme_ctx_t ctx, int synchronous,
+ gpgme_key_t key,
+ const char *value)
+{
+ gpgme_error_t err;
+ void *hook;
+ op_data_t opd;
+
+ TRACE_BEG (DEBUG_CTX, "gpgme_op_setownertrust", ctx,
+ "%d key=%p value: %s",
+ synchronous, key, value);
+
+ if (!ctx)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
+ if (ctx->protocol != GPGME_PROTOCOL_OPENPGP)
+ return TRACE_ERR (gpgme_error (GPG_ERR_UNSUPPORTED_PROTOCOL));
+
+ if (!key)
+ return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
+
+ err = _gpgme_op_reset (ctx, synchronous);
+ if (err)
+ return err;
+
+ err = _gpgme_op_data_lookup (ctx, OPDATA_SETOWNERTRUST, &hook, sizeof (*opd),
+ NULL);
+ opd = hook;
+ if (err)
+ return err;
+
+ _gpgme_engine_set_status_handler (ctx->engine, setownertrust_status_handler,
+ ctx);
+
+ err = _gpgme_engine_op_setownertrust (ctx->engine, key, value);
+
+ if (synchronous && !err)
+ err = _gpgme_wait_one (ctx);
+ return TRACE_ERR (err);
+}
+
+
+/* See setownertrust. */
+gpgme_error_t
+gpgme_op_setownertrust_start (gpgme_ctx_t ctx,
+ gpgme_key_t key,
+ const char *value)
+{
+ return setownertrust (ctx, 0, key, value);
+}
+
+
+/* See setownertrust. This is the synchronous variant. */
+gpgme_error_t
+gpgme_op_setownertrust (gpgme_ctx_t ctx,
+ gpgme_key_t key,
+ const char *value)
+{
+ return setownertrust (ctx, 1, key, value);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 20:17:32 +0000