diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-03-15 16:26:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-03-24 17:35:58 +0000 |
| commit | 2e430277578d3dd586cd005682a54a59d6158146 (patch) | |
| tree | 4fa3771298d408499873043a3f37f61b2c7746d0 /crypto/asn1 | |
| parent | 7b68c30da01b4eedcd546f81844156646387cacb (diff) | |
make ASN1_OBJECT opaque
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_object.c | 1 | ||||
| -rw-r--r-- | crypto/asn1/asn1.h | 16 | ||||
| -rw-r--r-- | crypto/asn1/asn_moid.c | 1 | ||||
| -rw-r--r-- | crypto/asn1/tasn_enc.c | 1 |
4 files changed, 3 insertions, 16 deletions
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index c780d8ee02..ddc3aaff7b 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -63,6 +63,7 @@ #include <openssl/asn1.h> #include <openssl/objects.h> #include <openssl/bn.h> +#include "internal/asn1_int.h" int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp) { diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index ef5b9e8d84..a00c08a965 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -194,22 +194,6 @@ typedef struct asn1_const_ctx_st { int line; /* used in error processing */ } ASN1_const_CTX; -/* - * These are used internally in the ASN1_OBJECT to keep track of whether the - * names and data need to be free()ed - */ -# define ASN1_OBJECT_FLAG_DYNAMIC 0x01/* internal use */ -# define ASN1_OBJECT_FLAG_CRITICAL 0x02/* critical x509v3 object id */ -# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */ -# define ASN1_OBJECT_FLAG_DYNAMIC_DATA 0x08/* internal use */ -struct asn1_object_st { - const char *sn, *ln; - int nid; - int length; - const unsigned char *data; /* data remains const after init */ - int flags; /* Should we free this one */ -}; - # define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */ /* * This indicates that the ASN1_STRING is not a real value but just a place diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c index fab2dd92e2..da7e29119a 100644 --- a/crypto/asn1/asn_moid.c +++ b/crypto/asn1/asn_moid.c @@ -64,6 +64,7 @@ #include <openssl/conf.h> #include <openssl/dso.h> #include <openssl/x509.h> +#include "internal/asn1_int.h" /* Simple ASN1 OID module: add all objects in a given section */ diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 1c200b0690..1d1f838078 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -63,6 +63,7 @@ #include <openssl/asn1.h> #include <openssl/asn1t.h> #include <openssl/objects.h> +#include "internal/asn1_int.h" static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); |