jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 23:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Import of code from heimdal

Browse Source 
This commit updates the code imported from heimdal to
b118610a9c56835c4ac5dc49ce8124cae8078346 (switch-from-svn-to-git-2478-gb118610)

Upstream changes are:

Harald Barth (1):
      Move common code to krb5_unsupported_enctype() and make error message contain string instead of error number

Jeffrey Altman (1):
      roken: declare IN_LOOPBACKNET if necessary

Love Hornquist Astrand (5):
      Warning fixes from Christos Zoulas
      Fixes from NetBSD via Thomas Klausner and Roland C. Dowdeswell
      Rename subsystem_DEPRECATED to subsystem_DEPRECATED_FUNCTION(X)
      remove trailing whitespace
      remove warning, remove forward declaration by moving the function up, ident

Love Hörnquist Åstrand (4):
      don't set i = 0, its never read
      sprinkle doxygen and kode more like the rest of the code base
      partly unify enctype/keytype since there is only enctypes
      switch to KRB5_ENCTYPE

Roland C. Dowdeswell (1):
      Fix a couple of bugs in krb5_c_valid_enctype():

chas williams - CONTRACTOR (1):
      hcrypto: var name current conflicts with linux kernel

Change-Id: Id9a7a9ee8258b979b54f4ed2b4175815ab35ea21
Reviewed-on: http://gerrit.openafs.org/5399
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Tested-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Heimdal Developers 2011-09-12 14:08:57 -04:00 committed by Jeffrey Altman
parent 19a5b5e67c
commit f566228af8
11 changed files with 99 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/external/heimdal-last vendored
View File

@ -1 +1 @@
988355d9d0d1953e8c17c4b5c935938573efe4ba b118610a9c56835c4ac5dc49ce8124cae8078346

8
src/external/heimdal/hcrypto/md5.c vendored
View File

@ -214,13 +214,13 @@ MD5_Update (struct md5 *m, const void *v, size_t len)
if(offset == 64){ if(offset == 64){
#if defined(WORDS_BIGENDIAN) #if defined(WORDS_BIGENDIAN)
int i; int i;
uint32_t current[16]; uint32_t swapped[16];
struct x32 *us = (struct x32*)m->save; struct x32 *us = (struct x32*)m->save;
for(i = 0; i < 8; i++){ for(i = 0; i < 8; i++){
current[2*i+0] = swap_uint32_t(us[i].a); swapped[2*i+0] = swap_uint32_t(us[i].a);
current[2*i+1] = swap_uint32_t(us[i].b); swapped[2*i+1] = swap_uint32_t(us[i].b);
} }
calc(m, current); calc(m, swapped);
#else #else
calc(m, (uint32_t*)m->save); calc(m, (uint32_t*)m->save);
#endif #endif

30
src/external/heimdal/krb5/config_file.c vendored
View File

@ -33,8 +33,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#define KRB5_DEPRECATED
#include "krb5_locl.h" #include "krb5_locl.h"
#ifdef __APPLE__ #ifdef __APPLE__
@ -63,7 +61,7 @@ config_fgets(char *str, size_t len, struct fileptr *ptr)
p = ptr->s + strcspn(ptr->s, "\n"); p = ptr->s + strcspn(ptr->s, "\n");
if(*p == '\n') if(*p == '\n')
p++; p++;
l = min(len, p - ptr->s); l = min(len, (size_t)(p - ptr->s));
if(len > 0) { if(len > 0) {
memcpy(str, ptr->s, l); memcpy(str, ptr->s, l);
str[l] = '\0'; str[l] = '\0';
@ -91,7 +89,7 @@ _krb5_config_get_entry(krb5_config_section **parent, const char *name, int type)
for(q = parent; *q != NULL; q = &(*q)->next) for(q = parent; *q != NULL; q = &(*q)->next)
if(type == krb5_config_list && if(type == krb5_config_list &&
type == (*q)->type && (unsigned)type == (*q)->type &&
strcmp(name, (*q)->name) == 0) strcmp(name, (*q)->name) == 0)
return *q; return *q;
*q = calloc(1, sizeof(**q)); *q = calloc(1, sizeof(**q));
@ -250,7 +248,7 @@ cfstring2cstring(CFStringRef string)
{ {
CFIndex len; CFIndex len;
char *str; char *str;
str = (char *) CFStringGetCStringPtr(string, kCFStringEncodingUTF8); str = (char *) CFStringGetCStringPtr(string, kCFStringEncodingUTF8);
if (str) if (str)
return strdup(str); return strdup(str);
@ -260,7 +258,7 @@ cfstring2cstring(CFStringRef string)
str = malloc(len); str = malloc(len);
if (str == NULL) if (str == NULL)
return NULL; return NULL;
if (!CFStringGetCString (string, str, len, kCFStringEncodingUTF8)) { if (!CFStringGetCString (string, str, len, kCFStringEncodingUTF8)) {
free (str); free (str);
return NULL; return NULL;
@ -299,7 +297,7 @@ parse_plist_config(krb5_context context, const char *path, krb5_config_section *
CFReadStreamRef s; CFReadStreamRef s;
CFDictionaryRef d; CFDictionaryRef d;
CFURLRef url; CFURLRef url;
url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (UInt8 *)path, strlen(path), FALSE); url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (UInt8 *)path, strlen(path), FALSE);
if (url == NULL) { if (url == NULL) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
@ -441,7 +439,7 @@ krb5_config_parse_file_multi (krb5_context context,
home = getenv("HOME"); home = getenv("HOME");
if (home == NULL) { if (home == NULL) {
struct passwd *pw = getpwuid(getuid()); struct passwd *pw = getpwuid(getuid());
if(pw != NULL) if(pw != NULL)
home = pw->pw_dir; home = pw->pw_dir;
} }
@ -477,7 +475,7 @@ krb5_config_parse_file_multi (krb5_context context,
return ret; return ret;
} }
#else #else
krb5_set_error_message(context, ENOENT, krb5_set_error_message(context, ENOENT,
"no support for plist configuration files"); "no support for plist configuration files");
return ENOENT; return ENOENT;
#endif #endif
@ -491,7 +489,7 @@ krb5_config_parse_file_multi (krb5_context context,
free(newfname); free(newfname);
return ret; return ret;
} }
if (newfname) if (newfname)
free(newfname); free(newfname);
fname = newfname = exp_fname; fname = newfname = exp_fname;
@ -507,7 +505,7 @@ krb5_config_parse_file_multi (krb5_context context,
free(newfname); free(newfname);
return ret; return ret;
} }
ret = krb5_config_parse_debug (&f, res, &lineno, &str); ret = krb5_config_parse_debug (&f, res, &lineno, &str);
fclose(f.f); fclose(f.f);
if (ret) { if (ret) {
@ -635,7 +633,7 @@ vget_next(krb5_context context,
const char *p = va_arg(args, const char *); const char *p = va_arg(args, const char *);
while(b != NULL) { while(b != NULL) {
if(strcmp(b->name, name) == 0) { if(strcmp(b->name, name) == 0) {
if(b->type == type && p == NULL) { if(b->type == (unsigned)type && p == NULL) {
*pointer = b; *pointer = b;
return b->u.generic; return b->u.generic;
} else if(b->type == krb5_config_list && p != NULL) { } else if(b->type == krb5_config_list && p != NULL) {
@ -675,7 +673,7 @@ _krb5_config_vget_next (krb5_context context,
/* we were called again, so just look for more entries with the /* we were called again, so just look for more entries with the
same name and type */ same name and type */
for (b = (*pointer)->next; b != NULL; b = b->next) { for (b = (*pointer)->next; b != NULL; b = b->next) {
if(strcmp(b->name, (*pointer)->name) == 0 && b->type == type) { if(strcmp(b->name, (*pointer)->name) == 0 && b->type == (unsigned)type) {
*pointer = b; *pointer = b;
return b->u.generic; return b->u.generic;
} }
@ -770,7 +768,7 @@ krb5_config_vget_list (krb5_context context,
* *
* @ingroup krb5_support * @ingroup krb5_support
*/ */
KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
krb5_config_get_string (krb5_context context, krb5_config_get_string (krb5_context context,
const krb5_config_section *c, const krb5_config_section *c,
@ -865,7 +863,7 @@ krb5_config_get_string_default (krb5_context context,
} }
static char * static char *
next_component_string(char * begin, char * delims, char **state) next_component_string(char * begin, const char * delims, char **state)
{ {
char * end; char * end;
@ -1302,11 +1300,11 @@ krb5_config_get_int (krb5_context context,
* @ingroup krb5_deprecated * @ingroup krb5_deprecated
*/ */
KRB5_DEPRECATED
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_config_parse_string_multi(krb5_context context, krb5_config_parse_string_multi(krb5_context context,
const char *string, const char *string,
krb5_config_section **res) krb5_config_section **res)
KRB5_DEPRECATED_FUNCTION("Use X instead")
{ {
const char *str; const char *str;
unsigned lineno = 0; unsigned lineno = 0;

4
src/external/heimdal/krb5/crypto-aes.c vendored
View File

@ -38,7 +38,7 @@
*/ */
static struct _krb5_key_type keytype_aes128 = { static struct _krb5_key_type keytype_aes128 = {
KEYTYPE_AES128, KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
"aes-128", "aes-128",
128, 128,
16, 16,
@ -52,7 +52,7 @@ static struct _krb5_key_type keytype_aes128 = {
}; };
static struct _krb5_key_type keytype_aes256 = { static struct _krb5_key_type keytype_aes256 = {
KEYTYPE_AES256, KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
"aes-256", "aes-256",
256, 256,
32, 32,

4
src/external/heimdal/krb5/crypto-evp.c vendored
View File

@ -98,7 +98,7 @@ _krb5_evp_encrypt_cts(krb5_context context,
{ {
size_t i, blocksize; size_t i, blocksize;
struct _krb5_evp_schedule *ctx = key->schedule->data; struct _krb5_evp_schedule *ctx = key->schedule->data;
char tmp[EVP_MAX_BLOCK_LENGTH], ivec2[EVP_MAX_BLOCK_LENGTH]; unsigned char tmp[EVP_MAX_BLOCK_LENGTH], ivec2[EVP_MAX_BLOCK_LENGTH];
EVP_CIPHER_CTX *c; EVP_CIPHER_CTX *c;
unsigned char *p; unsigned char *p;
@ -142,7 +142,7 @@ _krb5_evp_encrypt_cts(krb5_context context,
if (ivec) if (ivec)
memcpy(ivec, p, blocksize); memcpy(ivec, p, blocksize);
} else { } else {
char tmp2[EVP_MAX_BLOCK_LENGTH], tmp3[EVP_MAX_BLOCK_LENGTH]; unsigned char tmp2[EVP_MAX_BLOCK_LENGTH], tmp3[EVP_MAX_BLOCK_LENGTH];
p = data; p = data;
if (len > blocksize * 2) { if (len > blocksize * 2) {

138
src/external/heimdal/krb5/crypto.c vendored
View File

@ -31,8 +31,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#define KRB5_DEPRECATED
#include "krb5_locl.h" #include "krb5_locl.h"
struct _krb5_key_usage { struct _krb5_key_usage {
@ -53,9 +51,33 @@ static void free_key_schedule(krb5_context,
struct _krb5_key_data *, struct _krb5_key_data *,
struct _krb5_encryption_type *); struct _krb5_encryption_type *);
/************************************************************ /*
* * * Converts etype to a user readable string and sets as a side effect
************************************************************/ * the krb5_error_message containing this string. Returns
* KRB5_PROG_ETYPE_NOSUPP in not the conversion of the etype failed in
* which case the error code of the etype convesion is returned.
*/
static krb5_error_code
unsupported_enctype(krb5_context context, krb5_enctype etype)
{
krb5_error_code ret;
char *name;
ret = krb5_enctype_to_string(context, etype, &name);
if (ret)
return ret;
krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP,
N_("Encryption type %s not supported", ""),
name);
free(name);
return KRB5_PROG_ETYPE_NOSUPP;
}
/*
*
*/
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_enctype_keysize(krb5_context context, krb5_enctype_keysize(krb5_context context,
@ -64,10 +86,7 @@ krb5_enctype_keysize(krb5_context context,
{ {
struct _krb5_encryption_type *et = _krb5_find_enctype(type); struct _krb5_encryption_type *et = _krb5_find_enctype(type);
if(et == NULL) { if(et == NULL) {
krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, type);
N_("encryption type %d not supported", ""),
type);
return KRB5_PROG_ETYPE_NOSUPP;
} }
*keysize = et->keytype->size; *keysize = et->keytype->size;
return 0; return 0;
@ -80,10 +99,7 @@ krb5_enctype_keybits(krb5_context context,
{ {
struct _krb5_encryption_type *et = _krb5_find_enctype(type); struct _krb5_encryption_type *et = _krb5_find_enctype(type);
if(et == NULL) { if(et == NULL) {
krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, type);
"encryption type %d not supported",
type);
return KRB5_PROG_ETYPE_NOSUPP;
} }
*keybits = et->keytype->bits; *keybits = et->keytype->bits;
return 0; return 0;
@ -97,10 +113,7 @@ krb5_generate_random_keyblock(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
struct _krb5_encryption_type *et = _krb5_find_enctype(type); struct _krb5_encryption_type *et = _krb5_find_enctype(type);
if(et == NULL) { if(et == NULL) {
krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, type);
N_("encryption type %d not supported", ""),
type);
return KRB5_PROG_ETYPE_NOSUPP;
} }
ret = krb5_data_alloc(&key->keyvalue, et->keytype->size); ret = krb5_data_alloc(&key->keyvalue, et->keytype->size);
if(ret) if(ret)
@ -123,10 +136,8 @@ _key_schedule(krb5_context context,
struct _krb5_key_type *kt; struct _krb5_key_type *kt;
if (et == NULL) { if (et == NULL) {
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context,
N_("encryption type %d not supported", ""), key->key->keytype);
key->key->keytype);
return KRB5_PROG_ETYPE_NOSUPP;
} }
kt = et->keytype; kt = et->keytype;
@ -180,7 +191,7 @@ _krb5_internal_hmac(krb5_context context,
unsigned char *ipad, *opad; unsigned char *ipad, *opad;
unsigned char *key; unsigned char *key;
size_t key_len; size_t key_len;
int i; size_t i;
ipad = malloc(cm->blocksize + len); ipad = malloc(cm->blocksize + len);
if (ipad == NULL) if (ipad == NULL)
@ -311,7 +322,7 @@ get_checksum_key(krb5_context context,
if(ct->flags & F_DERIVED) if(ct->flags & F_DERIVED)
ret = _get_derived_key(context, crypto, usage, key); ret = _get_derived_key(context, crypto, usage, key);
else if(ct->flags & F_VARIANT) { else if(ct->flags & F_VARIANT) {
int i; size_t i;
*key = _new_derived_key(crypto, 0xff/* KRB5_KU_RFC1510_VARIANT */); *key = _new_derived_key(crypto, 0xff/* KRB5_KU_RFC1510_VARIANT */);
if(*key == NULL) { if(*key == NULL) {
@ -686,33 +697,39 @@ krb5_enctype_to_keytype(krb5_context context,
{ {
struct _krb5_encryption_type *e = _krb5_find_enctype(etype); struct _krb5_encryption_type *e = _krb5_find_enctype(etype);
if(e == NULL) { if(e == NULL) {
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, etype);
N_("encryption type %d not supported", ""),
etype);
return KRB5_PROG_ETYPE_NOSUPP;
} }
*keytype = e->keytype->type; /* XXX */ *keytype = e->keytype->type; /* XXX */
return 0; return 0;
} }
/**
* Check if a enctype is valid, return 0 if it is.
*
* @param context Kerberos context
* @param etype enctype to check if its valid or not
*
* @return Return an error code for an failure or 0 on success (enctype valid).
* @ingroup krb5_crypto
*/
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_enctype_valid(krb5_context context, krb5_enctype_valid(krb5_context context,
krb5_enctype etype) krb5_enctype etype)
{ {
struct _krb5_encryption_type *e = _krb5_find_enctype(etype); struct _krb5_encryption_type *e = _krb5_find_enctype(etype);
if(e && (e->flags & F_DISABLED) == 0)
return 0;
if (context == NULL)
return KRB5_PROG_ETYPE_NOSUPP;
if(e == NULL) { if(e == NULL) {
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, etype);
N_("encryption type %d not supported", ""),
etype);
return KRB5_PROG_ETYPE_NOSUPP;
} }
if (e->flags & F_DISABLED) { /* Must be (e->flags & F_DISABLED) */
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP,
N_("encryption type %s is disabled", ""), N_("encryption type %s is disabled", ""),
e->name); e->name);
return KRB5_PROG_ETYPE_NOSUPP; return KRB5_PROG_ETYPE_NOSUPP;
}
return 0;
} }
/** /**
@ -1160,9 +1177,9 @@ decrypt_internal_special(krb5_context context,
} }
static krb5_crypto_iov * static krb5_crypto_iov *
find_iv(krb5_crypto_iov *data, int num_data, int type) find_iv(krb5_crypto_iov *data, size_t num_data, unsigned type)
{ {
int i; size_t i;
for (i = 0; i < num_data; i++) for (i = 0; i < num_data; i++)
if (data[i].flags == type) if (data[i].flags == type)
return &data[i]; return &data[i];
@ -1403,11 +1420,6 @@ krb5_decrypt_iov_ivec(krb5_context context,
struct _krb5_encryption_type *et = crypto->et; struct _krb5_encryption_type *et = crypto->et;
krb5_crypto_iov *tiv, *hiv; krb5_crypto_iov *tiv, *hiv;
if (num_data < 0) {
krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL;
}
if(!derived_crypto(context, crypto)) { if(!derived_crypto(context, crypto)) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL; return KRB5_CRYPTO_INTERNAL;
@ -1545,15 +1557,10 @@ krb5_create_checksum_iov(krb5_context context,
Checksum cksum; Checksum cksum;
krb5_crypto_iov *civ; krb5_crypto_iov *civ;
krb5_error_code ret; krb5_error_code ret;
int i; size_t i;
size_t len; size_t len;
char *p, *q; char *p, *q;
if (num_data < 0) {
krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL;
}
if(!derived_crypto(context, crypto)) { if(!derived_crypto(context, crypto)) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL; return KRB5_CRYPTO_INTERNAL;
@ -1629,15 +1636,10 @@ krb5_verify_checksum_iov(krb5_context context,
Checksum cksum; Checksum cksum;
krb5_crypto_iov *civ; krb5_crypto_iov *civ;
krb5_error_code ret; krb5_error_code ret;
int i; size_t i;
size_t len; size_t len;
char *p, *q; char *p, *q;
if (num_data < 0) {
krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL;
}
if(!derived_crypto(context, crypto)) { if(!derived_crypto(context, crypto)) {
krb5_clear_error_message(context); krb5_clear_error_message(context);
return KRB5_CRYPTO_INTERNAL; return KRB5_CRYPTO_INTERNAL;
@ -1730,7 +1732,7 @@ krb5_crypto_length_iov(krb5_context context,
unsigned int num_data) unsigned int num_data)
{ {
krb5_error_code ret; krb5_error_code ret;
int i; size_t i;
for (i = 0; i < num_data; i++) { for (i = 0; i < num_data; i++) {
ret = krb5_crypto_length(context, crypto, ret = krb5_crypto_length(context, crypto,
@ -1903,11 +1905,11 @@ _krb5_derive_key(krb5_context context,
/* XXX keytype dependent post-processing */ /* XXX keytype dependent post-processing */
switch(kt->type) { switch(kt->type) {
case KEYTYPE_DES3: case KRB5_ENCTYPE_OLD_DES3_CBC_SHA1:
_krb5_DES3_random_to_key(context, key->key, k, nblocks * et->blocksize); _krb5_DES3_random_to_key(context, key->key, k, nblocks * et->blocksize);
break; break;
case KEYTYPE_AES128: case KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96:
case KEYTYPE_AES256: case KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96:
memcpy(key->key->keyvalue.data, k, key->key->keyvalue.length); memcpy(key->key->keyvalue.data, k, key->key->keyvalue.length);
break; break;
default: default:
@ -1959,10 +1961,7 @@ krb5_derive_key(krb5_context context,
et = _krb5_find_enctype (etype); et = _krb5_find_enctype (etype);
if (et == NULL) { if (et == NULL) {
krb5_set_error_message(context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype (context, etype);
N_("encryption type %d not supported", ""),
etype);
return KRB5_PROG_ETYPE_NOSUPP;
} }
ret = krb5_copy_keyblock(context, key, &d.key); ret = krb5_copy_keyblock(context, key, &d.key);
@ -2040,10 +2039,7 @@ krb5_crypto_init(krb5_context context,
if((*crypto)->et == NULL || ((*crypto)->et->flags & F_DISABLED)) { if((*crypto)->et == NULL || ((*crypto)->et->flags & F_DISABLED)) {
free(*crypto); free(*crypto);
*crypto = NULL; *crypto = NULL;
krb5_set_error_message (context, KRB5_PROG_ETYPE_NOSUPP, return unsupported_enctype(context, etype);
N_("encryption type %d not supported", ""),
etype);
return KRB5_PROG_ETYPE_NOSUPP;
} }
if((*crypto)->et->keytype->size != key->keyvalue.length) { if((*crypto)->et->keytype->size != key->keyvalue.length) {
free(*crypto); free(*crypto);
@ -2593,12 +2589,12 @@ krb5_crypto_fx_cf2(krb5_context context,
* @ingroup krb5_deprecated * @ingroup krb5_deprecated
*/ */
KRB5_DEPRECATED
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_keytype_to_enctypes (krb5_context context, krb5_keytype_to_enctypes (krb5_context context,
krb5_keytype keytype, krb5_keytype keytype,
unsigned *len, unsigned *len,
krb5_enctype **val) krb5_enctype **val)
KRB5_DEPRECATED_FUNCTION("Use X instead")
{ {
int i; int i;
unsigned n = 0; unsigned n = 0;
@ -2640,11 +2636,11 @@ krb5_keytype_to_enctypes (krb5_context context,
*/ */
/* if two enctypes have compatible keys */ /* if two enctypes have compatible keys */
KRB5_DEPRECATED
KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
krb5_enctypes_compatible_keys(krb5_context context, krb5_enctypes_compatible_keys(krb5_context context,
krb5_enctype etype1, krb5_enctype etype1,
krb5_enctype etype2) krb5_enctype etype2)
KRB5_DEPRECATED_FUNCTION("Use X instead")
{ {
struct _krb5_encryption_type *e1 = _krb5_find_enctype(etype1); struct _krb5_encryption_type *e1 = _krb5_find_enctype(etype1);
struct _krb5_encryption_type *e2 = _krb5_find_enctype(etype2); struct _krb5_encryption_type *e2 = _krb5_find_enctype(etype2);

2
src/external/heimdal/krb5/crypto.h vendored
View File

@ -69,7 +69,7 @@ struct salt_type {
}; };
struct _krb5_key_type { struct _krb5_key_type {
krb5_keytype type; /* XXX */ krb5_enctype type;
const char *name; const char *name;
size_t bits; size_t bits;
size_t size; size_t size;

2
src/external/heimdal/krb5/keyblock.c vendored
View File

@ -65,7 +65,7 @@ krb5_free_keyblock_contents(krb5_context context,
if (keyblock->keyvalue.data != NULL) if (keyblock->keyvalue.data != NULL)
memset(keyblock->keyvalue.data, 0, keyblock->keyvalue.length); memset(keyblock->keyvalue.data, 0, keyblock->keyvalue.length);
krb5_data_free (&keyblock->keyvalue); krb5_data_free (&keyblock->keyvalue);
keyblock->keytype = ENCTYPE_NULL; keyblock->keytype = KRB5_ENCTYPE_NULL;
} }
} }

2
src/external/heimdal/krb5/store-int.c vendored
View File

@ -50,7 +50,7 @@ _krb5_get_int(void *buffer, unsigned long *value, size_t size)
{ {
unsigned char *p = buffer; unsigned char *p = buffer;
unsigned long v = 0; unsigned long v = 0;
int i; size_t i;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
v = (v << 8) + p[i]; v = (v << 8) + p[i];
*value = v; *value = v;

3
src/external/heimdal/roken/hex.c vendored
View File

@ -37,7 +37,7 @@
#include <ctype.h> #include <ctype.h>
#include "hex.h" #include "hex.h"
const static char hexchar[] = "0123456789ABCDEF"; static const char hexchar[16] = "0123456789ABCDEF";
static int static int
pos(char c) pos(char c)
@ -93,7 +93,6 @@ hex_decode(const char *str, void *data, size_t len)
if ((l/2) + (l&1) > len) if ((l/2) + (l&1) > len)
return -1; return -1;
i = 0;
if (l & 1) { if (l & 1) {
p[0] = pos(str[0]); p[0] = pos(str[0]);
str++; str++;

6
src/external/heimdal/roken/roken.h.in vendored
View File

@ -105,6 +105,10 @@ typedef int rk_socket_t;
#endif #endif
#ifndef IN_LOOPBACKNET
#define IN_LOOPBACKNET 127
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
/* Declarations for Microsoft Visual C runtime on Windows */ /* Declarations for Microsoft Visual C runtime on Windows */
@ -759,7 +763,7 @@ struct winsize {
}; };
#endif #endif
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL get_window_size(int fd, struct winsize *); ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL get_window_size(int fd, int *, int *);
#ifndef HAVE_VSYSLOG #ifndef HAVE_VSYSLOG
#define vsyslog rk_vsyslog #define vsyslog rk_vsyslog