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

partly unify enctype/keytype since there is only enctypes

Browse Source
This commit is contained in:
Love Hörnquist Åstrand
2011-07-24 14:03:08 -07:00
parent 16eabf8e4c
commit f60ec15834
14 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gssapi/krb5/arcfour.c
View File

@@ -86,7 +86,7 @@ arcfour_mic_key(krb5_context context, krb5_keyblock *key,
cksum_k5.checksum.data = k5_data;
cksum_k5.checksum.length = sizeof(k5_data);
if (key->keytype == KEYTYPE_ARCFOUR_56) {
if (key->keytype == ENCTYPE_ARCFOUR_HMAC_MD5_56) {
char L40[14] = "fortybits";
memcpy(L40 + 10, T, sizeof(T));
@@ -100,7 +100,7 @@ arcfour_mic_key(krb5_context context, krb5_keyblock *key,
if (ret)
return ret;
key5.keytype = KEYTYPE_ARCFOUR;
key5.keytype = ENCTYPE_ARCFOUR_HMAC_MD5;
key5.keyvalue = cksum_k5.checksum;
cksum_k6.checksum.data = key6_data;

4
lib/gssapi/krb5/wrap.c
View File

@@ -174,8 +174,8 @@ _gsskrb5_wrap_size_limit (
ret = GSS_S_FAILURE;
#endif
break;
case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
case ENCTYPE_ARCFOUR_HMAC_MD5:
case ENCTYPE_ARCFOUR_HMAC_MD5_56:
ret = _gssapi_wrap_size_arcfour(minor_status, ctx, context,
conf_req_flag, qop_req,
req_output_size, max_input_size, key);