projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error reporting through com_err
[mech_eap.git]
/
pseudo_random.c
diff --git
a/pseudo_random.c
b/pseudo_random.c
index
e054693
..
7895060
100644
(file)
--- a/
pseudo_random.c
+++ b/
pseudo_random.c
@@
-55,10
+55,6
@@
#include "gssapiP_eap.h"
#include "gssapiP_eap.h"
-#ifndef MIN /* Usually found in <sys/param.h>. */
-#define MIN(_a,_b) ((_a)<(_b)?(_a):(_b))
-#endif
-
OM_uint32
gss_pseudo_random(OM_uint32 *minor,
gss_ctx_id_t ctx,
OM_uint32
gss_pseudo_random(OM_uint32 *minor,
gss_ctx_id_t ctx,
@@
-78,8
+74,20
@@
gss_pseudo_random(OM_uint32 *minor,
prf_out->length = 0;
prf_out->value = NULL;
prf_out->length = 0;
prf_out->value = NULL;
- if (!CTX_IS_ESTABLISHED(ctx))
+ if (ctx == GSS_C_NO_CONTEXT) {
+ *minor = EINVAL;
+ return GSS_S_NO_CONTEXT;
+ }
+
+ *minor = 0;
+
+ GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+ if (!CTX_IS_ESTABLISHED(ctx)) {
+ GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+ *minor = GSSEAP_CONTEXT_INCOMPLETE;
return GSS_S_NO_CONTEXT;
return GSS_S_NO_CONTEXT;
+ }
GSSEAP_KRB_INIT(&krbContext);
GSSEAP_KRB_INIT(&krbContext);
@@
-89,7
+97,7
@@
gss_pseudo_random(OM_uint32 *minor,
ns.length = 0;
ns.data = NULL;
ns.length = 0;
ns.data = NULL;
- if (prf_key != GSS_C_PRF_KEY_
FUL
L &&
+ if (prf_key != GSS_C_PRF_KEY_
PARTIA
L &&
prf_key != GSS_C_PRF_KEY_FULL) {
code = EINVAL;
goto cleanup;
prf_key != GSS_C_PRF_KEY_FULL) {
code = EINVAL;
goto cleanup;
@@
-140,12
+148,14
@@
gss_pseudo_random(OM_uint32 *minor,
}
cleanup:
}
cleanup:
+ GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
if (code != 0)
gss_release_buffer(&tmpMinor, prf_out);
krb5_free_data_contents(krbContext, &ns);
krb5_free_data_contents(krbContext, &t);
*minor = code;
if (code != 0)
gss_release_buffer(&tmpMinor, prf_out);
krb5_free_data_contents(krbContext, &ns);
krb5_free_data_contents(krbContext, &t);
*minor = code;
+
return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
}
return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
}
-