* key.h (gpgme_key_s): Add OTRUST.

* keylist.c (set_ownertrust): New.
(keylist_colon_handler): Get the ownertrust value
* key.c (gpgme_key_get_string_attr,gpgme_key_get_ulong_attr):
Return that value.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 0696272ed0b04523783a4b4d85160c4d02cf9b85..fc030153aefb0c3c2b9d371cca4c6f4700efac01 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-10  Werner Koch  <wk@gnupg.org>
+
+       * key.h (gpgme_key_s): Add OTRUST.
+       * keylist.c (set_ownertrust): New.
+       (keylist_colon_handler): Get the ownertrust value
+       * key.c (gpgme_key_get_string_attr,gpgme_key_get_ulong_attr):
+       Return that value.
+
 2002-05-08  Marcus Brinkmann  <marcus@g10code.de>
 
        * w32-util.c: New static variable GET_PATH_LOCK.

diff --git a/trunk/gpgme/key.c b/trunk/gpgme/key.c
index 0b3b787f34d2a124ca2a1849abc0a7a9e2900616..43472dca7700c37524e568b346aad485e6fbb530 100644 (file)
--- a/trunk/gpgme/key.c
+++ b/trunk/gpgme/key.c
@@ -887,8 +887,15 @@ gpgme_key_get_string_attr (GpgmeKey key, GpgmeAttr what,
     case GPGME_ATTR_EXPIRE:  
       /* Use another get function.  */
       break;
-    case GPGME_ATTR_OTRUST:
-      val = "[fixme]";
+    case GPGME_ATTR_OTRUST:  
+      switch (key->otrust)
+        {
+        case GPGME_VALIDITY_NEVER:     val = "n"; break;
+        case GPGME_VALIDITY_MARGINAL:  val = "m"; break;
+        case GPGME_VALIDITY_FULL:      val = "f"; break;
+        case GPGME_VALIDITY_ULTIMATE:  val = "u"; break;
+        default:   val = "?"; break;
+        }
       break;
     case GPGME_ATTR_USERID:  
       for (u = key->uids; u && idx; u = u->next, idx--)
@@ -1041,6 +1048,9 @@ gpgme_key_get_ulong_attr (GpgmeKey key, GpgmeAttr what,
       if (u)
        val = u->validity;
       break;
+    case GPGME_ATTR_OTRUST:
+      val = key->otrust;
+      break;
     case GPGME_ATTR_IS_SECRET:
       val = !!key->secret;
       break;

diff --git a/trunk/gpgme/key.h b/trunk/gpgme/key.h
index bc00f5ff65ec604c0ae0320dda75f6cb012135bf..39a131616f6cb6826a8ec32c10e5533a9aed59b0 100644 (file)
--- a/trunk/gpgme/key.h
+++ b/trunk/gpgme/key.h
@@ -62,6 +62,7 @@ struct gpgme_key_s {
   char *issuer_serial; /* malloced string used only with X.509 */
   char *issuer_name;   /* ditto */
   char *chain_id;      /* ditto */
+  GpgmeValidity otrust; /* only used with OpenPGP */
   struct subkey_s   keys; 
   struct user_id_s *uids;
 };

diff --git a/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c
index 57a8980991316c515cd89e4204f9e5d7fdcac9c1..a04300a06a21e44aee9398872f693794afc5737a 100644 (file)
--- a/trunk/gpgme/keylist.c
+++ b/trunk/gpgme/keylist.c
@@ -151,6 +151,23 @@ set_subkey_capability ( struct subkey_s *k, const char *s)
     }
 }
 
+static void
+set_ownertrust (GpgmeKey key, const char *s)
+{
+  /* Look at letters and stop at the first digit.  */
+  for (; *s && !my_isdigit (*s); s++)
+    {
+      switch (*s)
+       {
+       case 'n': key->otrust = GPGME_VALIDITY_NEVER; break;
+       case 'm': key->otrust = GPGME_VALIDITY_MARGINAL; break;
+       case 'f': key->otrust = GPGME_VALIDITY_FULL; break;
+       case 'u': key->otrust = GPGME_VALIDITY_ULTIMATE; break;
+        default : key->otrust = GPGME_VALIDITY_UNKNOWN; break;
+        }
+    }
+}
+
 
 /* Note: We are allowed to modify LINE.  */
 static void
@@ -312,6 +329,7 @@ keylist_colon_handler (GpgmeCtx ctx, char *line)
                 }
              break;
            case 9: /* ownertrust */
+              set_ownertrust (key, p);
              break;
            case 10: /* not used for gpg due to --fixed-list-mode option 
                        but gpgsm stores the issuer name */