RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-26 20:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2014/03/12 04:51:12

Browse Source 
[authfile.c]
     correct test that kdf name is not "none" or "bcrypt"
This commit is contained in:
Damien Miller 2014-04-20 13:00:28 +10:00
parent 8f9cd709c7
commit 3819519288
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -12,6 +12,9 @@
[auth-bsdauth.c ssh-keygen.c] [auth-bsdauth.c ssh-keygen.c]
don't count on things that accept arguments by reference to clear don't count on things that accept arguments by reference to clear
things for us on error; most things do, but it's unsafe form. things for us on error; most things do, but it's unsafe form.
- djm@cvs.openbsd.org 2014/03/12 04:51:12
[authfile.c]
correct test that kdf name is not "none" or "bcrypt"
20140401 20140401
- (djm) On platforms that support it, use prctl() to prevent sftp-server - (djm) On platforms that support it, use prctl() to prevent sftp-server

4
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.103 2014/02/02 03:44:31 djm Exp $ */ /* $OpenBSD: authfile.c,v 1.104 2014/03/12 04:51:12 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -281,7 +281,7 @@ key_parse_private2(Buffer *blob, int type, const char *passphrase,
} }
kdfname = buffer_get_cstring_ret(&copy, NULL); kdfname = buffer_get_cstring_ret(&copy, NULL);
if (kdfname == NULL || if (kdfname == NULL ||
(!strcmp(kdfname, "none") && !strcmp(kdfname, "bcrypt"))) { (strcmp(kdfname, "none") != 0 && strcmp(kdfname, "bcrypt") != 0)) {
error("%s: unknown kdf name", __func__); error("%s: unknown kdf name", __func__);
goto out; goto out;
} }