Require autoconf 1.11

[gpgme.git] / src / encrypt-sign.c

diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c
index c80cb2a146b1417c26b2eabe582b8c4554227e6c..3b862be82796270f72c04c48238f334ffdf38569 100644 (file)
--- a/src/encrypt-sign.c
+++ b/src/encrypt-sign.c
@@ -22,6 +22,9 @@
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
 
 #include "gpgme.h"
 #include "debug.h"
@@ -92,6 +95,8 @@ gpgme_op_encrypt_sign_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
                             gpgme_encrypt_flags_t flags,
                             gpgme_data_t plain, gpgme_data_t cipher)
 {
+  gpgme_error_t err;
+
   TRACE_BEG3 (DEBUG_CTX, "gpgme_op_encrypt_sign_start", ctx,
              "flags=0x%x, plain=%p, cipher=%p", flags, plain, cipher);
   
@@ -101,14 +106,15 @@ gpgme_op_encrypt_sign_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
        {
-         TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }
     }
 
-  return TRACE_ERR (encrypt_sign_start (ctx, 0, recp, flags, plain, cipher));
+  err = encrypt_sign_start (ctx, 0, recp, flags, plain, cipher);
+  return err;
 }
 
 
@@ -131,8 +137,8 @@ gpgme_op_encrypt_sign (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
        {
-         TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-                     (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+         TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+                     (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
                      recp[i]->subkeys->fpr : "invalid");
          i++;
        }