From 633de33b192d808d87537834c316dc8b75fe1880 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 15 May 2014 13:48:26 +1000 Subject: - 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 --- authfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'authfile.c') diff --git a/authfile.c b/authfile.c index 0e97ba4e..44994a81 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 * Copyright (c) 1995 Tatu Ylonen , 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; -- cgit v1.2.3