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

(usage2arcfour): don't abort if the usage is unknown

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10953 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-04-29 16:31:54 +00:00
parent 58168e2684
commit 7ec3e75760
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/krb5/crypto.c
View File

@@ -1867,29 +1867,35 @@ ARCFOUR_subdecrypt(krb5_context context,
* draft-brezak-win2k-krb-rc4-hmac-03.txt * draft-brezak-win2k-krb-rc4-hmac-03.txt
*/ */
static int static krb5_error_code
usage2arcfour (int usage) usage2arcfour (krb5_context context, int *usage)
{ {
switch (usage) { switch (*usage) {
case KRB5_KU_PA_ENC_TIMESTAMP : case KRB5_KU_PA_ENC_TIMESTAMP :
return 1; *usage = 1;
return 0;
case KRB5_KU_TICKET : case KRB5_KU_TICKET :
return 8; *usage = 8;
case KRB5_KU_AS_REP_ENC_PART : case KRB5_KU_AS_REP_ENC_PART :
return 8; *usage = 8;
return 0;
case KRB5_KU_TGS_REQ_AUTH_DAT_SESSION : case KRB5_KU_TGS_REQ_AUTH_DAT_SESSION :
case KRB5_KU_TGS_REQ_AUTH_DAT_SUBKEY : case KRB5_KU_TGS_REQ_AUTH_DAT_SUBKEY :
case KRB5_KU_TGS_REQ_AUTH_CKSUM : case KRB5_KU_TGS_REQ_AUTH_CKSUM :
case KRB5_KU_TGS_REQ_AUTH : case KRB5_KU_TGS_REQ_AUTH :
return 7; *usage = 7;
return 0;
case KRB5_KU_TGS_REP_ENC_PART_SESSION : case KRB5_KU_TGS_REP_ENC_PART_SESSION :
case KRB5_KU_TGS_REP_ENC_PART_SUB_KEY : case KRB5_KU_TGS_REP_ENC_PART_SUB_KEY :
return 8; *usage = 8;
return 0;
case KRB5_KU_AP_REQ_AUTH_CKSUM : case KRB5_KU_AP_REQ_AUTH_CKSUM :
case KRB5_KU_AP_REQ_AUTH : case KRB5_KU_AP_REQ_AUTH :
case KRB5_KU_AP_REQ_ENC_PART : case KRB5_KU_AP_REQ_ENC_PART :
return 11; *usage = 11;
return 0;
case KRB5_KU_KRB_PRIV : case KRB5_KU_KRB_PRIV :
*usage = 0;
return 0; return 0;
case KRB5_KU_KRB_CRED : case KRB5_KU_KRB_CRED :
case KRB5_KU_KRB_SAFE_CKSUM : case KRB5_KU_KRB_SAFE_CKSUM :
@@ -1903,7 +1909,8 @@ usage2arcfour (int usage)
case KRB5_KU_USAGE_SIGN : case KRB5_KU_USAGE_SIGN :
case KRB5_KU_USAGE_SEQ : case KRB5_KU_USAGE_SEQ :
default : default :
abort (); krb5_set_error_string(context, "unknown arcfour usage type %d", *usage);
return KRB5_PROG_ETYPE_NOSUPP;
} }
} }
@@ -1916,7 +1923,9 @@ ARCFOUR_encrypt(krb5_context context,
int usage, int usage,
void *ivec) void *ivec)
{ {
usage = usage2arcfour (usage); krb5_error_code ret;
if((ret = usage2arcfour (context, &usage)) != 0)
return ret;
if (encrypt) if (encrypt)
return ARCFOUR_subencrypt (context, key, data, len, usage, ivec); return ARCFOUR_subencrypt (context, key, data, len, usage, ivec);