diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-14 04:16:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-23 13:15:06 +0000 |
| commit | f422a51486a3ab415153eccdc3c3746c53da01f4 (patch) | |
| tree | 7048cd4c4b3857f13ee0468d9059a0e24b17c885 /crypto/asn1/asn1_par.c | |
| parent | 2ecd32a1f8f0643ae7b38f59bbaf9f0d6ef326fe (diff) | |
| download | openssl-f422a51486a3ab415153eccdc3c3746c53da01f4.tar.gz | |
Remove old ASN.1 code.
Remove old M_ASN1_ macros and replace any occurences with the corresponding
function.
Remove d2i_ASN1_bytes, d2i_ASN1_SET, i2d_ASN1_SET: no longer used internally.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/asn1/asn1_par.c')
| -rw-r--r-- | crypto/asn1/asn1_par.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index b12edf9c4a..a174dec976 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -281,7 +281,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, } } if (os != NULL) { - M_ASN1_OCTET_STRING_free(os); + ASN1_OCTET_STRING_free(os); os = NULL; } } else if (tag == V_ASN1_INTEGER) { @@ -308,7 +308,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, if (BIO_write(bp, "BAD INTEGER", 11) <= 0) goto end; } - M_ASN1_INTEGER_free(bs); + ASN1_INTEGER_free(bs); } else if (tag == V_ASN1_ENUMERATED) { ASN1_ENUMERATED *bs; int i; @@ -333,7 +333,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, if (BIO_write(bp, "BAD ENUMERATED", 14) <= 0) goto end; } - M_ASN1_ENUMERATED_free(bs); + ASN1_ENUMERATED_free(bs); } else if (len > 0 && dump) { if (!nl) { if (BIO_write(bp, "\n", 1) <= 0) @@ -363,7 +363,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, if (o != NULL) ASN1_OBJECT_free(o); if (os != NULL) - M_ASN1_OCTET_STRING_free(os); + ASN1_OCTET_STRING_free(os); *pp = p; return (ret); } |