From 46a58a0527b56e2480638c61596a0ae0b5f253a0 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 30 Aug 2002 19:21:55 +0000 Subject: [PATCH] * 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). --- g10/ChangeLog | 4 ++++ g10/pkclist.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index ed418cf81..a340147ca 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2002-08-30 David Shaw + * 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. diff --git a/g10/pkclist.c b/g10/pkclist.c index 040db11ba..5bb5446d6 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -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; } }