From 95415bdec77a608e6052ba3e2a5d857a8e8f7689 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Sun, 15 Mar 2015 12:57:13 +0100
Subject: agent: Remove useless conditions.

* agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
* agent/command-ssh.c (ssh_identity_register): Ditto.
--

Detected by Stack 0.3:

  bug: anti-simplify
  model: |
    %tobool22 = icmp ne i8* %arraydecay21, null, !dbg !717
    -->  true
  stack:
    - /home/wk/s/gnupg/agent/genkey.c:385:0
  ncore: 1
  core:
    - /home/wk/s/gnupg/agent/genkey.c:362:0
      - pointer overflow

  bug: anti-simplify
  model: |
    %tobool35 = icmp ne i8* %arraydecay34, null, !dbg !1053
    -->  true
  stack:
    - /home/wk/s/gnupg/agent/command-ssh.c:3120:0
  ncore: 1
  core:
    - /home/wk/s/gnupg/agent/command-ssh.c:3103:0
      - pointer overflow
---
 agent/genkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'agent/genkey.c')

diff --git a/agent/genkey.c b/agent/genkey.c
index d7b6007bf..ecf676eff 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -382,7 +382,7 @@ agent_ask_new_passphrase (ctrl_t ctrl, const char *prompt,
         }
       /* Unless the passphrase is empty or the pinentry told us that
          it already did the repetition check, ask to confirm it.  */
-      if (pi->pin && *pi->pin && !pi->repeat_okay)
+      if (*pi->pin && !pi->repeat_okay)
         {
           err = agent_askpin (ctrl, text2, NULL, NULL, pi2);
           if (err == -1)
-- 
cgit v1.2.3