
2003-04-30 Marcus Brinkmann <marcus@g10code.de> * gpgme.texi (Key Listing Mode): Add GPGME_KEYLIST_MODE_SIGS. (Manipulating Keys): Add obsoleteness note. (Key Signatures): Likewise. (Information About Keys): Likewise. (Key Management): Add new data types GpgmeSubkey, GpgmeKeySig, GpgmeUserID, and all the information about GpgmeKey. gpgme/ 2003-04-30 Marcus Brinkmann <marcus@g10code.de> * gpgme.h (struct _gpgme_key): New structure. (GpgmeKey): Define using _gpgme_key. (struct _gpgme_subkey): New structure. (GpgmeSubKey): New type. (struct _gpgme_key_sig): New structure. (GpgmeKeySig): New type. (struct _gpgme_user_id): New structure. (GpgmeUserID): New type. (struct _gpgme_op_keylist_result): New structure. (GpgmeKeyListResult): New type. (gpgme_op_keylist_result): New function. (gpgme_key_get_as_xml): Remove prototype. * context.h (struct gpgme_context_s): Remove members tmp_key, tmp_uid, key_cond and key_queue. (struct key_queue_item_s): Remove structure. (struct user_id_s): Remove structure. (struct gpgme_recipients_s): Replace with simple GpgmeUserID list. * gpgme.c (gpgme_release): Do not release CTX->tmp_key. * ops.h (_gpgme_key_add_subkey, _gpgme_key_append_name, _gpgme_key_add_sig, _gpgme_trust_item_new): New prototypes. * rungpg.c (command_cb): Return GpgmeError instead int. New variable ERR. Use it to hold return value of cmd handler. (gpg_delete): Access fingerprint of key directly. (append_args_from_signers): Likewise. (gpg_edit): Likewise. (append_args_from_recipients): Use GpgmeUserID for recipient list. * engine-gpgsm.c: Do not include "key.h". (gpgsm_delete): Access fingerprint of key directly. (gpgsm_sign): Likewise. (set_recipients): Use GpgmeUserID for recipients. Invert invalid user ID flag. * key.h: File removed. * key.c: Completely reworked to use exposed GpgmeKey data types. * keylist.c: Likewise. * recipient.c: Completely reworked to use GpgmeUserID. tests/ 2003-04-30 Marcus Brinkmann <marcus@g10code.de> * gpg/t-keylist.c: Rewritten. * gpgsm/t-keylist.c (main): Rewritten. * gpg/t-edit.c (main): Do not use gpgme_key_get_as_xml. Use gpgme_key_unref instead gpgme_key_release. * gpg/t-signers.c (main): Use gpgme_key_unref instead gpgme_key_release.
170 lines
3.8 KiB
C
170 lines
3.8 KiB
C
/* trust-item.c - Trust item objects.
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003 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 General Public License as published by
|
||
the Free Software Foundation; either version 2 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
|
||
General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GPGME; if not, write to the Free Software Foundation,
|
||
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <assert.h>
|
||
|
||
#include "util.h"
|
||
#include "ops.h"
|
||
#include "sema.h"
|
||
|
||
|
||
/* Protects all reference counters in trust items. All other accesses
|
||
to a trust item are either read only or happen before the trust
|
||
item is available to the user. */
|
||
DEFINE_STATIC_LOCK (trust_item_ref_lock);
|
||
|
||
|
||
/* Create a new trust item. */
|
||
GpgmeError
|
||
_gpgme_trust_item_new (GpgmeTrustItem *r_item)
|
||
{
|
||
GpgmeTrustItem item;
|
||
|
||
item = calloc (1, sizeof *item);
|
||
if (!item)
|
||
return GPGME_Out_Of_Core;
|
||
item->_refs = 1;
|
||
item->keyid = item->_keyid;
|
||
item->_keyid[16] = '\0';
|
||
item->owner_trust = item->_owner_trust;
|
||
item->_owner_trust[1] = '\0';
|
||
item->validity = item->_validity;
|
||
item->_validity[1] = '\0';
|
||
*r_item = item;
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Acquire a reference to ITEM. */
|
||
void
|
||
gpgme_trust_item_ref (GpgmeTrustItem item)
|
||
{
|
||
LOCK (trust_item_ref_lock);
|
||
item->_refs++;
|
||
UNLOCK (trust_item_ref_lock);
|
||
}
|
||
|
||
|
||
/* gpgme_trust_item_unref releases the trust item object. Note that
|
||
this function may not do an actual release if there are other
|
||
shallow copies of the object. You have to call this function for
|
||
every newly created trust item object as well as for every
|
||
gpgme_trust_item_ref() done on the trust item object. */
|
||
void
|
||
gpgme_trust_item_unref (GpgmeTrustItem item)
|
||
{
|
||
LOCK (trust_item_ref_lock);
|
||
assert (item->_refs > 0);
|
||
if (--item->_refs)
|
||
{
|
||
UNLOCK (trust_item_ref_lock);
|
||
return;
|
||
}
|
||
UNLOCK (trust_item_ref_lock);
|
||
|
||
if (item->name)
|
||
free (item->name);
|
||
free (item);
|
||
}
|
||
|
||
|
||
/* Compatibility interfaces. */
|
||
void
|
||
gpgme_trust_item_release (GpgmeTrustItem item)
|
||
{
|
||
gpgme_trust_item_unref (item);
|
||
}
|
||
|
||
/* Return the value of the attribute WHAT of ITEM, which has to be
|
||
representable by a string. */
|
||
const char *gpgme_trust_item_get_string_attr (GpgmeTrustItem item,
|
||
GpgmeAttr what,
|
||
const void *reserved, int idx)
|
||
{
|
||
const char *val = NULL;
|
||
|
||
if (!item)
|
||
return NULL;
|
||
if (reserved)
|
||
return NULL;
|
||
if (idx)
|
||
return NULL;
|
||
|
||
switch (what)
|
||
{
|
||
case GPGME_ATTR_KEYID:
|
||
val = item->keyid;
|
||
break;
|
||
|
||
case GPGME_ATTR_OTRUST:
|
||
val = item->owner_trust;
|
||
break;
|
||
|
||
case GPGME_ATTR_VALIDITY:
|
||
val = item->validity;
|
||
break;
|
||
|
||
case GPGME_ATTR_USERID:
|
||
val = item->name;
|
||
break;
|
||
|
||
default:
|
||
break;
|
||
}
|
||
return val;
|
||
}
|
||
|
||
|
||
/* Return the value of the attribute WHAT of KEY, which has to be
|
||
representable by an integer. IDX specifies a running index if the
|
||
attribute appears more than once in the key. */
|
||
int gpgme_trust_item_get_int_attr (GpgmeTrustItem item, GpgmeAttr what,
|
||
const void *reserved, int idx)
|
||
{
|
||
int val = 0;
|
||
|
||
if (!item)
|
||
return 0;
|
||
if (reserved)
|
||
return 0;
|
||
if (idx)
|
||
return 0;
|
||
|
||
switch (what)
|
||
{
|
||
case GPGME_ATTR_LEVEL:
|
||
val = item->level;
|
||
break;
|
||
|
||
case GPGME_ATTR_TYPE:
|
||
val = item->type;
|
||
break;
|
||
|
||
default:
|
||
break;
|
||
}
|
||
return val;
|
||
}
|