tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Compare pointers to NULL rather than 0.

ok djm@

Upstream-ID: 21616cfea27eda65a06e772cc887530b9a1a27f8
This commit is contained in:
mmcc@openbsd.org 2015-10-20 23:24:25 +00:00 committed by Damien Miller
parent f98a09cacf
commit 7d6c036203
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth-bsdauth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-bsdauth.c,v 1.13 2014/06/24 01:13:21 djm Exp $ */ /* $OpenBSD: auth-bsdauth.c,v 1.14 2015/10/20 23:24:25 mmcc Exp $ */
/* /*
* Copyright (c) 2001 Markus Friedl. All rights reserved. * Copyright (c) 2001 Markus Friedl. All rights reserved.
* *
@ -103,7 +103,7 @@ bsdauth_respond(void *ctx, u_int numresponses, char **responses)
if (!authctxt->valid) if (!authctxt->valid)
return -1; return -1;
if (authctxt->as == 0) if (authctxt->as == NULL)
error("bsdauth_respond: no bsd auth session"); error("bsdauth_respond: no bsd auth session");
if (numresponses != 1) if (numresponses != 1)

6
monitor.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: monitor.c,v 1.153 2015/09/04 04:44:08 djm Exp $ */ /* $OpenBSD: monitor.c,v 1.154 2015/10/20 23:24:25 mmcc Exp $ */
/* /*
* Copyright 2002 Niels Provos <provos@citi.umich.edu> * Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org> * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -966,7 +966,7 @@ mm_answer_bsdauthrespond(int sock, Buffer *m)
char *response; char *response;
int authok; int authok;
if (authctxt->as == 0) if (authctxt->as == NULL)
fatal("%s: no bsd auth session", __func__); fatal("%s: no bsd auth session", __func__);
response = buffer_get_string(m, NULL); response = buffer_get_string(m, NULL);
@ -1847,7 +1847,7 @@ monitor_apply_keystate(struct monitor *pmonitor)
sshbuf_free(child_state); sshbuf_free(child_state);
child_state = NULL; child_state = NULL;
if ((kex = ssh->kex) != 0) { if ((kex = ssh->kex) != NULL) {
/* XXX set callbacks */ /* XXX set callbacks */
#ifdef WITH_OPENSSL #ifdef WITH_OPENSSL
kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server;

8
sshbuf-getput-basic.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshbuf-getput-basic.c,v 1.4 2015/01/14 15:02:39 djm Exp $ */ /* $OpenBSD: sshbuf-getput-basic.c,v 1.5 2015/10/20 23:24:25 mmcc Exp $ */
/* /*
* Copyright (c) 2011 Damien Miller * Copyright (c) 2011 Damien Miller
* *
@ -131,7 +131,7 @@ sshbuf_get_string_direct(struct sshbuf *buf, const u_char **valp, size_t *lenp)
*lenp = 0; *lenp = 0;
if ((r = sshbuf_peek_string_direct(buf, &p, &len)) < 0) if ((r = sshbuf_peek_string_direct(buf, &p, &len)) < 0)
return r; return r;
if (valp != 0) if (valp != NULL)
*valp = p; *valp = p;
if (lenp != NULL) if (lenp != NULL)
*lenp = len; *lenp = len;
@ -168,7 +168,7 @@ sshbuf_peek_string_direct(const struct sshbuf *buf, const u_char **valp,
SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE")); SSHBUF_DBG(("SSH_ERR_MESSAGE_INCOMPLETE"));
return SSH_ERR_MESSAGE_INCOMPLETE; return SSH_ERR_MESSAGE_INCOMPLETE;
} }
if (valp != 0) if (valp != NULL)
*valp = p + 4; *valp = p + 4;
if (lenp != NULL) if (lenp != NULL)
*lenp = len; *lenp = len;
@ -448,7 +448,7 @@ sshbuf_get_bignum2_bytes_direct(struct sshbuf *buf,
d++; d++;
len--; len--;
} }
if (valp != 0) if (valp != NULL)
*valp = d; *valp = d;
if (lenp != NULL) if (lenp != NULL)
*lenp = len; *lenp = len;