diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-07 11:29:09 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-07 11:29:09 +1100 |
commit | ca570a519cb846da61d002c7f46fa92e39c83e45 (patch) | |
tree | 17d249a3ac08328caf2c743e440612249300bfd6 | |
parent | 3cccc0e155229a2f2d86b6df40bd4559b4f960ff (diff) |
- djm@cvs.openbsd.org 2013/12/07 00:19:15
[key.c]
set k->cert = NULL after freeing it
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | key.c | 3 |
2 files changed, 5 insertions, 1 deletions
@@ -30,6 +30,9 @@ | |||
30 | - jmc@cvs.openbsd.org 2013/12/06 15:29:07 | 30 | - jmc@cvs.openbsd.org 2013/12/06 15:29:07 |
31 | [sshd.8] | 31 | [sshd.8] |
32 | missing comma; | 32 | missing comma; |
33 | - djm@cvs.openbsd.org 2013/12/07 00:19:15 | ||
34 | [key.c] | ||
35 | set k->cert = NULL after freeing it | ||
33 | - [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h] | 36 | - [blocks.c ed25519.c fe25519.c fe25519.h ge25519.c ge25519.h] |
34 | [ge25519_base.data hash.c sc25519.c sc25519.h verify.c] Fix RCS idents | 37 | [ge25519_base.data hash.c sc25519.c sc25519.h verify.c] Fix RCS idents |
35 | 38 | ||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.c,v 1.108 2013/12/06 13:34:54 markus Exp $ */ | 1 | /* $OpenBSD: key.c,v 1.110 2013/12/07 00:19:15 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 |
@@ -1955,6 +1955,7 @@ key_drop_cert(Key *k) | |||
1955 | return -1; | 1955 | return -1; |
1956 | } | 1956 | } |
1957 | cert_free(k->cert); | 1957 | cert_free(k->cert); |
1958 | k->cert = NULL; | ||
1958 | k->type = key_type_plain(k->type); | 1959 | k->type = key_type_plain(k->type); |
1959 | return 0; | 1960 | return 0; |
1960 | } | 1961 | } |