From 50dcf723158de492f1440c6a34fdf06bdc1f16fe Mon Sep 17 00:00:00 2001
From: miod <>
Date: Sat, 14 Feb 2015 15:23:57 +0000
Subject: Remove IMPLEMENT_COMPAT_ASN1() and related support code. Nothing uses
 it in libcrypto/libssl, and nothing seems to use it in the wild, apart from
 embedded copies of OpenSSL. ok jsing@

---
 src/lib/libcrypto/asn1/tasn_dec.c | 72 ++-------------------------------------
 1 file changed, 3 insertions(+), 69 deletions(-)

(limited to 'src/lib/libcrypto/asn1/tasn_dec.c')

diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index f633d03e9c..791a10a9c0 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_dec.c,v 1.24 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: tasn_dec.c,v 1.25 2015/02/14 15:23:57 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -155,19 +155,17 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
     const ASN1_ITEM *it, int tag, int aclass, char opt, ASN1_TLC *ctx)
 {
 	const ASN1_TEMPLATE *tt, *errtt = NULL;
-	const ASN1_COMPAT_FUNCS *cf;
 	const ASN1_EXTERN_FUNCS *ef;
 	const ASN1_AUX *aux = it->funcs;
 	ASN1_aux_cb *asn1_cb;
 	const unsigned char *p = NULL, *q;
-	unsigned char *wp = NULL;	/* BIG FAT WARNING!  BREAKS CONST WHERE USED */
-	unsigned char imphack = 0, oclass;
+	unsigned char oclass;
 	char seq_eoc, seq_nolen, cst, isopt;
 	long tmplen;
 	int i;
 	int otag;
 	int ret = 0;
-	ASN1_VALUE **pchptr, *ptmpval;
+	ASN1_VALUE **pchptr;
 
 	if (!pval)
 		return 0;
@@ -236,70 +234,6 @@ ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
 		return ef->asn1_ex_d2i(pval, in, len,
 		    it, tag, aclass, opt, ctx);
 
-	case ASN1_ITYPE_COMPAT:
-		/* we must resort to old style evil hackery */
-		cf = it->funcs;
-
-		/* If OPTIONAL see if it is there */
-		if (opt) {
-			int exptag;
-			p = *in;
-			if (tag == -1)
-				exptag = it->utype;
-			else
-				exptag = tag;
-			/* Don't care about anything other than presence
-			 * of expected tag */
-
-			ret = asn1_check_tlen(NULL, NULL, NULL, NULL, NULL,
-			    &p, len, exptag, aclass, 1, ctx);
-			if (!ret) {
-				ASN1err(ASN1_F_ASN1_ITEM_EX_D2I,
-				    ERR_R_NESTED_ASN1_ERROR);
-				goto err;
-			}
-			if (ret == -1)
-				return -1;
-		}
-
-		/* This is the old style evil hack IMPLICIT handling:
-		 * since the underlying code is expecting a tag and
-		 * class other than the one present we change the
-		 * buffer temporarily then change it back afterwards.
-		 * This doesn't and never did work for tags > 30.
-		 *
-		 * Yes this is *horrible* but it is only needed for
-		 * old style d2i which will hopefully not be around
-		 * for much longer.
-		 * FIXME: should copy the buffer then modify it so
-		 * the input buffer can be const: we should *always*
-		 * copy because the old style d2i might modify the
-		 * buffer.
-		 */
-
-		if (tag != -1) {
-			wp = *(unsigned char **)in;
-			imphack = *wp;
-			if (p == NULL) {
-				ASN1err(ASN1_F_ASN1_ITEM_EX_D2I,
-				    ERR_R_NESTED_ASN1_ERROR);
-				goto err;
-			}
-			*wp = (unsigned char)((*p & V_ASN1_CONSTRUCTED) |
-			    it->utype);
-		}
-
-		ptmpval = cf->asn1_d2i(pval, in, len);
-
-		if (tag != -1)
-			*wp = imphack;
-
-		if (ptmpval)
-			return 1;
-
-		ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
-		goto err;
-
 	case ASN1_ITYPE_CHOICE:
 		if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
 			goto auxerr;
-- 
cgit v1.2.3-55-g6feb