Inline asn1_proto.h since the API is stable and public.

diff --git a/lib/util/asn1.h b/lib/util/asn1.h
index 504193833fc73bfae35b19fd242740010768d288..8ecb85cb81298c97e48c2fb9ebfcd4ac1d46ac00 100644 (file)
--- a/lib/util/asn1.h
+++ b/lib/util/asn1.h
@@ -52,6 +52,45 @@ typedef struct asn1_data ASN1_DATA;
 
 #define ASN1_MAX_OIDS 20
 
-#include "../lib/util/asn1_proto.h"
+struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx);
+void asn1_free(struct asn1_data *data);
+bool asn1_write(struct asn1_data *data, const void *p, int len);
+bool asn1_write_uint8(struct asn1_data *data, uint8_t v);
+bool asn1_push_tag(struct asn1_data *data, uint8_t tag);
+bool asn1_pop_tag(struct asn1_data *data);
+bool asn1_write_implicit_Integer(struct asn1_data *data, int i);
+bool asn1_write_Integer(struct asn1_data *data, int i);
+bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
+bool asn1_write_OID(struct asn1_data *data, const char *OID);
+bool asn1_write_OctetString(struct asn1_data *data, const void *p, size_t length);
+bool asn1_write_LDAPString(struct asn1_data *data, const char *s);
+bool asn1_write_DATA_BLOB_LDAPString(struct asn1_data *data, const DATA_BLOB *s);
+bool asn1_write_GeneralString(struct asn1_data *data, const char *s);
+bool asn1_write_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
+bool asn1_write_BOOLEAN(struct asn1_data *data, bool v);
+bool asn1_read_BOOLEAN(struct asn1_data *data, bool *v);
+bool asn1_check_BOOLEAN(struct asn1_data *data, bool v);
+bool asn1_load(struct asn1_data *data, DATA_BLOB blob);
+bool asn1_peek(struct asn1_data *data, void *p, int len);
+bool asn1_read(struct asn1_data *data, void *p, int len);
+bool asn1_read_uint8(struct asn1_data *data, uint8_t *v);
+bool asn1_peek_uint8(struct asn1_data *data, uint8_t *v);
+bool asn1_peek_tag(struct asn1_data *data, uint8_t tag);
+bool asn1_start_tag(struct asn1_data *data, uint8_t tag);
+bool asn1_end_tag(struct asn1_data *data);
+int asn1_tag_remaining(struct asn1_data *data);
+bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID);
+bool asn1_read_OID(struct asn1_data *data, TALLOC_CTX *mem_ctx, const char **OID);
+bool asn1_check_OID(struct asn1_data *data, const char *OID);
+bool asn1_read_LDAPString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
+bool asn1_read_GeneralString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
+bool asn1_read_OctetString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob);
+bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
+bool asn1_read_implicit_Integer(struct asn1_data *data, int *i);
+bool asn1_read_Integer(struct asn1_data *data, int *i);
+bool asn1_read_enumerated(struct asn1_data *data, int *v);
+bool asn1_check_enumerated(struct asn1_data *data, int v);
+bool asn1_write_enumerated(struct asn1_data *data, uint8_t v);
+NTSTATUS asn1_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size);
 
 #endif /* _ASN_1_H */

diff --git a/lib/util/asn1_proto.h b/lib/util/asn1_proto.h
deleted file mode 100644 (file)
index 9b7b4d2..0000000
--- a/lib/util/asn1_proto.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef _____LIB_UTIL_ASN1_PROTO_H__
-#define _____LIB_UTIL_ASN1_PROTO_H__
-
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
-/* This file was automatically generated by mkproto.pl. DO NOT EDIT */
-
-/* this file contains prototypes for functions that are private 
- * to this subsystem or library. These functions should not be 
- * used outside this particular subsystem! */
-
-
-/* The following definitions come from ../lib/util/asn1.c  */
-
-struct asn1_data *asn1_init(TALLOC_CTX *mem_ctx);
-void asn1_free(struct asn1_data *data);
-bool asn1_write(struct asn1_data *data, const void *p, int len);
-bool asn1_write_uint8(struct asn1_data *data, uint8_t v);
-bool asn1_push_tag(struct asn1_data *data, uint8_t tag);
-bool asn1_pop_tag(struct asn1_data *data);
-bool asn1_write_implicit_Integer(struct asn1_data *data, int i);
-bool asn1_write_Integer(struct asn1_data *data, int i);
-bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
-bool asn1_write_OID(struct asn1_data *data, const char *OID);
-bool asn1_write_OctetString(struct asn1_data *data, const void *p, size_t length);
-bool asn1_write_LDAPString(struct asn1_data *data, const char *s);
-bool asn1_write_DATA_BLOB_LDAPString(struct asn1_data *data, const DATA_BLOB *s);
-bool asn1_write_GeneralString(struct asn1_data *data, const char *s);
-bool asn1_write_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
-bool asn1_write_BOOLEAN(struct asn1_data *data, bool v);
-bool asn1_read_BOOLEAN(struct asn1_data *data, bool *v);
-bool asn1_check_BOOLEAN(struct asn1_data *data, bool v);
-bool asn1_load(struct asn1_data *data, DATA_BLOB blob);
-bool asn1_peek(struct asn1_data *data, void *p, int len);
-bool asn1_read(struct asn1_data *data, void *p, int len);
-bool asn1_read_uint8(struct asn1_data *data, uint8_t *v);
-bool asn1_peek_uint8(struct asn1_data *data, uint8_t *v);
-bool asn1_peek_tag(struct asn1_data *data, uint8_t tag);
-bool asn1_start_tag(struct asn1_data *data, uint8_t tag);
-bool asn1_end_tag(struct asn1_data *data);
-int asn1_tag_remaining(struct asn1_data *data);
-bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID);
-bool asn1_read_OID(struct asn1_data *data, TALLOC_CTX *mem_ctx, const char **OID);
-bool asn1_check_OID(struct asn1_data *data, const char *OID);
-bool asn1_read_LDAPString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
-bool asn1_read_GeneralString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
-bool asn1_read_OctetString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob);
-bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
-bool asn1_read_implicit_Integer(struct asn1_data *data, int *i);
-bool asn1_read_Integer(struct asn1_data *data, int *i);
-bool asn1_read_enumerated(struct asn1_data *data, int *v);
-bool asn1_check_enumerated(struct asn1_data *data, int v);
-bool asn1_write_enumerated(struct asn1_data *data, uint8_t v);
-NTSTATUS asn1_full_tag(DATA_BLOB blob, uint8_t tag, size_t *packet_size);
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
-
-#endif /* _____LIB_UTIL_ASN1_PROTO_H__ */
-

diff --git a/lib/util/config.mk b/lib/util/config.mk
index 5488534f262ad760b5e6b6a1d5fc2156d5fd02dd..f564efbe61401411119378641fd2898bb532a293 100644 (file)
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -43,8 +43,6 @@ PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
 
 ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
 
-$(eval $(call proto_header_template,$(libutilsrcdir)/asn1_proto.h,$(ASN1_UTIL_OBJ_FILES:.o=.c)))
-
 [SUBSYSTEM::UNIX_PRIVS]
 
 UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o