summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--krl.c4
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 @@
120130212
2 - (djm) OpenBSD CVS Sync
3 - djm@cvs.openbsd.org 2013/01/24 21:45:37
4 [krl.c]
5 fix handling of (unused) KRL signatures; skip string in correct buffer
6
120130211 720130211
2 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old 8 - (djm) [configure.ac openbsd-compat/openssl-compat.h] Repair build on old
3 libcrypto that lacks EVP_CIPHER_CTX_ctrl 9 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 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: krl.c,v 1.4 2013/01/19 12:34:55 markus Exp $ */ 17/* $OpenBSD: krl.c,v 1.5 2013/01/24 21:45:37 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -1031,7 +1031,7 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
1031 case KRL_SECTION_SIGNATURE: 1031 case KRL_SECTION_SIGNATURE:
1032 /* Handled above, but still need to stay in synch */ 1032 /* Handled above, but still need to stay in synch */
1033 buffer_clear(&sect); 1033 buffer_clear(&sect);
1034 if ((blob = buffer_get_string_ptr_ret(&sect, 1034 if ((blob = buffer_get_string_ptr_ret(&copy,
1035 &blen)) == NULL) { 1035 &blen)) == NULL) {
1036 error("%s: buffer error", __func__); 1036 error("%s: buffer error", __func__);
1037 goto out; 1037 goto out;