diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2014-04-28 03:09:19 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2014-04-28 03:09:19 +0000 |
| commit | d571f3ddf37de4e95bd22b691b7f2b6458737a58 (patch) | |
| tree | df4fbb06474b0a03f923c58ed3384f11b865d2a5 /usr.bin/ssh/authfile.c | |
| parent | 20ed65c5ae5f869f6fdfb7a66b87b43676111f17 (diff) | |
buffer_get_string_ptr's return should be const to remind
callers that futzing with it will futz with the actual buffer
contents
Diffstat (limited to 'usr.bin/ssh/authfile.c')
| -rw-r--r-- | usr.bin/ssh/authfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index f258faaafbb..19b0c619342 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.104 2014/03/12 04:51:12 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.105 2014/04/28 03:09:18 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -197,7 +197,8 @@ key_parse_private2(Buffer *blob, int type, const char *passphrase, char **commentp) { u_char *key = NULL, *cp, *salt = NULL, pad, last; - char *comment = NULL, *ciphername = NULL, *kdfname = NULL, *kdfp; + char *comment = NULL, *ciphername = NULL, *kdfname = NULL; + const u_char *kdfp; u_int keylen = 0, ivlen, blocksize, slen, klen, len, rounds, nkeys; u_int check1, check2, m1len, m2len; size_t authlen; |