]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Logical not bitwise or. ok djm@
authordtucker@openbsd.org <dtucker@openbsd.org>
Wed, 27 Jan 2021 00:37:26 +0000 (00:37 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 27 Jan 2021 00:45:50 +0000 (11:45 +1100)
OpenBSD-Commit-ID: d4dc855cf04951b93c45caa383e1ac9af0a3b0e5

ssh-agent.c

index 2860d74f2bc41ab0968a1f61ab343707b56002bb..ef6fa345a8b38d87b9d6b467c5eff24e80faee81 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.272 2021/01/26 11:25:01 dtucker Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.273 2021/01/27 00:37:26 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -438,7 +438,7 @@ process_sign_request2(SocketEntry *e)
 
        debug_f("entering");
 
-       if ((msg = sshbuf_new()) == NULL | (data = sshbuf_new()) == NULL)
+       if ((msg = sshbuf_new()) == NULL || (data = sshbuf_new()) == NULL)
                fatal_f("sshbuf_new failed");
        if ((r = sshkey_froms(e->request, &key)) != 0 ||
            (r = sshbuf_get_stringb(e->request, data)) != 0 ||