diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/tasn_new.c')
| -rw-r--r-- | src/lib/libcrypto/asn1/tasn_new.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/lib/libcrypto/asn1/tasn_new.c b/src/lib/libcrypto/asn1/tasn_new.c index 86b2b3facd..132df07637 100644 --- a/src/lib/libcrypto/asn1/tasn_new.c +++ b/src/lib/libcrypto/asn1/tasn_new.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tasn_new.c,v 1.13 2015/02/14 15:15:27 miod Exp $ */ | 1 | /* $OpenBSD: tasn_new.c,v 1.14 2015/02/14 15:23:57 miod Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -91,7 +91,6 @@ static int | |||
| 91 | asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) | 91 | asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) |
| 92 | { | 92 | { |
| 93 | const ASN1_TEMPLATE *tt = NULL; | 93 | const ASN1_TEMPLATE *tt = NULL; |
| 94 | const ASN1_COMPAT_FUNCS *cf; | ||
| 95 | const ASN1_EXTERN_FUNCS *ef; | 94 | const ASN1_EXTERN_FUNCS *ef; |
| 96 | const ASN1_AUX *aux = it->funcs; | 95 | const ASN1_AUX *aux = it->funcs; |
| 97 | ASN1_aux_cb *asn1_cb = NULL; | 96 | ASN1_aux_cb *asn1_cb = NULL; |
| @@ -118,15 +117,6 @@ asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int combine) | |||
| 118 | } | 117 | } |
| 119 | break; | 118 | break; |
| 120 | 119 | ||
| 121 | case ASN1_ITYPE_COMPAT: | ||
| 122 | cf = it->funcs; | ||
| 123 | if (cf && cf->asn1_new) { | ||
| 124 | *pval = cf->asn1_new(); | ||
| 125 | if (!*pval) | ||
| 126 | goto memerr; | ||
| 127 | } | ||
| 128 | break; | ||
| 129 | |||
| 130 | case ASN1_ITYPE_PRIMITIVE: | 120 | case ASN1_ITYPE_PRIMITIVE: |
| 131 | if (it->templates) { | 121 | if (it->templates) { |
| 132 | if (!ASN1_template_new(pval, it->templates)) | 122 | if (!ASN1_template_new(pval, it->templates)) |
| @@ -243,7 +233,6 @@ asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it) | |||
| 243 | asn1_primitive_clear(pval, it); | 233 | asn1_primitive_clear(pval, it); |
| 244 | break; | 234 | break; |
| 245 | 235 | ||
| 246 | case ASN1_ITYPE_COMPAT: | ||
| 247 | case ASN1_ITYPE_CHOICE: | 236 | case ASN1_ITYPE_CHOICE: |
| 248 | case ASN1_ITYPE_SEQUENCE: | 237 | case ASN1_ITYPE_SEQUENCE: |
| 249 | case ASN1_ITYPE_NDEF_SEQUENCE: | 238 | case ASN1_ITYPE_NDEF_SEQUENCE: |
