1 files changed, 31 insertions, 25 deletions

diff --git a/src/gpg.c b/src/gpg.c
index 9ad3289..a2187ff 100644
--- a/src/gpg.c
+++ b/src/gpg.c
@@ -2,7 +2,7 @@
    gpg.c
 
    This file is part of GNU Anubis.
-   Copyright (C) 2001-2014 The Anubis Team.
+   Copyright (C) 2001-2024 The Anubis Team.
 
    GNU Anubis is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -21,12 +21,7 @@
 #include "headers.h"
 #include "extern.h"
 #include "rcfile.h"
-
-#ifdef HAVE_GPG
 #include <gpgme.h>
-#define obstack_chunk_alloc malloc
-#define obstack_chunk_free free
-#include <obstack.h>
 
 struct gpg_struct
 {
@@ -217,12 +212,15 @@ gpg_sign (char *gpg_data)
 }
 
 static gpgme_key_t *
-create_key_array(gpgme_ctx_t ctx, struct obstack *stk)
+create_key_array (gpgme_ctx_t ctx)
 {
   gpgme_key_t tmpkey;
   char *current_key;
   int i, j, len = strlen (gpg.encryption_keys);
-
+  gpgme_key_t *keybase = NULL;
+  size_t keycap = 0;
+  size_t keycnt = 0;
+  
   current_key = xmalloc (len+1);
   for (i = j = 0; i <= len; i++)
     {
@@ -237,8 +235,12 @@ create_key_array(gpgme_ctx_t ctx, struct obstack *stk)
               if (err)
                 break;
 
-              gpgme_get_key (ctx, current_key, &tmpkey, 0);
-              obstack_grow (stk, &tmpkey, sizeof (tmpkey));
+              err = gpgme_get_key (ctx, current_key, &tmpkey, 0);
+              if (err)
+                break;
+              if (keycap == keycnt)
+                keybase = x2nrealloc (keybase, &keycap, sizeof (keybase));
+              keybase[keycnt++] = tmpkey;
               if (options.termlevel == DEBUG)
                 {
                   gpgme_user_id_t uid;
@@ -248,23 +250,34 @@ create_key_array(gpgme_ctx_t ctx, struct obstack *stk)
                              uid->uid, uid->name, uid->email);
                 }
             }
-          if (gpg_err_code (err) != GPG_ERR_EOF)
+
+          switch (gpg_err_code (err))
             {
+            case GPG_ERR_EOF:
+              break;
+
+            case GPG_ERR_INV_VALUE:
+              fprintf (stderr, "key not found: %s\n", current_key);
+              exit (1);
+
+            default:
               fprintf (stderr, "cannot list keys: %s\n",
                        gpgme_strerror (err));
               exit (1);
             }
           
-          memset (current_key, 0, sizeof (current_key));
+          memset (current_key, 0, j);
           j = 0;
         }
       else
         current_key[j++] = gpg.encryption_keys[i];
     }
   xfree (current_key);
-  tmpkey = NULL;
-  obstack_grow (stk, &tmpkey, sizeof (tmpkey));
-  return obstack_finish (stk);
+
+  if (keycap == keycnt)
+    keybase = x2nrealloc (keybase, &keycap, sizeof (keybase));
+  keybase[keycnt] = NULL;
+  return keybase;
 }
 
 static char *
@@ -274,7 +287,6 @@ gpg_encrypt (char *gpg_data)
   gpgme_data_t in, out;
   char *encrypted_data;
   gpgme_key_t *keyptr;
-  struct obstack stk;
   gpgme_encrypt_result_t result;
   
   fail_if_err (gpgme_new (&ctx));
@@ -283,8 +295,7 @@ gpg_encrypt (char *gpg_data)
   fail_if_err (gpgme_data_new_from_mem (&in, gpg_data, strlen (gpg_data), 0));
   fail_if_err (gpgme_data_new (&out));
 
-  obstack_init (&stk);
-  keyptr = create_key_array (ctx, &stk);
+  keyptr = create_key_array (ctx);
   
   fail_if_err (gpgme_op_encrypt (ctx, keyptr, GPGME_ENCRYPT_ALWAYS_TRUST,
                                  in, out));
@@ -301,7 +312,6 @@ gpg_encrypt (char *gpg_data)
   anubis_gpg_read (out, strlen (gpg_data), &encrypted_data);
   for (; *keyptr; keyptr++)
     gpgme_key_unref (*keyptr);
-  obstack_free (&stk, NULL);
 
   gpgme_data_release (in);
   gpgme_data_release (out);
@@ -367,7 +377,6 @@ gpg_sign_encrypt (char *gpg_data)
   char *p, *se_data;            /* Signed-Encrypted Data */
   gpgme_encrypt_result_t result;
   gpgme_sign_result_t sign_result;
-  struct obstack stk;
   
   fail_if_err (gpgme_new (&ctx));
 
@@ -401,8 +410,7 @@ gpg_sign_encrypt (char *gpg_data)
   fail_if_err (gpgme_data_new_from_mem (&in, gpg_data, strlen (gpg_data), 0));
   fail_if_err (gpgme_data_new (&out));
 
-  obstack_init (&stk);
-  keyptr = create_key_array (ctx, &stk);
+  keyptr = create_key_array (ctx);
   fail_if_err (gpgme_op_encrypt_sign (ctx, keyptr, GPGME_ENCRYPT_ALWAYS_TRUST,
                                       in, out));
   result = gpgme_op_encrypt_result (ctx);
@@ -424,7 +432,7 @@ gpg_sign_encrypt (char *gpg_data)
 
   for (; *keyptr; keyptr++)
     gpgme_key_unref (*keyptr);
-  obstack_free (&stk, NULL);
+
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
@@ -571,6 +579,4 @@ gpg_section_init (void)
   rc_secdef_add_child (sp, &gpg_sect_child);
 }
 
-#endif /* HAVE_GPG */
-
 /* EOF */