Print this page
3882 remove xmod & friends

*** 61,80 **** #include <sys/stat.h> #endif #include <fcntl.h> #include <ctype.h> - /* EXPORT DELETE START */ /* DES support */ #ifdef WITH_DES # ifdef WITH_SSL_DES # include <openssl/des.h> # else /* system DES library */ # include <des.h> # endif #endif /* WITH_DES */ - /* EXPORT DELETE END */ #ifdef WIN32 # include <winsock.h> #else /* Unix */ # include <netinet/in.h> --- 61,78 ----
*** 719,729 **** } *in = endpair; } - /* EXPORT DELETE START */ #ifdef WITH_DES struct des_context_s { des_key_schedule keysched; /* key schedule for des initialization */ des_cblock ivec; /* initial vector for encoding */ des_key_schedule keysched2; /* key schedule for 3des initialization */ --- 717,726 ----
*** 1187,1211 **** return SASL_OK; } #endif /* WITH_RC4 */ - /* EXPORT DELETE END */ struct digest_cipher available_ciphers[] = { - /* EXPORT DELETE START */ #ifdef WITH_RC4 { "rc4-40", 40, 5, 0x01, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 }, { "rc4-56", 56, 7, 0x02, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 }, { "rc4", 128, 16, 0x04, &enc_rc4, &dec_rc4, &init_rc4, &free_rc4 }, #endif #ifdef WITH_DES { "des", 55, 16, 0x08, &enc_des, &dec_des, &init_des, &free_des }, { "3des", 112, 16, 0x10, &enc_3des, &dec_3des, &init_3des, &free_des }, #endif - /* EXPORT DELETE END */ { NULL, 0, 0, 0, NULL, NULL, NULL, NULL } }; #ifdef USE_UEF --- 1184,1205 ----
*** 3686,3706 **** static sasl_server_plug_t digestmd5_server_plugins[] = { { "DIGEST-MD5", /* mech_name */ - /* EXPORT DELETE START */ #ifdef WITH_RC4 128, /* max_ssf */ #elif WITH_DES 112, #else - /* EXPORT DELETE END */ 0, - /* EXPORT DELETE START */ #endif - /* EXPORT DELETE END */ SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS | SASL_SEC_MUTUAL_AUTH, /* security_flags */ SASL_FEAT_ALLOWS_PROXY, /* features */ NULL, /* glob_context */ --- 3680,3696 ----
*** 3777,3797 **** #ifdef USE_UEF_CLIENT digestmd5_server_plugins[0].max_ssf = uef_max_ssf; #endif /* USE_UEF_CLIENT */ #endif /* _SUN_SDK_ */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy * and integrity will be allowed. */ REG_PLUG("DIGEST-MD5", digestmd5_server_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_SERVER_PLUG_VERSION; *pluglist = digestmd5_server_plugins; *plugcount = 1; --- 3767,3783 ----
*** 5176,5196 **** static sasl_client_plug_t digestmd5_client_plugins[] = { { "DIGEST-MD5", - /* EXPORT DELETE START */ #ifdef WITH_RC4 /* mech_name */ 128, /* max ssf */ #elif WITH_DES 112, #else - /* EXPORT DELETE END */ 0, - /* EXPORT DELETE START */ #endif - /* EXPORT DELETE END */ SASL_SEC_NOPLAINTEXT | SASL_SEC_NOANONYMOUS | SASL_SEC_MUTUAL_AUTH, /* security_flags */ SASL_FEAT_ALLOWS_PROXY, /* features */ NULL, /* required_prompts */ --- 5162,5178 ----
*** 5249,5269 **** #ifdef USE_UEF_CLIENT digestmd5_client_plugins[0].max_ssf = uef_max_ssf; #endif /* USE_UEF_CLIENT */ #endif /* _SUN_SDK_ */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* * Let libsasl know that we are a "Sun" plugin so that privacy * and integrity will be allowed. */ REG_PLUG("DIGEST-MD5", digestmd5_client_plugins); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ *out_version = SASL_CLIENT_PLUG_VERSION; *pluglist = digestmd5_client_plugins; *plugcount = 1; --- 5231,5247 ----