tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/02 03:09:22 

[key.c]
     make key_to_blob() return a NULL blob on failure; part of
     bz#2175 from Loganaden Velvindron @ AfriNIC
This commit is contained in:
Damien Miller 2013-12-05 10:25:51 +11:00
parent f1e44ea9d9
commit f7e8a8796d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -29,6 +29,10 @@
- djm@cvs.openbsd.org 2013/12/02 02:56:17 - djm@cvs.openbsd.org 2013/12/02 02:56:17
[ssh-pkcs11-helper.c] [ssh-pkcs11-helper.c]
use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC
- djm@cvs.openbsd.org 2013/12/02 03:09:22
[key.c]
make key_to_blob() return a NULL blob on failure; part of
bz#2175 from Loganaden Velvindron @ AfriNIC
20131121 20131121
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

6
key.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: key.c,v 1.105 2013/10/29 09:42:11 djm Exp $ */ /* $OpenBSD: key.c,v 1.106 2013/12/02 03:09:22 djm Exp $ */
/* /*
* read_bignum(): * read_bignum():
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1587,6 +1587,10 @@ to_blob(const Key *key, u_char **blobp, u_int *lenp, int force_plain)
Buffer b; Buffer b;
int len, type; int len, type;
if (blobp != NULL)
*blobp = NULL;
if (lenp != NULL)
*lenp = 0;
if (key == NULL) { if (key == NULL) {
error("key_to_blob: key == NULL"); error("key_to_blob: key == NULL");
return 0; return 0;