summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 13:48:26 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 13:48:26 +1000
commit633de33b192d808d87537834c316dc8b75fe1880 (patch)
tree54d456735ab7e2848dc8df5eba9c3dbb314b29e1 /authfile.c
parent15271907843e4ae50dcfc83b3594014cf5e9607b (diff)
- 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
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c5
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 @@
1/* $OpenBSD: authfile.c,v 1.104 2014/03/12 04:51:12 djm Exp $ */ 1/* $OpenBSD: authfile.c,v 1.105 2014/04/28 03:09:18 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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,
204 char **commentp) 204 char **commentp)
205{ 205{
206 u_char *key = NULL, *cp, *salt = NULL, pad, last; 206 u_char *key = NULL, *cp, *salt = NULL, pad, last;
207 char *comment = NULL, *ciphername = NULL, *kdfname = NULL, *kdfp; 207 char *comment = NULL, *ciphername = NULL, *kdfname = NULL;
208 const u_char *kdfp;
208 u_int keylen = 0, ivlen, blocksize, slen, klen, len, rounds, nkeys; 209 u_int keylen = 0, ivlen, blocksize, slen, klen, len, rounds, nkeys;
209 u_int check1, check2, m1len, m2len; 210 u_int check1, check2, m1len, m2len;
210 size_t authlen; 211 size_t authlen;