- djm@cvs.openbsd.org 2014/04/28 03:09:18

     [authfile.c bufaux.c buffer.h channels.c krl.c mux.c packet.c packet.h]
     [ssh-keygen.c]
     buffer_get_string_ptr's return should be const to remind
     callers that futzing with it will futz with the actual buffer
     contents

1 files changed, 3 insertions, 2 deletions

diff --git a/authfile.c b/authfile.c
index 0e97ba4ea..44994a810 100644
--- a/authfile.c
+++ b/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
@@ -204,7 +204,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;