GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-04-29 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* keylist.c (set_mainkey_trust_info): Rewritten.
	(set_subkey_capability): Handle 'd' (disabled).
	(set_mainkey_capability): Rewritten.
This commit is contained in:
Marcus Brinkmann 2004-04-29 10:55:50 +00:00
parent a7adf03290
commit b9ed761b6e
2 changed files with 95 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpgme/ChangeLog
View File

@ -1,3 +1,9 @@
2004-04-29 Marcus Brinkmann <marcus@g10code.de>
* keylist.c (set_mainkey_trust_info): Rewritten.
(set_subkey_capability): Handle 'd' (disabled).
(set_mainkey_capability): Rewritten.
2004-04-22 Marcus Brinkmann <marcus@g10code.de> 2004-04-22 Marcus Brinkmann <marcus@g10code.de>
* gpgme.m4: Quote first argument to AC_DEFUN. * gpgme.m4: Quote first argument to AC_DEFUN.

179
gpgme/keylist.c
View File

@ -116,31 +116,63 @@ keylist_status_handler (void *priv, gpgme_status_code_t code, char *args)
} }
static void static void
set_mainkey_trust_info (gpgme_key_t key, const char *src) set_subkey_trust_info (gpgme_subkey_t subkey, const char *src)
{ {
/* Look at letters and stop at the first digit. */
while (*src && !isdigit (*src)) while (*src && !isdigit (*src))
{ {
switch (*src) switch (*src)
{ {
case 'e': case 'e':
key->subkeys->expired = 1; subkey->expired = 1;
break; break;
case 'r': case 'r':
key->subkeys->revoked = 1; subkey->revoked = 1;
break; break;
case 'd': case 'd':
/* Note that gpg 1.3 won't print that anymore but only uses /* Note that gpg 1.3 won't print that anymore but only uses
the capabilities field. */ the capabilities field. */
key->subkeys->disabled = 1; subkey->disabled = 1;
break; break;
case 'i': case 'i':
key->subkeys->invalid = 1; subkey->invalid = 1;
break;
}
src++;
}
}
static void
set_mainkey_trust_info (gpgme_key_t key, const char *src)
{
/* First set the trust info of the main key (the first subkey). */
set_subkey_trust_info (key->subkeys, src);
/* Now set the summarized trust info. */
while (*src && !isdigit (*src))
{
switch (*src)
{
case 'e':
key->expired = 1;
break;
case 'r':
key->revoked = 1;
break;
case 'd':
/* Note that gpg 1.3 won't print that anymore but only uses
the capabilities field. */
key->disabled = 1;
break;
case 'i':
key->invalid = 1;
break; break;
} }
src++; src++;
@ -188,89 +220,6 @@ set_userid_flags (gpgme_key_t key, const char *src)
} }
static void
set_subkey_trust_info (gpgme_subkey_t subkey, const char *src)
{
/* Look at letters and stop at the first digit. */
while (*src && !isdigit (*src))
{
switch (*src)
{
case 'e':
subkey->expired = 1;
break;
case 'r':
subkey->revoked = 1;
break;
case 'd':
subkey->disabled = 1;
break;
case 'i':
subkey->invalid = 1;
break;
}
src++;
}
}
static void
set_mainkey_capability (gpgme_key_t key, const char *src)
{
while (*src)
{
switch (*src)
{
case 'e':
key->subkeys->can_encrypt = 1;
break;
case 's':
key->subkeys->can_sign = 1;
break;
case 'c':
key->subkeys->can_certify = 1;
break;
case 'a':
key->subkeys->can_authenticate = 1;
break;
case 'd':
case 'D':
/* Note, that this flag is also set using the key validity
field for backward compatibility with gpg 1.2. We use d
and D, so that a future gpg version will be able to
disable certain subkeys. Currently it is expected that
gpg sets this for the primary key. */
key->subkeys->disabled = 1;
break;
case 'E':
key->can_encrypt = 1;
break;
case 'S':
key->can_sign = 1;
break;
case 'C':
key->can_certify = 1;
break;
case 'A':
key->can_authenticate = 1;
break;
}
src++;
}
}
static void static void
set_subkey_capability (gpgme_subkey_t subkey, const char *src) set_subkey_capability (gpgme_subkey_t subkey, const char *src)
{ {
@ -293,11 +242,61 @@ set_subkey_capability (gpgme_subkey_t subkey, const char *src)
case 'a': case 'a':
subkey->can_authenticate = 1; subkey->can_authenticate = 1;
break; break;
case 'd':
subkey->disabled = 1;
break;
} }
src++; src++;
} }
} }
static void
set_mainkey_capability (gpgme_key_t key, const char *src)
{
/* First set the capabilities of the main key (the first subkey). */
set_subkey_capability (key->subkeys, src);
while (*src)
{
switch (*src)
{
case 'd':
case 'D':
/* Note, that this flag is also set using the key validity
field for backward compatibility with gpg 1.2. We use d
and D, so that a future gpg version will be able to
disable certain subkeys. Currently it is expected that
gpg sets this for the primary key. */
key->disabled = 1;
break;
case 'e':
case 'E':
key->can_encrypt = 1;
break;
case 's':
case 'S':
key->can_sign = 1;
break;
case 'c':
case 'C':
key->can_certify = 1;
break;
case 'a':
case 'A':
key->can_authenticate = 1;
break;
}
src++;
}
}
static void static void
set_ownertrust (gpgme_key_t key, const char *src) set_ownertrust (gpgme_key_t key, const char *src)
{ {