* pkclist.c (build_pk_list): Add new status code to indicate an untrusted
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 30 Aug 2002 19:21:55 +0000 (19:21 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 30 Aug 2002 19:21:55 +0000 (19:21 +0000)
user.  This (or a disabled key) fail with "unavailable pubkey"
(G10ERR_UNU_PUBKEY).

g10/ChangeLog
g10/pkclist.c

index ed418cf..a340147 100644 (file)
@@ -1,5 +1,9 @@
 2002-08-30  David Shaw  <dshaw@jabberwocky.com>
 
+       * pkclist.c (build_pk_list): Add new status code to indicate an
+       untrusted user.  This (or a disabled key) fail with "unavailable
+       pubkey" (G10ERR_UNU_PUBKEY).
+
        * pkclist.c (build_pk_list): Fail if any recipient keys are
        unusable.
 
index 040db11..5bb5446 100644 (file)
@@ -961,6 +961,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
                                                   remusr->d,
                                                   strlen (remusr->d),
                                                   -1);
+                   rc=G10ERR_UNU_PUBKEY;
                    goto fail;
                }
                else if( do_we_trust_pre( pk, trustlevel ) ) {
@@ -988,10 +989,11 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
                }
                else { /* we don't trust this pk */
                    free_public_key( pk ); pk = NULL;
-                    write_status_text_and_buffer (STATUS_INV_RECP, "0 ",
+                    write_status_text_and_buffer (STATUS_INV_RECP, "10 ",
                                                   remusr->d,
                                                   strlen (remusr->d),
                                                   -1);
+                   rc=G10ERR_UNU_PUBKEY;
                    goto fail;
                }
            }