mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
s4:heimdal New files and supporting logic for heimdal update
This commit is contained in:
parent
89eaef0253
commit
564d5cd2c4
5
.gitignore
vendored
5
.gitignore
vendored
@ -155,11 +155,14 @@ source4/gentest_seeds.dat
|
||||
source4/heimdal/kdc/kdc-private.h
|
||||
source4/heimdal/kdc/kdc-protos.h
|
||||
source4/heimdal/lib/asn1/asn1_*
|
||||
source4/heimdal/lib/asn1/*_asn1-priv.h*
|
||||
source4/heimdal/lib/asn1/der-protos.h
|
||||
source4/heimdal/lib/asn1/krb5_asn1_files
|
||||
source4/heimdal/lib/asn1/krb5_asn1.h
|
||||
source4/heimdal/lib/des/hcrypto
|
||||
source4/heimdal/lib/gssapi/asn1_*.c
|
||||
source4/heimdal/lib/gssapi/gssapi_asn1-priv.h
|
||||
source4/heimdal/lib/gssapi/spnego_asn1-priv.h
|
||||
source4/heimdal/lib/gssapi/krb5/gsskrb5-private.h
|
||||
source4/heimdal/lib/gssapi/spnego_asn1_files
|
||||
source4/heimdal/lib/gssapi/spnego_asn1.h
|
||||
@ -167,10 +170,12 @@ source4/heimdal/lib/gssapi/spnego/spnego-private.h
|
||||
source4/heimdal/lib/hdb/asn1_*.c
|
||||
source4/heimdal/lib/hdb/hdb_asn1_files
|
||||
source4/heimdal/lib/hdb/hdb_asn1.h
|
||||
source4/heimdal/lib/hdb/hdb_asn1-priv.h
|
||||
source4/heimdal/lib/hdb/hdb_err.?
|
||||
source4/heimdal/lib/hdb/hdb-private.h
|
||||
source4/heimdal/lib/hdb/hdb-protos.h
|
||||
source4/heimdal/lib/hx509/asn1_*.c
|
||||
source4/heimdal/lib/hx509/*asn1-priv.h
|
||||
source4/heimdal/lib/hx509/hx509-private.h
|
||||
source4/heimdal/lib/hx509/hx509-protos.h
|
||||
source4/heimdal/lib/krb5/heim_err.?
|
||||
|
141
source4/heimdal/lib/asn1/asn1-template.h
Normal file
141
source4/heimdal/lib/asn1/asn1-template.h
Normal file
@ -0,0 +1,141 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Portions Copyright (c) 2009 Apple Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* asn1 templates */
|
||||
|
||||
#ifndef __TEMPLATE_H__
|
||||
#define __TEMPLATE_H__
|
||||
|
||||
/* tag:
|
||||
* 0..20 tag
|
||||
* 21 type
|
||||
* 22..23 class
|
||||
* 24..27 flags
|
||||
* 28..31 op
|
||||
*/
|
||||
|
||||
/* parse:
|
||||
* 0..11 type
|
||||
* 12..23 unused
|
||||
* 24..27 flags
|
||||
* 28..31 op
|
||||
*/
|
||||
|
||||
#define A1_OP_MASK (0xf0000000)
|
||||
#define A1_OP_TYPE (0x10000000)
|
||||
#define A1_OP_TYPE_EXTERN (0x20000000)
|
||||
#define A1_OP_TAG (0x30000000)
|
||||
#define A1_OP_PARSE (0x40000000)
|
||||
#define A1_OP_SEQOF (0x50000000)
|
||||
#define A1_OP_SETOF (0x60000000)
|
||||
#define A1_OP_BMEMBER (0x70000000)
|
||||
#define A1_OP_CHOICE (0x80000000)
|
||||
|
||||
#define A1_FLAG_MASK (0x0f000000)
|
||||
#define A1_FLAG_OPTIONAL (0x01000000)
|
||||
#define A1_FLAG_IMPLICIT (0x02000000)
|
||||
|
||||
#define A1_TAG_T(CLASS,TYPE,TAG) ((A1_OP_TAG) | (((CLASS) << 22) | ((TYPE) << 21) | (TAG)))
|
||||
#define A1_TAG_CLASS(x) (((x) >> 22) & 0x3)
|
||||
#define A1_TAG_TYPE(x) (((x) >> 21) & 0x1)
|
||||
#define A1_TAG_TAG(x) ((x) & 0x1fffff)
|
||||
|
||||
#define A1_TAG_LEN(t) ((uintptr_t)(t)->ptr)
|
||||
#define A1_HEADER_LEN(t) ((uintptr_t)(t)->ptr)
|
||||
|
||||
#define A1_PARSE_T(type) ((A1_OP_PARSE) | (type))
|
||||
#define A1_PARSE_TYPE_MASK 0xfff
|
||||
#define A1_PARSE_TYPE(x) (A1_PARSE_TYPE_MASK & (x))
|
||||
|
||||
#define A1_PF_INDEFINTE 0x1
|
||||
#define A1_PF_ALLOW_BER 0x2
|
||||
|
||||
#define A1_HF_PRESERVE 0x1
|
||||
#define A1_HF_ELLIPSIS 0x2
|
||||
|
||||
#define A1_HBF_RFC1510 0x1
|
||||
|
||||
|
||||
struct asn1_template {
|
||||
uint32_t tt;
|
||||
size_t offset;
|
||||
const void *ptr;
|
||||
};
|
||||
|
||||
typedef int (*asn1_type_decode)(const unsigned char *, size_t, void *, size_t *);
|
||||
typedef int (*asn1_type_encode)(unsigned char *, size_t, const void *, size_t *);
|
||||
typedef size_t (*asn1_type_length)(const void *);
|
||||
typedef void (*asn1_type_release)(void *);
|
||||
typedef int (*asn1_type_copy)(const void *, void *);
|
||||
|
||||
struct asn1_type_func {
|
||||
asn1_type_encode encode;
|
||||
asn1_type_decode decode;
|
||||
asn1_type_length length;
|
||||
asn1_type_copy copy;
|
||||
asn1_type_release release;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
struct template_of {
|
||||
unsigned int len;
|
||||
void *val;
|
||||
};
|
||||
|
||||
enum template_types {
|
||||
A1T_IMEMBER = 0,
|
||||
A1T_HEIM_INTEGER,
|
||||
A1T_INTEGER,
|
||||
A1T_UNSIGNED,
|
||||
A1T_GENERAL_STRING,
|
||||
A1T_OCTET_STRING,
|
||||
A1T_OCTET_STRING_BER,
|
||||
A1T_IA5_STRING,
|
||||
A1T_BMP_STRING,
|
||||
A1T_UNIVERSAL_STRING,
|
||||
A1T_PRINTABLE_STRING,
|
||||
A1T_VISIBLE_STRING,
|
||||
A1T_UTF8_STRING,
|
||||
A1T_GENERALIZED_TIME,
|
||||
A1T_UTC_TIME,
|
||||
A1T_HEIM_BIT_STRING,
|
||||
A1T_BOOLEAN,
|
||||
A1T_OID,
|
||||
A1T_TELETEX_STRING,
|
||||
A1T_NULL
|
||||
};
|
||||
|
||||
|
||||
#endif
|
894
source4/heimdal/lib/asn1/gen_template.c
Normal file
894
source4/heimdal/lib/asn1/gen_template.c
Normal file
@ -0,0 +1,894 @@
|
||||
/*
|
||||
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Portions Copyright (c) 2009 Apple Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "gen_locl.h"
|
||||
|
||||
static const char *symbol_name(const char *, const Type *);
|
||||
static void generate_template_type(const char *, const char **, const char *, const char *, const char *,
|
||||
Type *, int, int, int);
|
||||
|
||||
static const char *
|
||||
ttype_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return t->symbol->gen_name;
|
||||
}
|
||||
|
||||
static const char *
|
||||
integer_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
if (t->members)
|
||||
return "int"; /* XXX enum foo */
|
||||
else if (t->range == NULL)
|
||||
return "heim_integer";
|
||||
else if (t->range->min == INT_MIN && t->range->max == INT_MAX)
|
||||
return "int";
|
||||
else if (t->range->min == 0 && t->range->max == UINT_MAX)
|
||||
return "unsigned";
|
||||
else if (t->range->min == 0 && t->range->max == INT_MAX)
|
||||
return "unsigned";
|
||||
else
|
||||
abort();
|
||||
}
|
||||
|
||||
static const char *
|
||||
boolean_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "int";
|
||||
}
|
||||
|
||||
|
||||
static const char *
|
||||
octetstring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_octet_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
sequence_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return basename;
|
||||
}
|
||||
|
||||
static const char *
|
||||
time_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "time_t";
|
||||
}
|
||||
|
||||
static const char *
|
||||
tag_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return symbol_name(basename, t->subtype);
|
||||
}
|
||||
|
||||
static const char *
|
||||
generalstring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_general_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
printablestring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_printable_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
ia5string_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_ia5_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
visiblestring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_visible_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
utf8string_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_utf8_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
bmpstring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_bmp_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
universalstring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_universal_string";
|
||||
}
|
||||
|
||||
static const char *
|
||||
oid_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
return "heim_oid";
|
||||
}
|
||||
|
||||
static const char *
|
||||
bitstring_symbol(const char *basename, const Type *t)
|
||||
{
|
||||
if (t->members)
|
||||
return basename;
|
||||
return "heim_bit_string";
|
||||
}
|
||||
|
||||
|
||||
|
||||
struct {
|
||||
enum typetype type;
|
||||
const char *(*symbol_name)(const char *, const Type *);
|
||||
int is_struct;
|
||||
} types[] = {
|
||||
{ TBMPString, bmpstring_symbol, 0 },
|
||||
{ TBitString, bitstring_symbol, 0 },
|
||||
{ TBoolean, boolean_symbol, 0 },
|
||||
{ TGeneralString, generalstring_symbol, 0 },
|
||||
{ TGeneralizedTime, time_symbol, 0 },
|
||||
{ TIA5String, ia5string_symbol, 0 },
|
||||
{ TInteger, integer_symbol, 0 },
|
||||
{ TOID, oid_symbol, 0 },
|
||||
{ TOctetString, octetstring_symbol, 0 },
|
||||
{ TPrintableString, printablestring_symbol, 0 },
|
||||
{ TSequence, sequence_symbol, 1 },
|
||||
{ TSequenceOf, tag_symbol, 1 },
|
||||
{ TSetOf, tag_symbol, 1 },
|
||||
{ TTag, tag_symbol, 1 },
|
||||
{ TType, ttype_symbol, 1 },
|
||||
{ TUTCTime, time_symbol, 0 },
|
||||
{ TUniversalString, universalstring_symbol, 0 },
|
||||
{ TVisibleString, visiblestring_symbol, 0 },
|
||||
{ TUTF8String, utf8string_symbol, 0 },
|
||||
{ TChoice, sequence_symbol, 1 },
|
||||
{ TNull, integer_symbol, 1 }
|
||||
};
|
||||
|
||||
static FILE *
|
||||
get_code_file(void)
|
||||
{
|
||||
if (!one_code_file)
|
||||
return templatefile;
|
||||
return codefile;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
is_supported_type_p(const Type *t)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < sizeof(types)/sizeof(types[0]); i++)
|
||||
if (t->type == types[i].type)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
is_template_compat (const Symbol *s)
|
||||
{
|
||||
return is_supported_type_p(s->type);
|
||||
}
|
||||
|
||||
static const char *
|
||||
symbol_name(const char *basename, const Type *t)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < sizeof(types)/sizeof(types[0]); i++)
|
||||
if (t->type == types[i].type)
|
||||
return (types[i].symbol_name)(basename, t);
|
||||
printf("unknown der type: %d\n", t->type);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
partial_offset(const char *basetype, const char *name, int need_offset)
|
||||
{
|
||||
char *str;
|
||||
if (name == NULL || need_offset == 0)
|
||||
return strdup("0");
|
||||
asprintf(&str, "offsetof(struct %s, %s)", basetype, name);
|
||||
return str;
|
||||
}
|
||||
|
||||
struct template {
|
||||
char *line;
|
||||
char *tt;
|
||||
char *offset;
|
||||
char *ptr;
|
||||
ASN1_TAILQ_ENTRY(template) members;
|
||||
};
|
||||
|
||||
ASN1_TAILQ_HEAD(templatehead, template);
|
||||
|
||||
struct tlist {
|
||||
char *name;
|
||||
char *header;
|
||||
struct templatehead template;
|
||||
ASN1_TAILQ_ENTRY(tlist) tmembers;
|
||||
};
|
||||
|
||||
ASN1_TAILQ_HEAD(tlisthead, tlist);
|
||||
|
||||
static void tlist_header(struct tlist *, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
|
||||
static struct template *
|
||||
add_line(struct templatehead *, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
|
||||
static int tlist_cmp(const struct tlist *, const struct tlist *);
|
||||
|
||||
static void add_line_pointer(struct templatehead *, const char *, const char *, const char *, ...)
|
||||
__attribute__((__format__(__printf__, 4, 5)));
|
||||
|
||||
|
||||
static struct tlisthead tlistmaster = ASN1_TAILQ_HEAD_INITIALIZER(tlistmaster);
|
||||
static unsigned long numdups = 0;
|
||||
|
||||
static struct tlist *
|
||||
tlist_new(const char *name)
|
||||
{
|
||||
struct tlist *tl = calloc(1, sizeof(*tl));
|
||||
tl->name = strdup(name);
|
||||
ASN1_TAILQ_INIT(&tl->template);
|
||||
return tl;
|
||||
}
|
||||
|
||||
static void
|
||||
tlist_header(struct tlist *t, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
vasprintf(&t->header, fmt, ap);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
static unsigned long
|
||||
tlist_count(struct tlist *tl)
|
||||
{
|
||||
unsigned int count = 0;
|
||||
struct template *q;
|
||||
|
||||
ASN1_TAILQ_FOREACH(q, &tl->template, members) {
|
||||
count++;
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
static void
|
||||
tlist_add(struct tlist *tl)
|
||||
{
|
||||
ASN1_TAILQ_INSERT_TAIL(&tlistmaster, tl, tmembers);
|
||||
}
|
||||
|
||||
static void
|
||||
tlist_print(struct tlist *tl)
|
||||
{
|
||||
struct template *q;
|
||||
unsigned int i = 1;
|
||||
FILE *f = get_code_file();
|
||||
|
||||
fprintf(f, "static const struct asn1_template asn1_%s[] = {\n", tl->name);
|
||||
fprintf(f, "/* 0 */ %s,\n", tl->header);
|
||||
ASN1_TAILQ_FOREACH(q, &tl->template, members) {
|
||||
int last = (ASN1_TAILQ_LAST(&tl->template, templatehead) == q);
|
||||
fprintf(f, "/* %lu */ %s%s\n", (unsigned long)i++, q->line, last ? "" : ",");
|
||||
}
|
||||
fprintf(f, "};\n");
|
||||
}
|
||||
|
||||
static struct tlist *
|
||||
tlist_find_by_name(const char *name)
|
||||
{
|
||||
struct tlist *ql;
|
||||
ASN1_TAILQ_FOREACH(ql, &tlistmaster, tmembers) {
|
||||
if (strcmp(ql->name, name) == 0)
|
||||
return ql;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
tlist_cmp_name(const char *tname, const char *qname)
|
||||
{
|
||||
struct tlist *tl = tlist_find_by_name(tname);
|
||||
struct tlist *ql = tlist_find_by_name(qname);
|
||||
return tlist_cmp(tl, ql);
|
||||
}
|
||||
|
||||
static int
|
||||
tlist_cmp(const struct tlist *tl, const struct tlist *ql)
|
||||
{
|
||||
int ret;
|
||||
struct template *t, *q;
|
||||
|
||||
ret = strcmp(tl->header, ql->header);
|
||||
if (ret) return ret;
|
||||
|
||||
q = ASN1_TAILQ_FIRST(&ql->template);
|
||||
ASN1_TAILQ_FOREACH(t, &tl->template, members) {
|
||||
if (q == NULL) return 1;
|
||||
|
||||
if (t->ptr == NULL || q->ptr == NULL) {
|
||||
ret = strcmp(t->line, q->line);
|
||||
if (ret) return ret;
|
||||
} else {
|
||||
ret = strcmp(t->tt, q->tt);
|
||||
if (ret) return ret;
|
||||
|
||||
ret = strcmp(t->offset, q->offset);
|
||||
if (ret) return ret;
|
||||
|
||||
if ((ret = strcmp(t->ptr, q->ptr)) != 0 ||
|
||||
(ret = tlist_cmp_name(t->ptr, q->ptr)) != 0)
|
||||
return ret;
|
||||
}
|
||||
q = ASN1_TAILQ_NEXT(q, members);
|
||||
}
|
||||
if (q != NULL) return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static const char *
|
||||
tlist_find_dup(const struct tlist *tl)
|
||||
{
|
||||
struct tlist *ql;
|
||||
|
||||
ASN1_TAILQ_FOREACH(ql, &tlistmaster, tmembers) {
|
||||
if (tlist_cmp(ql, tl) == 0) {
|
||||
numdups++;
|
||||
return ql->name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
static struct template *
|
||||
add_line(struct templatehead *t, const char *fmt, ...)
|
||||
{
|
||||
struct template *q = calloc(1, sizeof(*q));
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
vasprintf(&q->line, fmt, ap);
|
||||
va_end(ap);
|
||||
ASN1_TAILQ_INSERT_TAIL(t, q, members);
|
||||
return q;
|
||||
}
|
||||
|
||||
static void
|
||||
add_line_pointer(struct templatehead *t,
|
||||
const char *ptr,
|
||||
const char *offset,
|
||||
const char *ttfmt,
|
||||
...)
|
||||
{
|
||||
struct template *q;
|
||||
va_list ap;
|
||||
char *tt;
|
||||
|
||||
va_start(ap, ttfmt);
|
||||
vasprintf(&tt, ttfmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
q = add_line(t, "{ %s, %s, asn1_%s }", tt, offset, ptr);
|
||||
q->tt = tt;
|
||||
q->offset = strdup(offset);
|
||||
q->ptr = strdup(ptr);
|
||||
}
|
||||
|
||||
static int
|
||||
use_extern(const Symbol *s)
|
||||
{
|
||||
if (s->type == NULL)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
is_struct(Type *t, int isstruct)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (t->type == TType)
|
||||
return 0;
|
||||
if (t->type == TSequence || t->type == TSet || t->type == TChoice)
|
||||
return 1;
|
||||
if (t->type == TTag)
|
||||
return is_struct(t->subtype, isstruct);
|
||||
|
||||
for (i = 0; i < sizeof(types)/sizeof(types[0]); i++) {
|
||||
if (t->type == types[i].type) {
|
||||
if (types[i].is_struct == 0)
|
||||
return 0;
|
||||
else
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return isstruct;
|
||||
}
|
||||
|
||||
static const Type *
|
||||
compact_tag(const Type *t)
|
||||
{
|
||||
while (t->type == TTag)
|
||||
t = t->subtype;
|
||||
return t;
|
||||
}
|
||||
|
||||
static void
|
||||
template_members(struct templatehead *temp, const char *basetype, const char *name, const Type *t, int optional, int isstruct, int need_offset)
|
||||
{
|
||||
char *poffset = NULL;
|
||||
|
||||
if (optional && t->type != TTag && t->type != TType)
|
||||
errx(1, "%s...%s is optional and not a (TTag or TType)", basetype, name);
|
||||
|
||||
poffset = partial_offset(basetype, name, need_offset);
|
||||
|
||||
switch (t->type) {
|
||||
case TType:
|
||||
if (use_extern(t->symbol)) {
|
||||
add_line(temp, "{ A1_OP_TYPE_EXTERN %s, %s, &asn1_extern_%s}",
|
||||
optional ? "|A1_FLAG_OPTIONAL" : "",
|
||||
poffset, t->symbol->gen_name);
|
||||
} else {
|
||||
add_line_pointer(temp, t->symbol->gen_name, poffset,
|
||||
"A1_OP_TYPE %s", optional ? "|A1_FLAG_OPTIONAL" : "");
|
||||
}
|
||||
break;
|
||||
case TInteger: {
|
||||
char *itype;
|
||||
|
||||
if (t->members)
|
||||
itype = "IMEMBER";
|
||||
else if (t->range == NULL)
|
||||
itype = "HEIM_INTEGER";
|
||||
else if (t->range->min == INT_MIN && t->range->max == INT_MAX)
|
||||
itype = "INTEGER";
|
||||
else if (t->range->min == 0 && t->range->max == UINT_MAX)
|
||||
itype = "UNSIGNED";
|
||||
else if (t->range->min == 0 && t->range->max == INT_MAX)
|
||||
itype = "UNSIGNED";
|
||||
else
|
||||
errx(1, "%s: unsupported range %d -> %d",
|
||||
name, t->range->min, t->range->max);
|
||||
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_%s), %s, NULL }", itype, poffset);
|
||||
break;
|
||||
}
|
||||
case TGeneralString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_GENERAL_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TTeletexString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_TELETEX_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TPrintableString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_PRINTABLE_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TOctetString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_OCTET_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TIA5String:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_IA5_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TBMPString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_BMP_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TUniversalString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_UNIVERSAL_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TVisibleString:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_VISIBLE_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TUTF8String:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_UTF8_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
case TGeneralizedTime:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_GENERALIZED_TIME), %s, NULL }", poffset);
|
||||
break;
|
||||
case TUTCTime:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_UTC_TIME), %s, NULL }", poffset);
|
||||
break;
|
||||
case TBoolean:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_BOOLEAN), %s, NULL }", poffset);
|
||||
break;
|
||||
case TOID:
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_OID), %s, NULL }", poffset);
|
||||
break;
|
||||
case TNull:
|
||||
break;
|
||||
case TBitString: {
|
||||
struct templatehead template = ASN1_TAILQ_HEAD_INITIALIZER(template);
|
||||
struct template *q;
|
||||
Member *m;
|
||||
size_t count = 0, i;
|
||||
char *bname;
|
||||
FILE *f = get_code_file();
|
||||
|
||||
if (ASN1_TAILQ_EMPTY(t->members)) {
|
||||
add_line(temp, "{ A1_PARSE_T(A1T_HEIM_BIT_STRING), %s, NULL }", poffset);
|
||||
break;
|
||||
}
|
||||
|
||||
asprintf(&bname, "bmember_%s_%lu", name ? name : "", (unsigned long)t);
|
||||
output_name(bname);
|
||||
|
||||
ASN1_TAILQ_FOREACH(m, t->members, members) {
|
||||
add_line(&template, "{ 0, %d, 0 } /* %s */", m->val, m->gen_name);
|
||||
}
|
||||
|
||||
ASN1_TAILQ_FOREACH(q, &template, members) {
|
||||
count++;
|
||||
}
|
||||
|
||||
fprintf(f, "static const struct asn1_template asn1_%s_%s[] = {\n", basetype, bname);
|
||||
fprintf(f, "/* 0 */ { 0%s, sizeof(%s), ((void *)%lu) },\n",
|
||||
rfc1510_bitstring ? "|A1_HBF_RFC1510" : "",
|
||||
basetype, (unsigned long)count);
|
||||
i = 1;
|
||||
ASN1_TAILQ_FOREACH(q, &template, members) {
|
||||
int last = (ASN1_TAILQ_LAST(&template, templatehead) == q);
|
||||
fprintf(f, "/* %lu */ %s%s\n", (unsigned long)i++, q->line, last ? "" : ",");
|
||||
}
|
||||
fprintf(f, "};\n");
|
||||
|
||||
add_line(temp, "{ A1_OP_BMEMBER, %s, asn1_%s_%s }", poffset, basetype, bname);
|
||||
|
||||
free(bname);
|
||||
|
||||
break;
|
||||
}
|
||||
case TSequence: {
|
||||
Member *m;
|
||||
|
||||
ASN1_TAILQ_FOREACH(m, t->members, members) {
|
||||
char *newbasename;
|
||||
|
||||
if (m->ellipsis)
|
||||
continue;
|
||||
|
||||
if (name)
|
||||
asprintf(&newbasename, "%s_%s", basetype, name);
|
||||
else
|
||||
newbasename = strdup(basetype);
|
||||
|
||||
template_members(temp, newbasename, m->gen_name, m->type, m->optional, isstruct, 1);
|
||||
|
||||
free(newbasename);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case TTag: {
|
||||
char *tname, *elname;
|
||||
const char *sename, *dupname;
|
||||
int subtype_is_struct = is_struct(t->subtype, isstruct);
|
||||
|
||||
if (subtype_is_struct)
|
||||
sename = basetype;
|
||||
else
|
||||
sename = symbol_name(basetype, t->subtype);
|
||||
|
||||
asprintf(&tname, "tag_%s_%lu", name ? name : "", (unsigned long)t);
|
||||
output_name(tname);
|
||||
|
||||
asprintf(&elname, "%s_%s", basetype, tname);
|
||||
|
||||
generate_template_type(elname, &dupname, NULL, sename, name,
|
||||
t->subtype, 0, subtype_is_struct, 0);
|
||||
|
||||
add_line_pointer(temp, dupname, poffset,
|
||||
"A1_TAG_T(%s,%s,%s)%s",
|
||||
classname(t->tag.tagclass),
|
||||
is_primitive_type(t->subtype->type) ? "PRIM" : "CONS",
|
||||
valuename(t->tag.tagclass, t->tag.tagvalue),
|
||||
optional ? "|A1_FLAG_OPTIONAL" : "");
|
||||
|
||||
free(tname);
|
||||
free(elname);
|
||||
|
||||
break;
|
||||
}
|
||||
case TSetOf:
|
||||
case TSequenceOf: {
|
||||
const char *type, *tname, *dupname;
|
||||
char *sename, *elname;
|
||||
int subtype_is_struct = is_struct(t->subtype, 0);
|
||||
|
||||
if (name && subtype_is_struct) {
|
||||
tname = "seofTstruct";
|
||||
asprintf(&sename, "%s_%s_val",
|
||||
basetype, name);
|
||||
} else if (subtype_is_struct) {
|
||||
tname = "seofTstruct";
|
||||
asprintf(&sename, "%s_val", symbol_name(basetype, t->subtype));
|
||||
} else {
|
||||
if (name)
|
||||
tname = name;
|
||||
else
|
||||
tname = "seofTstruct";
|
||||
sename = strdup(symbol_name(basetype, t->subtype));
|
||||
}
|
||||
|
||||
if (t->type == TSetOf) type = "A1_OP_SETOF";
|
||||
else if (t->type == TSequenceOf) type = "A1_OP_SEQOF";
|
||||
else abort();
|
||||
|
||||
asprintf(&elname, "%s_%s_%lu", basetype, tname, (unsigned long)t);
|
||||
|
||||
generate_template_type(elname, &dupname, NULL, sename, NULL, t->subtype,
|
||||
0, subtype_is_struct, need_offset);
|
||||
|
||||
add_line(temp, "{ %s, %s, asn1_%s }", type, poffset, dupname);
|
||||
free(sename);
|
||||
break;
|
||||
}
|
||||
case TChoice: {
|
||||
struct templatehead template = ASN1_TAILQ_HEAD_INITIALIZER(template);
|
||||
struct template *q;
|
||||
size_t count = 0, i;
|
||||
char *tname;
|
||||
FILE *f = get_code_file();
|
||||
Member *m;
|
||||
int ellipsis = 0;
|
||||
char *e;
|
||||
|
||||
asprintf(&tname, "asn1_choice_%s_%s%x",
|
||||
basetype, name ? name : "", (unsigned int)(uintptr_t)t);
|
||||
|
||||
ASN1_TAILQ_FOREACH(m, t->members, members) {
|
||||
const char *dupname;
|
||||
char *elname;
|
||||
char *newbasename;
|
||||
int subtype_is_struct;
|
||||
|
||||
if (m->ellipsis) {
|
||||
ellipsis = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
subtype_is_struct = is_struct(m->type, 0);
|
||||
|
||||
asprintf(&elname, "%s_choice_%s", basetype, m->gen_name);
|
||||
|
||||
if (subtype_is_struct)
|
||||
asprintf(&newbasename, "%s_%s", basetype, m->gen_name);
|
||||
else
|
||||
newbasename = strdup(basetype);
|
||||
|
||||
generate_template_type(elname, &dupname, NULL,
|
||||
symbol_name(newbasename, m->type),
|
||||
NULL, m->type, 0, subtype_is_struct, 1);
|
||||
|
||||
add_line(&template, "{ %s, offsetof(%s%s, u.%s), asn1_%s }",
|
||||
m->label, isstruct ? "struct " : "",
|
||||
basetype, m->gen_name,
|
||||
dupname);
|
||||
|
||||
free(elname);
|
||||
free(newbasename);
|
||||
}
|
||||
|
||||
if (ellipsis) {
|
||||
asprintf(&e, "offsetof(%s%s, u.asn1_ellipsis)", isstruct ? "struct " : "", basetype);
|
||||
} else
|
||||
e = NULL;
|
||||
|
||||
ASN1_TAILQ_FOREACH(q, &template, members) {
|
||||
count++;
|
||||
}
|
||||
|
||||
fprintf(f, "static const struct asn1_template %s[] = {\n", tname);
|
||||
fprintf(f, "/* 0 */ { %s, offsetof(%s%s, element), ((void *)%lu) },\n",
|
||||
e ? e : "0", isstruct ? "struct " : "", basetype, (unsigned long)count);
|
||||
i = 1;
|
||||
ASN1_TAILQ_FOREACH(q, &template, members) {
|
||||
int last = (ASN1_TAILQ_LAST(&template, templatehead) == q);
|
||||
fprintf(f, "/* %lu */ %s%s\n", (unsigned long)i++, q->line, last ? "" : ",");
|
||||
}
|
||||
fprintf(f, "};\n");
|
||||
|
||||
add_line(temp, "{ A1_OP_CHOICE, %s, %s }", poffset, tname);
|
||||
|
||||
free(e);
|
||||
free(tname);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
if (poffset)
|
||||
free(poffset);
|
||||
}
|
||||
|
||||
static void
|
||||
gen_extern_stubs(FILE *f, const char *name)
|
||||
{
|
||||
fprintf(f,
|
||||
"static const struct asn1_type_func asn1_extern_%s = {\n"
|
||||
"\t(asn1_type_encode)encode_%s,\n"
|
||||
"\t(asn1_type_decode)decode_%s,\n"
|
||||
"\t(asn1_type_length)length_%s,\n"
|
||||
"\t(asn1_type_copy)copy_%s,\n"
|
||||
"\t(asn1_type_release)free_%s,\n"
|
||||
"\tsizeof(%s)\n"
|
||||
"};\n",
|
||||
name, name, name, name,
|
||||
name, name, name);
|
||||
}
|
||||
|
||||
void
|
||||
gen_template_import(const Symbol *s)
|
||||
{
|
||||
FILE *f = get_code_file();
|
||||
|
||||
if (template_flag == 0)
|
||||
return;
|
||||
|
||||
gen_extern_stubs(f, s->gen_name);
|
||||
}
|
||||
|
||||
static void
|
||||
generate_template_type(const char *varname,
|
||||
const char **dupname,
|
||||
const char *symname,
|
||||
const char *basetype,
|
||||
const char *name,
|
||||
Type *type,
|
||||
int optional, int isstruct, int need_offset)
|
||||
{
|
||||
struct tlist *tl;
|
||||
const char *dup;
|
||||
int have_ellipsis = 0;
|
||||
|
||||
tl = tlist_new(varname);
|
||||
|
||||
template_members(&tl->template, basetype, name, type, optional, isstruct, need_offset);
|
||||
|
||||
/* if its a sequence or set type, check if there is a ellipsis */
|
||||
if (type->type == TSequence || type->type == TSet) {
|
||||
Member *m;
|
||||
ASN1_TAILQ_FOREACH(m, type->members, members) {
|
||||
if (m->ellipsis)
|
||||
have_ellipsis = 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (ASN1_TAILQ_EMPTY(&tl->template) && compact_tag(type)->type != TNull)
|
||||
errx(1, "Tag %s...%s with no content ?", basetype, name ? name : "");
|
||||
|
||||
tlist_header(tl, "{ 0%s%s, sizeof(%s%s), ((void *)%lu) }",
|
||||
(symname && preserve_type(symname)) ? "|A1_HF_PRESERVE" : "",
|
||||
have_ellipsis ? "|A1_HF_ELLIPSIS" : "",
|
||||
isstruct ? "struct " : "", basetype, tlist_count(tl));
|
||||
|
||||
dup = tlist_find_dup(tl);
|
||||
if (dup) {
|
||||
if (strcmp(dup, tl->name) == 0)
|
||||
errx(1, "found dup of ourself");
|
||||
*dupname = dup;
|
||||
} else {
|
||||
*dupname = tl->name;
|
||||
tlist_print(tl);
|
||||
tlist_add(tl);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
generate_template(const Symbol *s)
|
||||
{
|
||||
FILE *f = get_code_file();
|
||||
const char *dupname;
|
||||
|
||||
if (use_extern(s)) {
|
||||
gen_extern_stubs(f, s->gen_name);
|
||||
return;
|
||||
}
|
||||
|
||||
generate_template_type(s->gen_name, &dupname, s->name, s->gen_name, NULL, s->type, 0, 0, 1);
|
||||
|
||||
fprintf(f,
|
||||
"\n"
|
||||
"int\n"
|
||||
"decode_%s(const unsigned char *p, size_t len, %s *data, size_t *size)\n"
|
||||
"{\n"
|
||||
" return _asn1_decode_top(asn1_%s, 0|%s, p, len, data, size);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
dupname,
|
||||
support_ber ? "A1_PF_ALLOW_BER" : "0");
|
||||
|
||||
fprintf(f,
|
||||
"\n"
|
||||
"int\n"
|
||||
"encode_%s(unsigned char *p, size_t len, const %s *data, size_t *size)\n"
|
||||
"{\n"
|
||||
" return _asn1_encode(asn1_%s, p, len, data, size);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
dupname);
|
||||
|
||||
fprintf(f,
|
||||
"\n"
|
||||
"size_t\n"
|
||||
"length_%s(const %s *data)\n"
|
||||
"{\n"
|
||||
" return _asn1_length(asn1_%s, data);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
dupname);
|
||||
|
||||
|
||||
fprintf(f,
|
||||
"\n"
|
||||
"void\n"
|
||||
"free_%s(%s *data)\n"
|
||||
"{\n"
|
||||
" _asn1_free(asn1_%s, data);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
dupname);
|
||||
|
||||
fprintf(f,
|
||||
"\n"
|
||||
"int\n"
|
||||
"copy_%s(const %s *from, %s *to)\n"
|
||||
"{\n"
|
||||
" return _asn1_copy_top(asn1_%s, from, to);\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
s->gen_name,
|
||||
dupname);
|
||||
}
|
226
source4/heimdal/lib/hdb/hdb-keytab.c
Normal file
226
source4/heimdal/lib/hdb/hdb-keytab.c
Normal file
@ -0,0 +1,226 @@
|
||||
/*
|
||||
* Copyright (c) 2009 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Portions Copyright (c) 2009 Apple Inc. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include "hdb_locl.h"
|
||||
#include <assert.h>
|
||||
|
||||
typedef struct {
|
||||
char *path;
|
||||
krb5_keytab keytab;
|
||||
} *hdb_keytab;
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
static krb5_error_code
|
||||
hkt_close(krb5_context context, HDB *db)
|
||||
{
|
||||
hdb_keytab k = (hdb_keytab)db->hdb_db;
|
||||
krb5_error_code ret;
|
||||
|
||||
assert(k->keytab);
|
||||
|
||||
ret = krb5_kt_close(context, k->keytab);
|
||||
k->keytab = NULL;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_destroy(krb5_context context, HDB *db)
|
||||
{
|
||||
hdb_keytab k = (hdb_keytab)db->hdb_db;
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = hdb_clear_master_key (context, db);
|
||||
|
||||
free(k->path);
|
||||
free(k);
|
||||
|
||||
free(db->hdb_name);
|
||||
free(db);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_lock(krb5_context context, HDB *db, int operation)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_unlock(krb5_context context, HDB *db)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_firstkey(krb5_context context, HDB *db,
|
||||
unsigned flags, hdb_entry_ex *entry)
|
||||
{
|
||||
return HDB_ERR_DB_INUSE;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_nextkey(krb5_context context, HDB * db, unsigned flags,
|
||||
hdb_entry_ex * entry)
|
||||
{
|
||||
return HDB_ERR_DB_INUSE;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_open(krb5_context context, HDB * db, int flags, mode_t mode)
|
||||
{
|
||||
hdb_keytab k = (hdb_keytab)db->hdb_db;
|
||||
krb5_error_code ret;
|
||||
|
||||
assert(k->keytab == NULL);
|
||||
|
||||
ret = krb5_kt_resolve(context, k->path, &k->keytab);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_fetch(krb5_context context, HDB * db, krb5_const_principal principal,
|
||||
unsigned flags, hdb_entry_ex * entry)
|
||||
{
|
||||
hdb_keytab k = (hdb_keytab)db->hdb_db;
|
||||
krb5_error_code ret;
|
||||
krb5_keytab_entry ktentry;
|
||||
|
||||
memset(&ktentry, 0, sizeof(ktentry));
|
||||
|
||||
entry->entry.flags.server = 1;
|
||||
entry->entry.flags.forwardable = 1;
|
||||
entry->entry.flags.renewable = 1;
|
||||
|
||||
/* Not recorded in the OD backend, make something up */
|
||||
ret = krb5_parse_name(context, "hdb/keytab@WELL-KNOWN:KEYTAB-BACKEND",
|
||||
&entry->entry.created_by.principal);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
/*
|
||||
* XXX really needs to try all enctypes and just not pick the
|
||||
* first one, even if that happens to be des3-cbc-sha1 (ie best
|
||||
* enctype) in the Apple case. A while loop over all known
|
||||
* enctypes should work.
|
||||
*/
|
||||
|
||||
ret = krb5_kt_get_entry(context, k->keytab, principal, 0, 0, &ktentry);
|
||||
if (ret) {
|
||||
ret = HDB_ERR_NOENTRY;
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = krb5_copy_principal(context, principal, &entry->entry.principal);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
ret = _hdb_keytab2hdb_entry(context, &ktentry, entry);
|
||||
|
||||
out:
|
||||
if (ret) {
|
||||
free_hdb_entry(&entry->entry);
|
||||
memset(&entry->entry, 0, sizeof(entry->entry));
|
||||
}
|
||||
krb5_kt_free_entry(context, &ktentry);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
hkt_store(krb5_context context, HDB * db, unsigned flags,
|
||||
hdb_entry_ex * entry)
|
||||
{
|
||||
return HDB_ERR_DB_INUSE;
|
||||
}
|
||||
|
||||
|
||||
krb5_error_code
|
||||
hdb_keytab_create(krb5_context context, HDB ** db, const char *arg)
|
||||
{
|
||||
hdb_keytab k;
|
||||
|
||||
*db = calloc(1, sizeof(**db));
|
||||
if (*db == NULL) {
|
||||
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
|
||||
return ENOMEM;
|
||||
}
|
||||
memset(*db, 0, sizeof(**db));
|
||||
|
||||
k = calloc(1, sizeof(*k));
|
||||
if (k == NULL) {
|
||||
free(*db);
|
||||
*db = NULL;
|
||||
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
k->path = strdup(arg);
|
||||
if (k->path == NULL) {
|
||||
free(k);
|
||||
free(*db);
|
||||
*db = NULL;
|
||||
krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
|
||||
return ENOMEM;
|
||||
}
|
||||
|
||||
|
||||
(*db)->hdb_db = k;
|
||||
|
||||
(*db)->hdb_master_key_set = 0;
|
||||
(*db)->hdb_openp = 0;
|
||||
(*db)->hdb_open = hkt_open;
|
||||
(*db)->hdb_close = hkt_close;
|
||||
(*db)->hdb_fetch = hkt_fetch;
|
||||
(*db)->hdb_store = hkt_store;
|
||||
(*db)->hdb_remove = NULL;
|
||||
(*db)->hdb_firstkey = hkt_firstkey;
|
||||
(*db)->hdb_nextkey = hkt_nextkey;
|
||||
(*db)->hdb_lock = hkt_lock;
|
||||
(*db)->hdb_unlock = hkt_unlock;
|
||||
(*db)->hdb_rename = NULL;
|
||||
(*db)->hdb__get = NULL;
|
||||
(*db)->hdb__put = NULL;
|
||||
(*db)->hdb__del = NULL;
|
||||
(*db)->hdb_destroy = hkt_destroy;
|
||||
|
||||
return 0;
|
||||
}
|
92
source4/heimdal/lib/roken/strerror_r.c
Normal file
92
source4/heimdal/lib/roken/strerror_r.c
Normal file
@ -0,0 +1,92 @@
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#if !defined(HAVE_STRERROR_R) && !defined(STRERROR_R_PROTO_COMPATIBLE)
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
int ROKEN_LIB_FUNCTION
|
||||
rk_strerror_r(int eno, char * strerrbuf, size_t buflen)
|
||||
{
|
||||
errno_t err;
|
||||
|
||||
err = strerror_s(strerrbuf, buflen, eno);
|
||||
if (err != 0) {
|
||||
int code;
|
||||
code = sprintf_s(strerrbuf, buflen, "Error % occurred.", eno);
|
||||
err = ((code != 0)? errno : 0);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
#else /* _MSC_VER */
|
||||
|
||||
#ifndef HAVE_STRERROR_R
|
||||
extern int sys_nerr;
|
||||
extern char *sys_errlist[];
|
||||
#endif
|
||||
|
||||
int ROKEN_LIB_FUNCTION
|
||||
rk_strerror_r(int eno, char *strerrbuf, size_t buflen)
|
||||
{
|
||||
/* Assume is the linux broken strerror_r (returns the a buffer (char *) if the input buffer wasn't use */
|
||||
#ifdef HAVE_STRERROR_R
|
||||
const char *str;
|
||||
str = strerror_r(eno, strerrbuf, buflen);
|
||||
if (str != strerrbuf)
|
||||
if (strlcpy(strerrbuf, str, buflen) >= buflen)
|
||||
return ERANGE;
|
||||
return 0;
|
||||
#else
|
||||
int ret;
|
||||
if(eno < 0 || eno >= sys_nerr) {
|
||||
snprintf(strerrbuf, buflen, "Error %d occurred.", eno);
|
||||
return EINVAL;
|
||||
}
|
||||
ret = snprintf(strerrbuf, buflen, "%s", sys_errlist[eno]);
|
||||
if (ret > buflen)
|
||||
return ERANGE;
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif /* !_MSC_VER */
|
||||
|
||||
#endif
|
@ -23,6 +23,8 @@ if (not defined $options) {
|
||||
|
||||
my $header = "$dirname/$prefix.h";
|
||||
my $headerx = "$dirname/$prefix.hx";
|
||||
my $headerpriv = "$dirname/$prefix-priv.h";
|
||||
my $headerprivx = "$dirname/$prefix-priv.hx";
|
||||
my $o_file = "$dirname/asn1_$prefix.o";
|
||||
my $c_file = "$dirname/asn1_$prefix.c";
|
||||
my $x_file = "$dirname/asn1_$prefix.x";
|
||||
@ -35,7 +37,9 @@ print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname
|
||||
print "$headerx: $output_file\n";
|
||||
print "$header: $headerx\n";
|
||||
print "\t\@cp $headerx $header\n";
|
||||
print "$x_file: $header\n";
|
||||
print "$headerpriv: $headerprivx\n";
|
||||
print "\t\@cp $headerprivx $headerpriv\n";
|
||||
print "$x_file: $header $headerpriv\n";
|
||||
print "$c_file: $x_file\n";
|
||||
print "\t\@echo \"#include \\\"config.h\\\"\" > $c_file && cat $x_file >> $c_file\n\n";
|
||||
|
||||
|
@ -6,6 +6,10 @@
|
||||
#ifndef HAVE_HEIMDAL_CONFIG_H
|
||||
#define HAVE_HEIMDAL_CONFIG_H
|
||||
|
||||
#ifndef HAVE_STRERROR_R
|
||||
#define HAVE_STRERROR_R
|
||||
#endif
|
||||
|
||||
#include "include/config.h"
|
||||
#include "../replace/replace.h"
|
||||
|
||||
|
@ -91,6 +91,7 @@ HEIMDAL_HDB_OBJ_FILES = \
|
||||
$(heimdalsrcdir)/lib/hdb/hdb.o \
|
||||
$(heimdalsrcdir)/lib/hdb/ext.o \
|
||||
$(heimdalsrcdir)/lib/hdb/keytab.o \
|
||||
$(heimdalsrcdir)/lib/hdb/hdb-keytab.o \
|
||||
$(heimdalsrcdir)/lib/hdb/mkey.o \
|
||||
$(heimdalsrcdir)/lib/hdb/ndbm.o \
|
||||
$(heimdalsrcdir)/lib/hdb/hdb_err.o \
|
||||
@ -110,6 +111,8 @@ $(eval $(call heimdal_proto_header_template, \
|
||||
$(HEIMDAL_HDB_OBJ_FILES) $(HEIMDAL_HDB_OBJ_FILES:.o=.d) \
|
||||
))
|
||||
|
||||
basics:: $(heimdalsrcdir)/lib/hdb/hdb-protos.h $(heimdalsrcdir)/lib/hdb/hdb-private.h
|
||||
|
||||
#######################
|
||||
# Start SUBSYSTEM HEIMDAL_GSSAPI
|
||||
[SUBSYSTEM::HEIMDAL_GSSAPI]
|
||||
@ -637,6 +640,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \
|
||||
$(heimdalsrcdir)/lib/roken/erealloc.o \
|
||||
$(heimdalsrcdir)/lib/roken/simple_exec.o \
|
||||
$(heimdalsrcdir)/lib/roken/strcollect.o \
|
||||
$(heimdalsrcdir)/lib/roken/strerror_r.o \
|
||||
$(heimdalsrcdir)/lib/roken/rtbl.o \
|
||||
$(heimdalsrcdir)/lib/roken/cloexec.o \
|
||||
$(heimdalsrcdir)/lib/roken/xfree.o \
|
||||
@ -692,6 +696,7 @@ asn1_compile_ASN1_OBJ_FILES = \
|
||||
$(heimdalsrcdir)/lib/asn1/gen_glue.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/gen_length.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/gen_seq.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/gen_template.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/hash.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/symbol.ho \
|
||||
$(heimdalsrcdir)/lib/asn1/asn1parse.ho \
|
||||
@ -705,6 +710,7 @@ asn1_compile_OBJ_FILES = \
|
||||
$(heimdalsrcdir)/lib/vers/print_version.ho
|
||||
|
||||
$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
|
||||
basics:: $(heimdalsrcdir)/lib/asn1/der-protos.h $(heimdalsrcdir)/lib/asn1/der-private.h
|
||||
|
||||
$(eval $(call heimdal_proto_header_template, \
|
||||
$(heimdalsrcdir)/lib/asn1/der-protos.h, \
|
||||
@ -713,6 +719,13 @@ $(eval $(call heimdal_proto_header_template, \
|
||||
$(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
|
||||
))
|
||||
|
||||
$(eval $(call heimdal_proto_header_template, \
|
||||
$(heimdalsrcdir)/lib/asn1/der-private.h, \
|
||||
-q -P comment -p, \
|
||||
$(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES:.o=.c), \
|
||||
$(asn1_compile_ASN1_OBJ_FILES) $(asn1_compile_ASN1_OBJ_FILES:.ho=.hd) \
|
||||
))
|
||||
|
||||
# End BINARY asn1_compile
|
||||
#######################
|
||||
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "system/network.h"
|
||||
|
||||
typedef socklen_t krb5_socklen_t;
|
||||
typedef int krb5_socket_t;
|
||||
typedef ssize_t krb5_ssize_t;
|
||||
|
||||
#endif /* __krb5_types_h__ */
|
||||
|
@ -10,6 +10,8 @@
|
||||
/* path to sysconf - should we force this to samba LIBDIR ? */
|
||||
#define SYSCONFDIR "/etc"
|
||||
|
||||
#define rk_PATH_DELIM '/'
|
||||
|
||||
/* HDB module dir - set to Samba LIBDIR/hdb ? */
|
||||
#define HDBDIR "/usr/heimdal/lib"
|
||||
#define LIBDIR "/usr/heimdal/lib"
|
||||
@ -27,7 +29,7 @@
|
||||
#define VERSION "Samba"
|
||||
|
||||
#define ROKEN_LIB_FUNCTION
|
||||
|
||||
#define ROKEN_LIB_CALL
|
||||
#define GETHOSTBYADDR_PROTO_COMPATIBLE
|
||||
#define GETSERVBYNAME_PROTO_COMPATIBLE
|
||||
#define OPENLOG_PROTO_COMPATIBLE
|
||||
@ -105,6 +107,10 @@
|
||||
#define HAVE_INET_ATON
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETTIMEOFDAY
|
||||
#define HAVE_GETTIMEOFDAY
|
||||
#endif
|
||||
|
||||
/* we lie about having pidfile() so that NetBSD5 can compile. Nothing
|
||||
in the parts of heimdal we use actually uses pidfile(), and we
|
||||
don't use it in Samba, so this works, although its ugly */
|
||||
|
Loading…
Reference in New Issue
Block a user