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

make sure minor_status get set

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11763 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-03-16 17:57:48 +00:00
parent 19d67f3356
commit cc950657f5
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -109,6 +109,7 @@ gss_wrap_size_limit (
break; break;
} }
krb5_free_keyblock (gssapi_krb5_context, key); krb5_free_keyblock (gssapi_krb5_context, key);
*minor_status = 0;
return ret; return ret;
} }
@@ -141,8 +142,10 @@ wrap_des
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) if (output_message_buffer->value == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
p = gssapi_krb5_make_header(output_message_buffer->value, p = gssapi_krb5_make_header(output_message_buffer->value,
len, len,
@@ -228,6 +231,7 @@ wrap_des
} }
if(conf_state != NULL) if(conf_state != NULL)
*conf_state = conf_req_flag; *conf_state = conf_req_flag;
*minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
@@ -259,8 +263,10 @@ wrap_des3
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) if (output_message_buffer->value == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
p = gssapi_krb5_make_header(output_message_buffer->value, p = gssapi_krb5_make_header(output_message_buffer->value,
len, len,
@@ -395,6 +401,7 @@ wrap_des3
} }
if(conf_state != NULL) if(conf_state != NULL)
*conf_state = conf_req_flag; *conf_state = conf_req_flag;
*minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }

13
lib/gssapi/wrap.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -109,6 +109,7 @@ gss_wrap_size_limit (
break; break;
} }
krb5_free_keyblock (gssapi_krb5_context, key); krb5_free_keyblock (gssapi_krb5_context, key);
*minor_status = 0;
return ret; return ret;
} }
@@ -141,8 +142,10 @@ wrap_des
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) if (output_message_buffer->value == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
p = gssapi_krb5_make_header(output_message_buffer->value, p = gssapi_krb5_make_header(output_message_buffer->value,
len, len,
@@ -228,6 +231,7 @@ wrap_des
} }
if(conf_state != NULL) if(conf_state != NULL)
*conf_state = conf_req_flag; *conf_state = conf_req_flag;
*minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
@@ -259,8 +263,10 @@ wrap_des3
output_message_buffer->length = total_len; output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len); output_message_buffer->value = malloc (total_len);
if (output_message_buffer->value == NULL) if (output_message_buffer->value == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
}
p = gssapi_krb5_make_header(output_message_buffer->value, p = gssapi_krb5_make_header(output_message_buffer->value,
len, len,
@@ -395,6 +401,7 @@ wrap_des3
} }
if(conf_state != NULL) if(conf_state != NULL)
*conf_state = conf_req_flag; *conf_state = conf_req_flag;
*minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }