diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-26 15:39:55 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-26 22:04:15 +0000 |
| commit | ee9d76371ae8ea433c19162c2e1522dcd188e556 (patch) | |
| tree | d2368dca76e97c46138b2f9d9c3691503e9f59e4 /crypto/asn1/tasn_utl.c | |
| parent | ea6b07b54c1f8fc2275a121cdda071e2df7bd6c1 (diff) | |
Remove combine option from ASN.1 code.
Remove the combine option. This was used for compatibility with some
non standard behaviour in ancient versions of OpenSSL: specifically
the X509_ATTRIBUTE and DSAPublicKey handling. Since these have now
been revised it is no longer needed.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1/tasn_utl.c')
| -rw-r--r-- | crypto/asn1/tasn_utl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index da7b029799..17318ea587 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -202,8 +202,6 @@ int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval, ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt) { ASN1_VALUE **pvaltmp; - if (tt->flags & ASN1_TFLG_COMBINE) - return pval; pvaltmp = offset2ptr(*pval, tt->offset); /* * NOTE for BOOLEAN types the field is just a plain int so we can't |