From c0fb3e1396d04671df456e4805b331e33f7f543d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 1 Jan 2002 04:05:10 +0000 Subject: renamed ans1.h to asn_1.h to prevent conflict caused by krb5 headers on some platforms using "" instead of <> in include statements (This used to be commit d0ba307032340a22d77cb1d8fc78b4234e1a963c) --- source3/include/asn1.h | 54 ---------------------------------------------- source3/include/asn_1.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ source3/include/includes.h | 2 +- 3 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 source3/include/asn1.h create mode 100644 source3/include/asn_1.h (limited to 'source3') diff --git a/source3/include/asn1.h b/source3/include/asn1.h deleted file mode 100644 index ae3cd22dde..0000000000 --- a/source3/include/asn1.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Unix SMB/Netbios implementation. - Version 3.0 - 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 2 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, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - - -struct nesting { - off_t start; - size_t taglen; /* for parsing */ - struct nesting *next; -}; - -typedef struct { - uint8 *data; - size_t length; - off_t ofs; - struct nesting *nesting; - BOOL has_error; -} ASN1_DATA; - - -#define ASN1_APPLICATION(x) ((x)+0x60) -#define ASN1_SEQUENCE(x) ((x)+0x30) -#define ASN1_CONTEXT(x) ((x)+0xa0) -#define ASN1_GENERAL_STRING 0x1b -#define ASN1_OCTET_STRING 0x4 -#define ASN1_OID 0x6 -#define ASN1_BOOLEAN 0x1 -#define ASN1_INTEGER 0x2 -#define ASN1_ENUMERATED 0xa - -#define ASN1_MAX_OIDS 20 - -/* some well known object IDs */ -#define OID_SPNEGO "1 3 6 1 5 5 2" -#define OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10" -#define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2" -#define OID_KERBEROS5 "1 2 840 113554 1 2 2" diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h new file mode 100644 index 0000000000..ae3cd22dde --- /dev/null +++ b/source3/include/asn_1.h @@ -0,0 +1,54 @@ +/* + Unix SMB/Netbios implementation. + Version 3.0 + 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 2 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, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + + +struct nesting { + off_t start; + size_t taglen; /* for parsing */ + struct nesting *next; +}; + +typedef struct { + uint8 *data; + size_t length; + off_t ofs; + struct nesting *nesting; + BOOL has_error; +} ASN1_DATA; + + +#define ASN1_APPLICATION(x) ((x)+0x60) +#define ASN1_SEQUENCE(x) ((x)+0x30) +#define ASN1_CONTEXT(x) ((x)+0xa0) +#define ASN1_GENERAL_STRING 0x1b +#define ASN1_OCTET_STRING 0x4 +#define ASN1_OID 0x6 +#define ASN1_BOOLEAN 0x1 +#define ASN1_INTEGER 0x2 +#define ASN1_ENUMERATED 0xa + +#define ASN1_MAX_OIDS 20 + +/* some well known object IDs */ +#define OID_SPNEGO "1 3 6 1 5 5 2" +#define OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10" +#define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2" +#define OID_KERBEROS5 "1 2 840 113554 1 2 2" diff --git a/source3/include/includes.h b/source3/include/includes.h index c113a14f62..70fc41034c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -724,7 +724,7 @@ extern int errno; #include "session.h" -#include "asn1.h" +#include "asn_1.h" #include "popt.h" -- cgit