From ea078462ea9b6efec982dce999ffa47ca1055077 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 12 Feb 2013 10:54:37 +1100 Subject: [PATCH] - (djm) OpenBSD CVS Sync - djm@cvs.openbsd.org 2013/01/24 21:45:37 [krl.c] fix handling of (unused) KRL signatures; skip string in correct buffer --- ChangeLog | 6 ++++++ krl.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 798f5452e..d663448ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20130212 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2013/01/24 21:45:37 + [krl.c] + fix handling of (unused) KRL signatures; skip string in correct buffer + 20130211 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old libcrypto that lacks EVP_CIPHER_CTX_ctrl diff --git a/krl.c b/krl.c index fe22bde25..8e53f46dc 100644 --- a/krl.c +++ b/krl.c @@ -14,7 +14,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $OpenBSD: krl.c,v 1.4 2013/01/19 12:34:55 markus Exp $ */ +/* $OpenBSD: krl.c,v 1.5 2013/01/24 21:45:37 djm Exp $ */ #include "includes.h" @@ -1031,7 +1031,7 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp, case KRL_SECTION_SIGNATURE: /* Handled above, but still need to stay in synch */ buffer_clear(§); - if ((blob = buffer_get_string_ptr_ret(§, + if ((blob = buffer_get_string_ptr_ret(©, &blen)) == NULL) { error("%s: buffer error", __func__); goto out;