- (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
This commit is contained in:
Damien Miller 2013-02-12 10:54:37 +11:00
parent b6f73b3af6
commit ea078462ea
2 changed files with 8 additions and 2 deletions

View File

@ -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

4
krl.c
View File

@ -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(&sect);
if ((blob = buffer_get_string_ptr_ret(&sect,
if ((blob = buffer_get_string_ptr_ret(&copy,
&blen)) == NULL) {
error("%s: buffer error", __func__);
goto out;