diff options
| author |   miod <miod@openbsd.org> | 2014-06-24 19:34:06 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-06-24 19:34:06 +0000 |
| commit | a1571e454631dffebc91aa92df9ce5fa24c4d4b7 (patch) | |
| tree | af0707ef92f011dd6326fbcb11599e703a6e8075 | |
| parent | Remove ancient workaround for previous century's compilers in the declaration (diff) | |
| download | wireguard-openbsd-a1571e454631dffebc91aa92df9ce5fa24c4d4b7.tar.xz wireguard-openbsd-a1571e454631dffebc91aa92df9ce5fa24c4d4b7.zip | |
Remove previously commented out wrong code, as well as the comment saying this
is incorrect code.
| -rw-r--r-- | lib/libcrypto/asn1/a_set.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/asn1/a_set.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/libcrypto/asn1/a_set.c b/lib/libcrypto/asn1/a_set.c index 873484888c2..81dfe88fca1 100644 --- a/lib/libcrypto/asn1/a_set.c +++ b/lib/libcrypto/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); 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); |