diff options
author | miod <> | 2014-06-24 19:34:06 +0000 |
---|---|---|
committer | miod <> | 2014-06-24 19:34:06 +0000 |
commit | 2094ff4f6b6d31d42debdd7d1f2ffe5c1c3c7424 (patch) | |
tree | 7244d60faa472ad5c86164363087230bb48dbe49 /src/lib/libcrypto/asn1/a_set.c | |
parent | 3692369997cf415ee57b6b7a8a6855d99812ad92 (diff) | |
download | openbsd-2094ff4f6b6d31d42debdd7d1f2ffe5c1c3c7424.tar.gz openbsd-2094ff4f6b6d31d42debdd7d1f2ffe5c1c3c7424.tar.bz2 openbsd-2094ff4f6b6d31d42debdd7d1f2ffe5c1c3c7424.zip |
Remove previously commented out wrong code, as well as the comment saying this
is incorrect code.
Diffstat (limited to 'src/lib/libcrypto/asn1/a_set.c')
-rw-r--r-- | src/lib/libcrypto/asn1/a_set.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/a_set.c b/src/lib/libcrypto/asn1/a_set.c index 873484888c..81dfe88fca 100644 --- a/src/lib/libcrypto/asn1/a_set.c +++ b/src/lib/libcrypto/asn1/a_set.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: a_set.c,v 1.13 2014/06/12 15:49:27 deraadt Exp $ */ | 1 | /* $OpenBSD: a_set.c,v 1.14 2014/06/24 19:34:06 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -208,8 +208,6 @@ d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a, const unsigned char **pp, long length, | |||
208 | 208 | ||
209 | if (M_ASN1_D2I_end_sequence()) | 209 | if (M_ASN1_D2I_end_sequence()) |
210 | break; | 210 | break; |
211 | /* XXX: This was called with 4 arguments, incorrectly, it seems | ||
212 | if ((s = func(NULL, &c.p, c.slen, c.max - c.p)) == NULL) */ | ||
213 | if ((s = d2i(NULL, &c.p, c.slen)) == NULL) { | 211 | if ((s = d2i(NULL, &c.p, c.slen)) == NULL) { |
214 | ASN1err(ASN1_F_D2I_ASN1_SET, | 212 | ASN1err(ASN1_F_D2I_ASN1_SET, |
215 | ASN1_R_ERROR_PARSING_SET_ELEMENT); | 213 | ASN1_R_ERROR_PARSING_SET_ELEMENT); |