oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

n_fold -> _krb5_n_fold

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5776 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-03-27 16:48:42 +00:00
parent 3650f5cd0d
commit 0eeee9f3fc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/krb5/crypto.c
View File

@@ -330,7 +330,7 @@ DES3_string_to_key(krb5_context context,
des_key_schedule s[3]; des_key_schedule s[3];
int i; int i;
n_fold(str, len, tmp, 24); _krb5_n_fold(str, len, tmp, 24);
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
memcpy(keys + i, tmp + i * 8, sizeof(keys[i])); memcpy(keys + i, tmp + i * 8, sizeof(keys[i]));
@@ -1938,7 +1938,7 @@ derive_key(krb5_context context,
k = malloc(nblocks * et->blocksize); k = malloc(nblocks * et->blocksize);
if(k == NULL) if(k == NULL)
return ENOMEM; return ENOMEM;
n_fold(constant, len, k, et->blocksize); _krb5_n_fold(constant, len, k, et->blocksize);
for(i = 0; i < nblocks; i++) { for(i = 0; i < nblocks; i++) {
if(i > 0) if(i > 0)
memcpy(k + i * et->blocksize, memcpy(k + i * et->blocksize,
@@ -1955,7 +1955,7 @@ derive_key(krb5_context context,
k = malloc((kt->bits + 7) / 8); k = malloc((kt->bits + 7) / 8);
if(k == NULL) if(k == NULL)
return ENOMEM; return ENOMEM;
n_fold(c, len, k, kt->bits); _krb5_n_fold(c, len, k, kt->bits);
free(c); free(c);
} }
@@ -2088,7 +2088,7 @@ krb5_string_to_key_derived(krb5_context context,
ALLOC(kd.key, 1); ALLOC(kd.key, 1);
kd.key->keytype = etype; kd.key->keytype = etype;
krb5_data_alloc(&kd.key->keyvalue, et->keytype->size); krb5_data_alloc(&kd.key->keyvalue, et->keytype->size);
n_fold(str, len, kd.key->keyvalue.data, kd.key->keyvalue.length); _krb5_n_fold(str, len, kd.key->keyvalue.data, kd.key->keyvalue.length);
ret = derive_key(context, ret = derive_key(context,
et, et,
&kd, &kd,

2
lib/krb5/n-fold.c
View File

@@ -92,7 +92,7 @@ add1(unsigned char *a, unsigned char *b, size_t len)
} }
void void
n_fold(const void *str, size_t len, void *key, size_t size) _krb5_n_fold(const void *str, size_t len, void *key, size_t size)
{ {
/* if len < size we need at most N * len bytes, ie < 2 * size; /* if len < size we need at most N * len bytes, ie < 2 * size;
if len > size we need at most 2 * len */ if len > size we need at most 2 * len */