diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-29 12:14:47 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2011-06-29 12:14:47 +0000 |
| commit | bdeeb9a7ad883a3b28f4521a95923186ed147dc7 (patch) | |
| tree | 0297330c3ee535ac353b804eac1d79d2be90d45d /sys/net | |
| parent | 9cbe2e2b396aef602119e3afe296787251ce9cf8 (diff) | |
always set sppp auth secret, as other code assumes it.
confirmed to fix paul stoeber's crash. ok deraadt sthen
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_spppsubr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index eaede7b9996..519b08904cd 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.87 2011/06/18 23:52:49 jsg Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.88 2011/06/29 12:14:46 tedu Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -3796,8 +3796,7 @@ sppp_chap_input(struct sppp *sp, struct mbuf *m) /* Compute reply value. */ MD5Init(&ctx); MD5Update(&ctx, &h->ident, 1); - MD5Update(&ctx, sp->myauth.secret, - strlen(sp->myauth.secret)); + MD5Update(&ctx, sp->myauth.secret, strlen(sp->myauth.secret)); MD5Update(&ctx, value, value_len); MD5Final(digest, &ctx); dsize = sizeof digest; @@ -3915,8 +3914,7 @@ sppp_chap_input(struct sppp *sp, struct mbuf *m) MD5Init(&ctx); MD5Update(&ctx, &h->ident, 1); - MD5Update(&ctx, sp->hisauth.secret, - strlen(sp->hisauth.secret)); + MD5Update(&ctx, sp->hisauth.secret, strlen(sp->hisauth.secret)); MD5Update(&ctx, sp->chap_challenge, AUTHCHALEN); MD5Final(digest, &ctx); @@ -5125,6 +5123,10 @@ sppp_set_params(struct sppp *sp, struct ifreq *ifr) if (auth->secret != NULL) free(auth->secret, M_DEVBUF); auth->secret = p; + } else if (!auth->secret) { + p = malloc(1, M_DEVBUF, M_WAITOK); + p[0] = '\0'; + auth->secret = p; } } free(spa, M_DEVBUF); |