Print this page
3882 remove xmod & friends
*** 196,210 ****
sasl_client_plug_init_t *entry_point)
{
cmech_list_t *cmechlist;
#ifdef _INTEGRATED_SOLARIS_
_sasl_global_context_t *gctx = ctx == NULL ? _sasl_gbl_ctx() : ctx;
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
int sun_reg;
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
#endif /* _INTEGRATED_SOLARIS_ */
int i;
cmechanism_t *m;
#endif /* _SUN_SDK_ */
int plugcount;
--- 196,206 ----
*** 237,253 ****
#endif /* _SUN_SDK_ */
result = entry_point(cmechlist->utils, SASL_CLIENT_PLUG_VERSION, &version,
&pluglist, &plugcount);
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
sun_reg = _is_sun_reg(pluglist);
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
if (result != SASL_OK)
{
#ifdef _SUN_SDK_
UNLOCK_MUTEX(&client_plug_mutex);
__sasl_log(gctx, gctx->client_global_callbacks.callbacks, SASL_LOG_WARN,
--- 233,245 ----
*** 307,323 ****
UNLOCK_MUTEX(&client_plug_mutex);
#endif /* _SUN_SDK_ */
sasl_FREE(mech);
return SASL_NOMEM;
}
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
mech->sun_reg = sun_reg;
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
mech->version = version;
mech->next = cmechlist->mech_list;
cmechlist->mech_list = mech;
cmechlist->mech_length++;
}
--- 299,311 ----
*** 841,859 ****
/* Is it strong enough? */
if (minssf > m->plug->max_ssf)
break;
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
/* If not SUN supplied mech, it has no strength */
if (minssf > 0 && !m->sun_reg)
break;
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
/* Does it meet our security properties? */
myflags = conn->props.security_flags;
/* if there's an external layer this is no longer plaintext */
--- 829,843 ----
*** 877,923 ****
!(m->plug->features & SASL_FEAT_ALLOWS_PROXY)) {
break;
}
#ifdef PREFER_MECH
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
if (strcasecmp(m->plug->mech_name, PREFER_MECH) &&
bestm && (m->sun_reg && m->plug->max_ssf <= bestssf) ||
(m->plug->max_ssf == 0)) {
#else
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
if (strcasecmp(m->plug->mech_name, PREFER_MECH) &&
bestm && m->plug->max_ssf <= bestssf) {
-
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
/* this mechanism isn't our favorite, and it's no better
than what we already have! */
break;
}
#else
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
if (bestm && m->sun_reg && m->plug->max_ssf <= bestssf) {
#else
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
if (bestm && m->plug->max_ssf <= bestssf) {
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
/* this mechanism is no better than what we already have! */
break;
}
#endif
--- 861,890 ----
*** 947,969 ****
}
if (mech) {
*mech = m->plug->mech_name;
}
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
bestssf = m->sun_reg ? m->plug->max_ssf : 0;
#else
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
bestssf = m->plug->max_ssf;
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
bestm = m;
break;
}
}
--- 914,928 ----
*** 987,1007 ****
c_conn->cparams->clientFQDN = c_conn->clientFQDN;
c_conn->cparams->clen = strlen(c_conn->clientFQDN);
c_conn->cparams->external_ssf = conn->external.ssf;
c_conn->cparams->props = conn->props;
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
if (!bestm->sun_reg) {
c_conn->cparams->props.min_ssf = 0;
c_conn->cparams->props.max_ssf = 0;
}
c_conn->base.sun_reg = bestm->sun_reg;
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
c_conn->mech = bestm;
/* init that plugin */
#ifdef _SUN_SDK_
result = c_conn->mech->plug->mech_new(c_conn->mech->glob_context,
--- 946,962 ----
*** 1219,1237 ****
/* is it strong enough? */
if (minssf > m->plug->max_ssf)
continue;
- /* EXPORT DELETE START */
- /* CRYPT DELETE START */
#ifdef _INTEGRATED_SOLARIS_
/* If not SUN supplied mech, it has no strength */
if (minssf > 0 && !m->sun_reg)
continue;
#endif /* _INTEGRATED_SOLARIS_ */
- /* CRYPT DELETE END */
- /* EXPORT DELETE END */
/* does it meet our security properties? */
if (((conn->props.security_flags ^ m->plug->security_flags)
& conn->props.security_flags) != 0) {
continue;
--- 1174,1188 ----