summaryrefslogtreecommitdiff
path: root/lib/libssl
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2014-06-24 19:34:07 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2014-06-24 19:34:07 +0000
commiteba5db4ebfc01e4554bb387c09ec0d5557a270d7 (patch)
tree542b7720d75ee29655b976be5a378b92eb0254a7 /lib/libssl
parent8d32be8aaf907154bfd46e4996ad78c6beed0ef0 (diff)
Remove previously commented out wrong code, as well as the comment saying this
is incorrect code.
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/src/crypto/asn1/a_set.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libssl/src/crypto/asn1/a_set.c b/lib/libssl/src/crypto/asn1/a_set.c
index 873484888c2..81dfe88fca1 100644
--- a/lib/libssl/src/crypto/asn1/a_set.c
+++ b/lib/libssl/src/crypto/asn1/a_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_set.c,v 1.13 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: a_set.c,v 1.14 2014/06/24 19:34:06 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -208,8 +208,6 @@ d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a, const unsigned char **pp, long length,
if (M_ASN1_D2I_end_sequence())
break;
- /* XXX: This was called with 4 arguments, incorrectly, it seems
- if ((s = func(NULL, &c.p, c.slen, c.max - c.p)) == NULL) */
if ((s = d2i(NULL, &c.p, c.slen)) == NULL) {
ASN1err(ASN1_F_D2I_ASN1_SET,
ASN1_R_ERROR_PARSING_SET_ELEMENT);