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

(krb5_keytype_to_etypes): zero terminate etypes

Browse Source 
(em): sort entries


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5232 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-11-22 10:39:56 +00:00
parent 5b4c4110a5
commit 1bf11c37cf
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/krb5/encrypt.c
View File

@@ -100,16 +100,16 @@ DES3_encrypt_null_ivec(void *p, size_t len,
} }
static struct encryption_type em [] = { static struct encryption_type em [] = {
{ ETYPE_DES_CBC_CRC, 8, 8, DES_encrypt_key_ivec,
KEYTYPE_DES, CKSUMTYPE_CRC32, "des-cbc-crc" },
{ ETYPE_DES_CBC_MD4, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD4, "des-cbc-md4" },
{ ETYPE_DES_CBC_MD5, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD5, "des-cbc-md5" },
{ ETYPE_DES3_CBC_MD5, 8, 8, DES3_encrypt_null_ivec,
KEYTYPE_DES3, CKSUMTYPE_RSA_MD5, "des3-cbc-md5" },
{ ETYPE_DES3_CBC_SHA1, 8, 8, DES3_encrypt_null_ivec, { ETYPE_DES3_CBC_SHA1, 8, 8, DES3_encrypt_null_ivec,
KEYTYPE_DES3, CKSUMTYPE_SHA1, "des3-cbc-sha1" }, KEYTYPE_DES3, CKSUMTYPE_SHA1, "des3-cbc-sha1" },
{ ETYPE_DES3_CBC_MD5, 8, 8, DES3_encrypt_null_ivec,
KEYTYPE_DES3, CKSUMTYPE_RSA_MD5, "des3-cbc-md5" },
{ ETYPE_DES_CBC_MD5, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD5, "des-cbc-md5" },
{ ETYPE_DES_CBC_MD4, 8, 8, DES_encrypt_null_ivec,
KEYTYPE_DES, CKSUMTYPE_RSA_MD4, "des-cbc-md4" },
{ ETYPE_DES_CBC_CRC, 8, 8, DES_encrypt_key_ivec,
KEYTYPE_DES, CKSUMTYPE_CRC32, "des-cbc-crc" },
{ ETYPE_NULL, 1, 0, NULL_encrypt, KEYTYPE_NULL, CKSUMTYPE_NONE, "null" }, { ETYPE_NULL, 1, 0, NULL_encrypt, KEYTYPE_NULL, CKSUMTYPE_NONE, "null" },
}; };
@@ -167,23 +167,24 @@ krb5_keytype_to_etypes(krb5_context context,
krb5_keytype keytype, krb5_keytype keytype,
krb5_enctype **etypes) krb5_enctype **etypes)
{ {
krb5_enctype *tmp; krb5_enctype *tmp, *tmp2;
struct encryption_type *e; struct encryption_type *e;
int i; int i;
*etypes = malloc((num_etypes + 1) * sizeof(*etypes)); tmp = malloc((num_etypes + 1) * sizeof(*tmp));
if (*etypes == NULL) if (tmp == NULL)
return ENOMEM; return ENOMEM;
i = 0; i = 0;
for (e = em; e < em + num_etypes; ++e) for (e = em; e < em + num_etypes; ++e)
if (e->keytype == keytype) if (e->keytype == keytype)
(*etypes)[i++] = e->type; tmp[i++] = e->type;
tmp = realloc (*etypes, i * sizeof(*etypes)); tmp[i++] = 0;
if (tmp == NULL) { tmp2 = realloc (tmp, i * sizeof(*tmp));
free (*etypes); if (tmp2 == NULL) {
free (tmp);
return ENOMEM; return ENOMEM;
} }
*etypes = tmp; *etypes = tmp2;
return 0; return 0;
} }