summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-22 14:06:08 +0200
committerGünther Deschner <gd@samba.org>2008-10-22 21:37:36 +0200
commitd9f1fff5b35a2c852e69c2c58e68824b5f381d01 (patch)
tree7a0c9d09fb9f3623fa9aef746266b60a7cda1873 /source3/include
parentcef97c245955d0f125928740cd89984100635d29 (diff)
downloadsamba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.tar.gz
samba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.tar.bz2
samba-d9f1fff5b35a2c852e69c2c58e68824b5f381d01.zip
s3: use shared asn1 code.
Guenther
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/asn_1.h54
-rw-r--r--source3/include/includes.h3
-rw-r--r--source3/include/proto.h33
3 files changed, 3 insertions, 87 deletions
diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h
deleted file mode 100644
index b9bade2db9..0000000000
--- a/source3/include/asn_1.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- simple ASN1 code
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _ASN_1_H
-#define _ASN_1_H
-
-struct nesting {
- off_t start;
- size_t taglen; /* for parsing */
- struct nesting *next;
-};
-
-typedef struct asn1_data {
- uint8 *data;
- size_t length;
- off_t ofs;
- struct nesting *nesting;
- bool has_error;
-} ASN1_DATA;
-
-
-#define ASN1_APPLICATION(x) ((x)+0x60)
-#define ASN1_APPLICATION_SIMPLE(x) ((x)+0x40)
-#define ASN1_SEQUENCE(x) ((x)+0x30)
-#define ASN1_CONTEXT(x) ((x)+0xa0)
-#define ASN1_CONTEXT_SIMPLE(x) ((x)+0x80)
-#define ASN1_GENERAL_STRING 0x1b
-#define ASN1_OCTET_STRING 0x4
-#define ASN1_OID 0x6
-#define ASN1_BOOLEAN 0x1
-#define ASN1_INTEGER 0x2
-#define ASN1_BITFIELD 0x3
-#define ASN1_ENUMERATED 0xa
-#define ASN1_SET 0x31
-
-#define ASN1_MAX_OIDS 20
-
-#endif /* _ASN_1_H */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index c164d285c1..716235752d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -584,6 +584,8 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "../lib/util/data_blob.h"
#include "../lib/util/time.h"
+#include "../lib/util/asn1.h"
+
/* And a little extension. Abort on type mismatch */
#define talloc_get_type_abort(ptr, type) \
(type *)talloc_check_name_abort(ptr, #type)
@@ -643,7 +645,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "client.h"
#include "session.h"
-#include "asn_1.h"
#include "popt.h"
#include "mangle.h"
#include "module.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9b555e6db2..370a64185a 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2474,37 +2474,6 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, struct dcerpc_pipe
struct cli_credentials *credentials, struct event_context *ev,
struct loadparm_context *lp_ctx);
-/* The following definitions come from libsmb/asn1.c */
-
-void asn1_free(ASN1_DATA *data);
-bool asn1_write(ASN1_DATA *data, const void *p, int len);
-bool asn1_write_uint8(ASN1_DATA *data, uint8 v);
-bool asn1_push_tag(ASN1_DATA *data, uint8 tag);
-bool asn1_pop_tag(ASN1_DATA *data);
-bool asn1_write_Integer(ASN1_DATA *data, int i);
-bool asn1_write_OID(ASN1_DATA *data, const char *OID);
-bool asn1_write_OctetString(ASN1_DATA *data, const void *p, size_t length);
-bool asn1_write_GeneralString(ASN1_DATA *data, const char *s);
-bool asn1_write_BOOLEAN(ASN1_DATA *data, bool v);
-bool asn1_write_BOOLEAN2(ASN1_DATA *data, bool v);
-bool asn1_check_BOOLEAN(ASN1_DATA *data, bool v);
-bool asn1_load(ASN1_DATA *data, DATA_BLOB blob);
-bool asn1_read(ASN1_DATA *data, void *p, int len);
-bool asn1_read_uint8(ASN1_DATA *data, uint8 *v);
-bool asn1_check_tag(ASN1_DATA *data, uint8 tag);
-bool asn1_start_tag(ASN1_DATA *data, uint8 tag);
-bool asn1_end_tag(ASN1_DATA *data);
-int asn1_tag_remaining(ASN1_DATA *data);
-bool asn1_read_OID(ASN1_DATA *data, char **OID);
-bool asn1_check_OID(ASN1_DATA *data, const char *OID);
-bool asn1_read_GeneralString(ASN1_DATA *data, char **s);
-bool asn1_read_OctetString(ASN1_DATA *data, DATA_BLOB *blob);
-bool asn1_read_Integer(ASN1_DATA *data, int *i);
-bool asn1_check_enumerated(ASN1_DATA *data, int v);
-bool asn1_write_enumerated(ASN1_DATA *data, uint8 v);
-bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
-bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID);
-
/* The following definitions come from libsmb/cliconnect.c */
ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
@@ -2966,7 +2935,7 @@ DATA_BLOB spnego_gen_negTokenInit(char guid[16],
const char *principal);
DATA_BLOB gen_negTokenInit(const char *OID, DATA_BLOB blob);
bool spnego_parse_negTokenInit(DATA_BLOB blob,
- char *OIDs[ASN1_MAX_OIDS],
+ char *OIDs[ASN1_MAX_OIDS],
char **principal);
DATA_BLOB gen_negTokenTarg(const char *OIDs[], DATA_BLOB blob);
bool parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *secblob);