From ebc3e1a658e7dd8a439ffbaa4fd10911784ec038 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 5 Jan 2005 02:52:12 +0000 Subject: [PATCH] support KEYTYPE_ARCFOUR_56 git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14460 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/ChangeLog | 17 ++++++++++++----- lib/gssapi/get_mic.c | 1 + lib/gssapi/krb5/ChangeLog | 17 ++++++++++++----- lib/gssapi/krb5/get_mic.c | 1 + lib/gssapi/krb5/unwrap.c | 1 + lib/gssapi/krb5/verify_mic.c | 1 + lib/gssapi/krb5/wrap.c | 2 ++ lib/gssapi/unwrap.c | 1 + lib/gssapi/verify_mic.c | 1 + lib/gssapi/wrap.c | 2 ++ 10 files changed, 34 insertions(+), 10 deletions(-) diff --git a/lib/gssapi/ChangeLog b/lib/gssapi/ChangeLog index a6418ae03..b94629e5d 100644 --- a/lib/gssapi/ChangeLog +++ b/lib/gssapi/ChangeLog @@ -8,15 +8,22 @@ * acquire_cred.c: plug leak * 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 Åstrand diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c index 64f7db7b7..5ddb6a027 100644 --- a/lib/gssapi/get_mic.c +++ b/lib/gssapi/get_mic.c @@ -288,6 +288,7 @@ OM_uint32 gss_get_mic message_buffer, message_token, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req, message_buffer, message_token, key); break; diff --git a/lib/gssapi/krb5/ChangeLog b/lib/gssapi/krb5/ChangeLog index a6418ae03..b94629e5d 100644 --- a/lib/gssapi/krb5/ChangeLog +++ b/lib/gssapi/krb5/ChangeLog @@ -8,15 +8,22 @@ * acquire_cred.c: plug leak * 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 Åstrand diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c index 64f7db7b7..5ddb6a027 100644 --- a/lib/gssapi/krb5/get_mic.c +++ b/lib/gssapi/krb5/get_mic.c @@ -288,6 +288,7 @@ OM_uint32 gss_get_mic message_buffer, message_token, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_get_mic_arcfour (minor_status, context_handle, qop_req, message_buffer, message_token, key); break; diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c index cf82141e9..3984fa5f8 100644 --- a/lib/gssapi/krb5/unwrap.c +++ b/lib/gssapi/krb5/unwrap.c @@ -397,6 +397,7 @@ OM_uint32 gss_unwrap conf_state, qop_state, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_unwrap_arcfour (minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state, key); diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c index 850604aaf..6708d97c2 100644 --- a/lib/gssapi/krb5/verify_mic.c +++ b/lib/gssapi/krb5/verify_mic.c @@ -298,6 +298,7 @@ gss_verify_mic_internal type); break; case KEYTYPE_ARCFOUR : + case KEYTYPE_ARCFOUR_56 : ret = _gssapi_verify_mic_arcfour (minor_status, context_handle, message_buffer, token_buffer, qop_state, key, type); diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c index bf46171d0..80801926e 100644 --- a/lib/gssapi/krb5/wrap.c +++ b/lib/gssapi/krb5/wrap.c @@ -127,6 +127,7 @@ gss_wrap_size_limit ( switch (keytype) { case KEYTYPE_DES : case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = sub_wrap_size(req_output_size, max_input_size, 8, 22); break; case KEYTYPE_DES3 : @@ -475,6 +476,7 @@ OM_uint32 gss_wrap output_message_buffer, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer, key); diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c index cf82141e9..3984fa5f8 100644 --- a/lib/gssapi/unwrap.c +++ b/lib/gssapi/unwrap.c @@ -397,6 +397,7 @@ OM_uint32 gss_unwrap conf_state, qop_state, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_unwrap_arcfour (minor_status, context_handle, input_message_buffer, output_message_buffer, conf_state, qop_state, key); diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c index 850604aaf..6708d97c2 100644 --- a/lib/gssapi/verify_mic.c +++ b/lib/gssapi/verify_mic.c @@ -298,6 +298,7 @@ gss_verify_mic_internal type); break; case KEYTYPE_ARCFOUR : + case KEYTYPE_ARCFOUR_56 : ret = _gssapi_verify_mic_arcfour (minor_status, context_handle, message_buffer, token_buffer, qop_state, key, type); diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c index bf46171d0..80801926e 100644 --- a/lib/gssapi/wrap.c +++ b/lib/gssapi/wrap.c @@ -127,6 +127,7 @@ gss_wrap_size_limit ( switch (keytype) { case KEYTYPE_DES : case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = sub_wrap_size(req_output_size, max_input_size, 8, 22); break; case KEYTYPE_DES3 : @@ -475,6 +476,7 @@ OM_uint32 gss_wrap output_message_buffer, key); break; case KEYTYPE_ARCFOUR: + case KEYTYPE_ARCFOUR_56: ret = _gssapi_wrap_arcfour (minor_status, context_handle, conf_req_flag, qop_req, input_message_buffer, conf_state, output_message_buffer, key);