diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | key.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -29,6 +29,10 @@ | |||
29 | - djm@cvs.openbsd.org 2013/12/02 02:56:17 | 29 | - djm@cvs.openbsd.org 2013/12/02 02:56:17 |
30 | [ssh-pkcs11-helper.c] | 30 | [ssh-pkcs11-helper.c] |
31 | use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC | 31 | use-after-free; bz#2175 patch from Loganaden Velvindron @ AfriNIC |
32 | - djm@cvs.openbsd.org 2013/12/02 03:09:22 | ||
33 | [key.c] | ||
34 | make key_to_blob() return a NULL blob on failure; part of | ||
35 | bz#2175 from Loganaden Velvindron @ AfriNIC | ||
32 | 36 | ||
33 | 20131121 | 37 | 20131121 |
34 | - (djm) OpenBSD CVS Sync | 38 | - (djm) OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.c,v 1.105 2013/10/29 09:42:11 djm Exp $ */ | 1 | /* $OpenBSD: key.c,v 1.106 2013/12/02 03:09:22 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * read_bignum(): | 3 | * read_bignum(): |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
1587 | Buffer b; | 1587 | Buffer b; |
1588 | int len, type; | 1588 | int len, type; |
1589 | 1589 | ||
1590 | if (blobp != NULL) | ||
1591 | *blobp = NULL; | ||
1592 | if (lenp != NULL) | ||
1593 | *lenp = 0; | ||
1590 | if (key == NULL) { | 1594 | if (key == NULL) { |
1591 | error("key_to_blob: key == NULL"); | 1595 | error("key_to_blob: key == NULL"); |
1592 | return 0; | 1596 | return 0; |