forked from enlightenment/efl
Merge branch 'master' of ssh://git.enlightenment.org/core/efl
This commit is contained in:
commit
3f00d9ee60
|
@ -1,3 +1,7 @@
|
|||
2013-03-11 Mike Blumenkrantz
|
||||
|
||||
* clean up gnutls session initialization
|
||||
|
||||
2013-03-10 Cedric Bail
|
||||
|
||||
* Eeze: add a dummy implementation of libmount when it is not available.
|
||||
|
|
1
NEWS
1
NEWS
|
@ -194,3 +194,4 @@ Fixes:
|
|||
* fix edje program filters
|
||||
* fix dangling pointer problem related with shmget fail
|
||||
* fix bug scroll works when PgDn, PgUp, Home, End key in entry is pressed in preedit state
|
||||
* clean up gnutls session initialization
|
||||
|
|
|
@ -274,7 +274,7 @@ AM_CONDITIONAL([EFL_ENABLE_TESTS], [test "${want_tests}" = "yes"])
|
|||
# check for crypto/tls library to use
|
||||
case "$build_crypto" in
|
||||
gnutls)
|
||||
EFL_DEPEND_PKG([crypto], [GNUTLS], [gnutls >= 2.11])
|
||||
EFL_DEPEND_PKG([crypto], [GNUTLS], [gnutls >= 2.12.16])
|
||||
|
||||
AM_PATH_LIBGCRYPT([], [:],
|
||||
[AC_MSG_ERROR([libgcrypt required but not found])])
|
||||
|
|
|
@ -961,7 +961,7 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *svr)
|
|||
const gnutls_datum_t *cert_list;
|
||||
unsigned int iter, cert_list_size;
|
||||
gnutls_x509_crt_t cert = NULL;
|
||||
const char *priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0";
|
||||
const char *priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT";
|
||||
int ret = 0;
|
||||
|
||||
switch (svr->ssl_state)
|
||||
|
@ -977,12 +977,12 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *svr)
|
|||
{
|
||||
case ECORE_CON_USE_SSL3:
|
||||
case ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT:
|
||||
priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:!VERS-TLS1.0:!VERS-TLS1.1";
|
||||
priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-TLS1.0:!VERS-TLS1.1:!VERS-TLS1.2";
|
||||
break;
|
||||
|
||||
case ECORE_CON_USE_TLS:
|
||||
case ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT:
|
||||
priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:!VERS-SSL3.0";
|
||||
priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-SSL3.0";
|
||||
break;
|
||||
|
||||
case ECORE_CON_USE_MIXED:
|
||||
|
@ -998,6 +998,7 @@ _ecore_con_ssl_server_init_gnutls(Ecore_Con_Server *svr)
|
|||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_server_name_set(svr->session, GNUTLS_NAME_DNS, svr->name, strlen(svr->name)));
|
||||
INF("Applying priority string: %s", priority);
|
||||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_priority_set_direct(svr->session, priority, NULL));
|
||||
gnutls_handshake_set_private_extensions(svr->session, 1);
|
||||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_credentials_set(svr->session, GNUTLS_CRD_CERTIFICATE, svr->cert));
|
||||
// SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_credentials_set(svr->session, GNUTLS_CRD_PSK, svr->pskcred_c));
|
||||
if (!svr->use_cert)
|
||||
|
@ -1281,7 +1282,7 @@ _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *cl)
|
|||
{
|
||||
const gnutls_datum_t *cert_list;
|
||||
unsigned int iter, cert_list_size;
|
||||
const char *priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:+VERS-TLS1.2:+VERS-TLS1.1:+VERS-TLS1.0:+VERS-SSL3.0";
|
||||
const char *priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT";
|
||||
int ret = 0;
|
||||
|
||||
switch (cl->ssl_state)
|
||||
|
@ -1297,12 +1298,12 @@ _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *cl)
|
|||
{
|
||||
case ECORE_CON_USE_SSL3:
|
||||
case ECORE_CON_USE_SSL3 | ECORE_CON_LOAD_CERT:
|
||||
priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:!VERS-TLS1.0:!VERS-TLS1.1";
|
||||
priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-TLS1.0:!VERS-TLS1.1:!VERS-TLS1.2";
|
||||
break;
|
||||
|
||||
case ECORE_CON_USE_TLS:
|
||||
case ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT:
|
||||
priority = "NONE:%VERIFY_ALLOW_X509_V1_CA_CRT:+RSA:+DHE-RSA:+DHE-DSS:+ANON-DH:+COMP-DEFLATE:+COMP-NULL:+CTYPE-X509:+SHA1:+SHA256:+SHA384:+SHA512:+AES-256-CBC:+AES-128-CBC:+3DES-CBC:!VERS-SSL3.0";
|
||||
priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-SSL3.0";
|
||||
break;
|
||||
|
||||
case ECORE_CON_USE_MIXED:
|
||||
|
@ -1320,6 +1321,7 @@ _ecore_con_ssl_client_init_gnutls(Ecore_Con_Client *cl)
|
|||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_session_ticket_enable_server(cl->session, &cl->session_ticket));
|
||||
INF("Applying priority string: %s", priority);
|
||||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_priority_set_direct(cl->session, priority, NULL));
|
||||
gnutls_handshake_set_private_extensions(cl->session, 1);
|
||||
SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_credentials_set(cl->session, GNUTLS_CRD_CERTIFICATE, cl->host_server->cert));
|
||||
// SSL_ERROR_CHECK_GOTO_ERROR(ret = gnutls_credentials_set(cl->session, GNUTLS_CRD_PSK, cl->host_server->pskcred_s));
|
||||
if (!cl->host_server->use_cert)
|
||||
|
|
|
@ -413,7 +413,7 @@ eina_simple_xml_parse(const char *buf, unsigned buflen, Eina_Bool strip, Eina_Si
|
|||
break;
|
||||
}
|
||||
|
||||
if ((strip) && (type != EINA_SIMPLE_XML_ERROR))
|
||||
if ((strip) && (type != EINA_SIMPLE_XML_ERROR) && (type != EINA_SIMPLE_XML_CDATA))
|
||||
{
|
||||
start = _eina_simple_xml_whitespace_skip
|
||||
(start, end);
|
||||
|
|
|
@ -434,6 +434,53 @@ START_TEST(strbuf_prepend_realloc)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
START_TEST(strbuf_trim)
|
||||
{
|
||||
Eina_Strbuf* buf;
|
||||
char* str;
|
||||
|
||||
eina_init();
|
||||
buf = eina_strbuf_new();
|
||||
fail_unless(buf);
|
||||
|
||||
eina_strbuf_append(buf, " string ");
|
||||
eina_strbuf_trim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "string") != 0);
|
||||
eina_strbuf_reset(buf);
|
||||
|
||||
eina_strbuf_append(buf, " string ");
|
||||
eina_strbuf_ltrim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "string ") != 0);
|
||||
eina_strbuf_rtrim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "string") != 0);
|
||||
eina_strbuf_reset(buf);
|
||||
|
||||
eina_strbuf_append(buf," ");
|
||||
eina_strbuf_trim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "") != 0);
|
||||
eina_strbuf_reset(buf);
|
||||
|
||||
eina_strbuf_append(buf," ");
|
||||
eina_strbuf_rtrim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "") != 0);
|
||||
eina_strbuf_reset(buf);
|
||||
|
||||
eina_strbuf_append(buf, " ");
|
||||
eina_strbuf_ltrim(buf);
|
||||
str = eina_strbuf_string_get(buf);
|
||||
fail_if(str == NULL || strcmp(str, "") != 0);
|
||||
eina_strbuf_reset(buf);
|
||||
|
||||
eina_strbuf_free(buf);
|
||||
eina_shutdown();
|
||||
}
|
||||
END_TEST
|
||||
|
||||
void
|
||||
eina_test_strbuf(TCase *tc)
|
||||
{
|
||||
|
@ -446,4 +493,5 @@ eina_test_strbuf(TCase *tc)
|
|||
tcase_add_test(tc, strbuf_append_realloc);
|
||||
tcase_add_test(tc, strbuf_prepend_realloc);
|
||||
tcase_add_test(tc, strbuf_manage_simple);
|
||||
tcase_add_test(tc, strbuf_trim);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue