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

support KEYTYPE_ARCFOUR_56

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14460 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Luke Howard
2005-01-05 02:52:12 +00:00
parent cff2c9fbe3
commit ebc3e1a658
10 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/gssapi/ChangeLog
View File

@@ -8,15 +8,22 @@
* acquire_cred.c: plug leak * acquire_cred.c: plug leak
* get_mic.c: use gss_krb5_get_subkey() instead * get_mic.c: use gss_krb5_get_subkey() instead
of gss_krb5_get_{local,remote}key() of gss_krb5_get_{local,remote}key(), support
KEYTYPE_ARCFOUR_56
* gssapi_local.c: use gss_krb5_get_subkey() * gssapi_local.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* unwrap.c: use gss_krb5_get_subkey() * import_sec_context.c: plug leak
* verify_mic.c: use gss_krb5_get_subkey() * unwrap.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* wrap.c: use gss_krb5_get_subkey() * verify_mic.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* wrap.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
2004-11-30 Love H<>rnquist <20>strand <lha@it.su.se> 2004-11-30 Love H<>rnquist <20>strand <lha@it.su.se>

1
lib/gssapi/get_mic.c
View File

@@ -288,6 +288,7 @@ OM_uint32 gss_get_mic
message_buffer, message_token, key); message_buffer, message_token, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req, ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req,
message_buffer, message_token, key); message_buffer, message_token, key);
break; break;

17
lib/gssapi/krb5/ChangeLog
View File

@@ -8,15 +8,22 @@
* acquire_cred.c: plug leak * acquire_cred.c: plug leak
* get_mic.c: use gss_krb5_get_subkey() instead * get_mic.c: use gss_krb5_get_subkey() instead
of gss_krb5_get_{local,remote}key() of gss_krb5_get_{local,remote}key(), support
KEYTYPE_ARCFOUR_56
* gssapi_local.c: use gss_krb5_get_subkey() * gssapi_local.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* unwrap.c: use gss_krb5_get_subkey() * import_sec_context.c: plug leak
* verify_mic.c: use gss_krb5_get_subkey() * unwrap.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* wrap.c: use gss_krb5_get_subkey() * verify_mic.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
* wrap.c: use gss_krb5_get_subkey(),
support KEYTYPE_ARCFOUR_56
2004-11-30 Love H<>rnquist <20>strand <lha@it.su.se> 2004-11-30 Love H<>rnquist <20>strand <lha@it.su.se>

1
lib/gssapi/krb5/get_mic.c
View File

@@ -288,6 +288,7 @@ OM_uint32 gss_get_mic
message_buffer, message_token, key); message_buffer, message_token, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req, ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req,
message_buffer, message_token, key); message_buffer, message_token, key);
break; break;

1
lib/gssapi/krb5/unwrap.c
View File

@@ -397,6 +397,7 @@ OM_uint32 gss_unwrap
conf_state, qop_state, key); conf_state, qop_state, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_unwrap_arcfour (minor_status, context_handle, ret = _gssapi_unwrap_arcfour (minor_status, context_handle,
input_message_buffer, output_message_buffer, input_message_buffer, output_message_buffer,
conf_state, qop_state, key); conf_state, qop_state, key);

1
lib/gssapi/krb5/verify_mic.c
View File

@@ -298,6 +298,7 @@ gss_verify_mic_internal
type); type);
break; break;
case KEYTYPE_ARCFOUR : case KEYTYPE_ARCFOUR :
case KEYTYPE_ARCFOUR_56 :
ret = _gssapi_verify_mic_arcfour (minor_status, context_handle, ret = _gssapi_verify_mic_arcfour (minor_status, context_handle,
message_buffer, token_buffer, message_buffer, token_buffer,
qop_state, key, type); qop_state, key, type);

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

@@ -127,6 +127,7 @@ gss_wrap_size_limit (
switch (keytype) { switch (keytype) {
case KEYTYPE_DES : case KEYTYPE_DES :
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = sub_wrap_size(req_output_size, max_input_size, 8, 22); ret = sub_wrap_size(req_output_size, max_input_size, 8, 22);
break; break;
case KEYTYPE_DES3 : case KEYTYPE_DES3 :
@@ -475,6 +476,7 @@ OM_uint32 gss_wrap
output_message_buffer, key); output_message_buffer, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag, ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag,
qop_req, input_message_buffer, conf_state, qop_req, input_message_buffer, conf_state,
output_message_buffer, key); output_message_buffer, key);

1
lib/gssapi/unwrap.c
View File

@@ -397,6 +397,7 @@ OM_uint32 gss_unwrap
conf_state, qop_state, key); conf_state, qop_state, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_unwrap_arcfour (minor_status, context_handle, ret = _gssapi_unwrap_arcfour (minor_status, context_handle,
input_message_buffer, output_message_buffer, input_message_buffer, output_message_buffer,
conf_state, qop_state, key); conf_state, qop_state, key);

1
lib/gssapi/verify_mic.c
View File

@@ -298,6 +298,7 @@ gss_verify_mic_internal
type); type);
break; break;
case KEYTYPE_ARCFOUR : case KEYTYPE_ARCFOUR :
case KEYTYPE_ARCFOUR_56 :
ret = _gssapi_verify_mic_arcfour (minor_status, context_handle, ret = _gssapi_verify_mic_arcfour (minor_status, context_handle,
message_buffer, token_buffer, message_buffer, token_buffer,
qop_state, key, type); qop_state, key, type);

2
lib/gssapi/wrap.c
View File

@@ -127,6 +127,7 @@ gss_wrap_size_limit (
switch (keytype) { switch (keytype) {
case KEYTYPE_DES : case KEYTYPE_DES :
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = sub_wrap_size(req_output_size, max_input_size, 8, 22); ret = sub_wrap_size(req_output_size, max_input_size, 8, 22);
break; break;
case KEYTYPE_DES3 : case KEYTYPE_DES3 :
@@ -475,6 +476,7 @@ OM_uint32 gss_wrap
output_message_buffer, key); output_message_buffer, key);
break; break;
case KEYTYPE_ARCFOUR: case KEYTYPE_ARCFOUR:
case KEYTYPE_ARCFOUR_56:
ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag, ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag,
qop_req, input_message_buffer, conf_state, qop_req, input_message_buffer, conf_state,
output_message_buffer, key); output_message_buffer, key);