Adding upstream version 2.2.43.upstream/2.2.43upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/agent/protect-tool.c b/agent/protect-tool.c
index fb2c71d..35ed993 100644
--- a/agent/protect-tool.c
+++ b/agent/protect-tool.c
@@ -98,7 +98,6 @@ static const char *opt_passphrase;
 static char *opt_prompt;
 static int opt_status_msg;
 static const char *opt_agent_program;
-static int opt_debug_use_ocb;
 
 static char *get_passphrase (int promptno);
 static void release_passphrase (char *pw);
@@ -345,8 +344,7 @@ read_and_protect (const char *fname)
     return;
 
   pw = get_passphrase (1);
-  rc = agent_protect (key, pw, &result, &resultlen, 0,
-                      opt_debug_use_ocb? 1 : -1);
+  rc = agent_protect (key, pw, &result, &resultlen, 0);
   release_passphrase (pw);
   xfree (key);
   if (rc)
@@ -605,7 +603,7 @@ main (int argc, char **argv )
         case oHaveCert: opt_have_cert = 1; break;
         case oPrompt: opt_prompt = pargs.r.ret_str; break;
         case oStatusMsg: opt_status_msg = 1; break;
-        case oDebugUseOCB: opt_debug_use_ocb = 1; break;
+        case oDebugUseOCB: /* dummy */; break;
 
         default: pargs.err = ARGPARSE_PRINT_ERROR; break;
 	}
@@ -809,14 +807,15 @@ agent_askpin (ctrl_t ctrl,
  * to stdout. */
 int
 agent_write_private_key (const unsigned char *grip,
-                         const void *buffer, size_t length, int force,
-                         time_t timestamp,
+                         const void *buffer, size_t length,
+                         int force, int reallyforce,
                          const char *serialno, const char *keyref,
-                         const char *dispserialno)
+                         const char *dispserialno, time_t timestamp)
 {
   char hexgrip[40+4+1];
   char *p;
 
+  (void)reallyforce;
   (void)force;
   (void)timestamp;
   (void)serialno;