From 5b6b06fe998def1a2dcb2fe9c80ae3945ec6a1e9 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 13 Oct 1997 16:30:28 +0000 Subject: [PATCH] cleanup default_etypes git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3589 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/krb5/context.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/krb5/context.c b/lib/krb5/context.c index 959a73afe..613bfb513 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -104,18 +104,19 @@ valid_etype(krb5_context context, krb5_enctype e) static krb5_error_code default_etypes(krb5_enctype **etype) { - krb5_enctype *p; - ALLOC(p, 6); - if(!p) - return ENOMEM; - *etype = p; - *p++ = ETYPE_DES3_CBC_SHA1; - *p++ = ETYPE_DES3_CBC_MD5; - *p++ = ETYPE_DES_CBC_MD5; - *p++ = ETYPE_DES_CBC_MD4; - *p++ = ETYPE_DES_CBC_CRC; - *p++ = 0; - return 0; + krb5_enctype p[] = { + ETYPE_DES3_CBC_SHA1, + ETYPE_DES3_CBC_MD5, + ETYPE_DES_CBC_MD5, + ETYPE_DES_CBC_MD4, + ETYPE_DES_CBC_CRC, + 0 + }; + *etype = malloc(sizeof(p)); + if(*etype == NULL) + return ENOMEM; + memcpy(*etype, p, sizeof(p)); + return 0; } krb5_error_code