vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_net: spell check s/revogation/revocation/g 

Sorry, in pt_BR it's revoGar... so I did misspell :-)
This commit is contained in:
Gustavo Sverzut Barbieri 2016-12-10 10:21:56 -02:00
parent 12c50e5522
commit e9a72ea8f4
11 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/ecore/efl_net_server_example.c
View File

@ -533,7 +533,7 @@ static const Ecore_Getopt options = {
ECORE_GETOPT_CHOICE('c', "ssl-cipher", "Cipher to use, defaults to 'auto'", ciphers_strs),
ECORE_GETOPT_APPEND(0, "ssl-certificate", "certificate path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-private-key", "private key path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-crl", "certificate revogation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-crl", "certificate revocation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-ca", "certificate authorities path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_CHOICE_METAVAR(0, NULL, "The server protocol.", "protocol",
@ -706,7 +706,7 @@ main(int argc, char **argv)
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(cas)),
efl_net_ssl_context_setup(efl_added, cipher, EINA_FALSE /* a server! */));

4
src/examples/ecore/efl_net_server_simple_example.c
View File

@ -328,7 +328,7 @@ static const Ecore_Getopt options = {
ECORE_GETOPT_CHOICE('c', "ssl-cipher", "Cipher to use, defaults to 'auto'", ciphers_strs),
ECORE_GETOPT_APPEND(0, "ssl-certificate", "certificate path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-private-key", "private key path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-crl", "certificate revogation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-crl", "certificate revocation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ssl-ca", "certificate authorities path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_CHOICE_METAVAR(0, NULL, "The server protocol.", "protocol",
@ -505,7 +505,7 @@ main(int argc, char **argv)
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(cas)),
efl_net_ssl_context_setup(efl_added, cipher, EINA_FALSE /* a server! */));

8
src/examples/ecore/efl_net_socket_ssl_dialer_example.c
View File

@ -264,7 +264,7 @@ static const Ecore_Getopt options = {
ECORE_GETOPT_CHOICE('c', "cipher", "Cipher to use, defaults to 'auto'", ciphers_strs),
ECORE_GETOPT_APPEND(0, "certificate", "certificate path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "private-key", "private key path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "crl", "certificate revogation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "crl", "certificate revocation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ca", "certificate authorities path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_STORE_FALSE(0, "no-default-paths", "Do not use default certificate paths from your system."),
@ -420,7 +420,7 @@ main(int argc, char **argv)
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(cas)),
efl_net_ssl_context_default_paths_load_set(efl_added, default_paths_load),
efl_net_ssl_context_verify_mode_set(efl_added, verify_mode),
@ -453,8 +453,8 @@ main(int argc, char **argv)
fprintf(stderr, "INFO: * %s\n", str);
eina_iterator_free(it);
fprintf(stderr, "INFO: - certificate revogation lists in use:\n");
it = efl_net_ssl_context_certificate_revogation_lists_get(ssl_ctx);
fprintf(stderr, "INFO: - certificate revocation lists in use:\n");
it = efl_net_ssl_context_certificate_revocation_lists_get(ssl_ctx);
EINA_ITERATOR_FOREACH(it, str)
fprintf(stderr, "INFO: * %s\n", str);
eina_iterator_free(it);

8
src/examples/ecore/efl_net_socket_ssl_server_example.c
View File

@ -184,7 +184,7 @@ static const Ecore_Getopt options = {
ECORE_GETOPT_APPEND(0, "certificate", "certificate path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "private-key", "private key path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "crl", "certificate revogation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "crl", "certificate revocation list to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_APPEND(0, "ca", "certificate authorities path to use.", ECORE_GETOPT_TYPE_STR),
ECORE_GETOPT_VERSION('V', "version"),
@ -275,7 +275,7 @@ main(int argc, char **argv)
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(cas)),
efl_net_ssl_context_setup(efl_added, cipher, EINA_FALSE /* a server! */));
@ -298,8 +298,8 @@ main(int argc, char **argv)
fprintf(stderr, "INFO: * %s\n", str);
eina_iterator_free(it);
fprintf(stderr, "INFO: - certificate revogation lists in use:\n");
it = efl_net_ssl_context_certificate_revogation_lists_get(ssl_ctx);
fprintf(stderr, "INFO: - certificate revocation lists in use:\n");
it = efl_net_ssl_context_certificate_revocation_lists_get(ssl_ctx);
EINA_ITERATOR_FOREACH(it, str)
fprintf(stderr, "INFO: * %s\n", str);
eina_iterator_free(it);

6
src/lib/ecore_con/ecore_con_legacy.c
View File

@ -1530,7 +1530,7 @@ _ecore_con_server_ssl_ctx_create(const Ecore_Con_Server *svr)
return efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(svr->ssl.cafiles)),
efl_net_ssl_context_default_paths_load_set(efl_added, EINA_FALSE), /* old API didn't load default paths */
efl_net_ssl_context_setup(efl_added, cipher, EINA_FALSE));
@ -1878,7 +1878,7 @@ _ecore_con_server_dialer_ssl_job(void *data, const Efl_Event *event EINA_UNUSED)
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(svr->ssl.cafiles)),
efl_net_ssl_context_verify_mode_set(efl_added, verify_mode),
efl_net_ssl_context_hostname_set(efl_added, svr->ssl.verify_name ? svr->ssl.verify_name : svr->name),
@ -1955,7 +1955,7 @@ _ecore_con_server_dialer_ssl_upgrade_job(void *data, const Efl_Event *event EINA
ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, NULL,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revogation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_net_ssl_context_certificate_authorities_set(efl_added, eina_list_iterator_new(svr->ssl.cafiles)),
efl_net_ssl_context_verify_mode_set(efl_added, verify_mode),
efl_net_ssl_context_hostname_set(efl_added, svr->ssl.verify_name ? svr->ssl.verify_name : svr->name),

4
src/lib/ecore_con/efl_net_dialer_http.c
View File

@ -2342,7 +2342,7 @@ _efl_net_dialer_http_ssl_certificate_authority_get(Eo *o EINA_UNUSED, Efl_Net_Di
}
EOLIAN static void
_efl_net_dialer_http_ssl_certificate_revogation_list_set(Eo *o EINA_UNUSED, Efl_Net_Dialer_Http_Data *pd, const char *path)
_efl_net_dialer_http_ssl_certificate_revocation_list_set(Eo *o EINA_UNUSED, Efl_Net_Dialer_Http_Data *pd, const char *path)
{
CURLcode r;
@ -2355,7 +2355,7 @@ _efl_net_dialer_http_ssl_certificate_revogation_list_set(Eo *o EINA_UNUSED, Efl_
}
EOLIAN static const char *
_efl_net_dialer_http_ssl_certificate_revogation_list_get(Eo *o EINA_UNUSED, Efl_Net_Dialer_Http_Data *pd)
_efl_net_dialer_http_ssl_certificate_revocation_list_get(Eo *o EINA_UNUSED, Efl_Net_Dialer_Http_Data *pd)
{
return pd->ssl.crl;
}

4
src/lib/ecore_con/efl_net_dialer_http.eo
View File

@ -356,8 +356,8 @@ class Efl.Net.Dialer.Http (Efl.Loop_User, Efl.Net.Dialer, Efl.Io.Sizer) {
}
}
@property ssl_certificate_revogation_list {
[[Defines a CRL (Certificate Revogation List) path to use.]]
@property ssl_certificate_revocation_list {
[[Defines a CRL (Certificate Revocation List) path to use.]]
values {
file: string; [[File path to use for CRL]]
}

18
src/lib/ecore_con/efl_net_ssl_context.c
View File

@ -29,7 +29,7 @@ typedef struct _Efl_Net_Ssl_Ctx_Config {
Eina_Bool load_defaults;
Eina_List **certificates;
Eina_List **private_keys;
Eina_List **certificate_revogation_lists;
Eina_List **certificate_revocation_lists;
Eina_List **certificate_authorities;
} Efl_Net_Ssl_Ctx_Config;
@ -95,7 +95,7 @@ typedef struct _Efl_Net_Ssl_Context_Data
Efl_Net_Ssl_Ctx ssl_ctx;
Eina_List *certificates;
Eina_List *private_keys;
Eina_List *certificate_revogation_lists;
Eina_List *certificate_revocation_lists;
Eina_List *certificate_authorities;
const char *hostname;
Efl_Net_Ssl_Cipher cipher;
@ -179,17 +179,17 @@ _efl_net_ssl_context_private_keys_set(Eo *o EINA_UNUSED, Efl_Net_Ssl_Context_Dat
}
static Eina_Iterator *
_efl_net_ssl_context_certificate_revogation_lists_get(Eo *o EINA_UNUSED, Efl_Net_Ssl_Context_Data *pd)
_efl_net_ssl_context_certificate_revocation_lists_get(Eo *o EINA_UNUSED, Efl_Net_Ssl_Context_Data *pd)
{
return eina_list_iterator_new(pd->certificate_revogation_lists);
return eina_list_iterator_new(pd->certificate_revocation_lists);
}
static void
_efl_net_ssl_context_certificate_revogation_lists_set(Eo *o EINA_UNUSED, Efl_Net_Ssl_Context_Data *pd, Eina_Iterator *it)
_efl_net_ssl_context_certificate_revocation_lists_set(Eo *o EINA_UNUSED, Efl_Net_Ssl_Context_Data *pd, Eina_Iterator *it)
{
EINA_SAFETY_ON_TRUE_RETURN(efl_finalized_get(o));
_efl_net_ssl_context_string_list_free(&pd->certificate_revogation_lists);
pd->certificate_revogation_lists = _efl_net_ssl_context_string_iter_to_list(it);
_efl_net_ssl_context_string_list_free(&pd->certificate_revocation_lists);
pd->certificate_revocation_lists = _efl_net_ssl_context_string_iter_to_list(it);
}
static Eina_Iterator *
@ -304,7 +304,7 @@ _efl_net_ssl_context_efl_object_finalize(Eo *o, Efl_Net_Ssl_Context_Data *pd)
cfg.load_defaults = pd->load_defaults;
cfg.certificates = &pd->certificates;
cfg.private_keys = &pd->private_keys;
cfg.certificate_revogation_lists = &pd->certificate_revogation_lists;
cfg.certificate_revocation_lists = &pd->certificate_revocation_lists;
cfg.certificate_authorities = &pd->certificate_authorities;
cfg.load_defaults = pd->load_defaults;
@ -343,7 +343,7 @@ _efl_net_ssl_context_efl_object_destructor(Eo *o, Efl_Net_Ssl_Context_Data *pd)
_efl_net_ssl_context_string_list_free(&pd->certificates);
_efl_net_ssl_context_string_list_free(&pd->private_keys);
_efl_net_ssl_context_string_list_free(&pd->certificate_revogation_lists);
_efl_net_ssl_context_string_list_free(&pd->certificate_revocation_lists);
_efl_net_ssl_context_string_list_free(&pd->certificate_authorities);
eina_stringshare_replace(&pd->hostname, NULL);

6
src/lib/ecore_con/efl_net_ssl_context.eo
View File

@ -4,7 +4,7 @@ class Efl.Net.Ssl.Context (Efl.Object) {
[[A SSL Context that is used to start a SSL socket wrapper.
The context will contain common configurations such as
certificates, private keys, certificate revogation lists (CRLs),
certificates, private keys, certificate revocation lists (CRLs),
certificate authorities (CAs) and so on.
The method @.setup must be called once before
@ -62,8 +62,8 @@ class Efl.Net.Ssl.Context (Efl.Object) {
}
}
@property certificate_revogation_lists {
[[The list of paths to CRL (certificate revogation list) to use.
@property certificate_revocation_lists {
[[The list of paths to CRL (certificate revocation list) to use.
Can only be set during object construction!
]]

14
src/lib/ecore_con/efl_net_ssl_ctx-gnutls.c
View File

@ -13,7 +13,7 @@ _efl_net_ssl_ctx_load_lists(Efl_Net_Ssl_Ctx *ctx, Efl_Net_Ssl_Ctx_Config cfg)
const char *path;
unsigned certificates_count = eina_list_count(*cfg.certificates);
unsigned private_keys_count = eina_list_count(*cfg.private_keys);
unsigned certificate_revogation_lists_count = eina_list_count(*cfg.certificate_revogation_lists);
unsigned certificate_revocation_lists_count = eina_list_count(*cfg.certificate_revocation_lists);
unsigned certificate_authorities_count = eina_list_count(*cfg.certificate_authorities);
int r;
@ -98,23 +98,23 @@ _efl_net_ssl_ctx_load_lists(Efl_Net_Ssl_Ctx *ctx, Efl_Net_Ssl_Ctx_Config cfg)
while (pk_node->next);
}
EINA_LIST_FOREACH_SAFE(*cfg.certificate_revogation_lists, n, n_next, path)
EINA_LIST_FOREACH_SAFE(*cfg.certificate_revocation_lists, n, n_next, path)
{
r = gnutls_certificate_set_x509_crl_file(ctx->x509_cred, path, GNUTLS_X509_FMT_PEM);
if (r < 0)
{
ERR("ssl_ctx=%p could not use certificate revogation lists from %s: %s",
ERR("ssl_ctx=%p could not use certificate revocation lists from %s: %s",
ctx, path, gnutls_strerror(r));
eina_stringshare_del(path);
*cfg.certificate_revogation_lists = eina_list_remove_list(*cfg.certificate_revogation_lists, n);
*cfg.certificate_revocation_lists = eina_list_remove_list(*cfg.certificate_revocation_lists, n);
continue;
}
DBG("ssl_ctx=%p loaded certificate revogation lists '%s'", ctx, path);
DBG("ssl_ctx=%p loaded certificate revocation lists '%s'", ctx, path);
}
if (certificate_revogation_lists_count && !*cfg.certificate_revogation_lists)
if (certificate_revocation_lists_count && !*cfg.certificate_revocation_lists)
{
ERR("ssl_ctx=%p none of the required certificate revogation lists were loaded!", ctx);
ERR("ssl_ctx=%p none of the required certificate revocation lists were loaded!", ctx);
return EINVAL;
}

14
src/lib/ecore_con/efl_net_ssl_ctx-openssl.c
View File

@ -42,7 +42,7 @@ _efl_net_ssl_ctx_load_lists(Efl_Net_Ssl_Ctx *ctx, Efl_Net_Ssl_Ctx_Config cfg)
const char *path;
unsigned certificates_count = eina_list_count(*cfg.certificates);
unsigned private_keys_count = eina_list_count(*cfg.private_keys);
unsigned certificate_revogation_lists_count = eina_list_count(*cfg.certificate_revogation_lists);
unsigned certificate_revocation_lists_count = eina_list_count(*cfg.certificate_revocation_lists);
unsigned certificate_authorities_count = eina_list_count(*cfg.certificate_authorities);
long err_ssl;
const char *err_file;
@ -155,7 +155,7 @@ _efl_net_ssl_ctx_check_errors();
return ENOSYS;
}
EINA_LIST_FOREACH_SAFE(*cfg.certificate_revogation_lists, n, n_next, path)
EINA_LIST_FOREACH_SAFE(*cfg.certificate_revocation_lists, n, n_next, path)
{
if ((X509_load_crl_file(x509_lookup, path, X509_FILETYPE_PEM) != 1) &&
(X509_load_crl_file(x509_lookup, path, X509_FILETYPE_ASN1) != 1))
@ -163,23 +163,23 @@ _efl_net_ssl_ctx_check_errors();
err_ssl = ERR_peek_error_line_data(&err_file, &err_line, &err_data, &err_flags);
_efl_net_ssl_ctx_check_errors();
ERR("ssl_ctx=%p could not use certificate revogation lists from %s [%s:%d%s%s '%s']",
ERR("ssl_ctx=%p could not use certificate revocation lists from %s [%s:%d%s%s '%s']",
ctx, path,
err_file, err_line,
(err_flags & ERR_TXT_STRING) ? " " : "",
(err_flags & ERR_TXT_STRING) ? err_data : "",
ERR_reason_error_string(err_ssl));
eina_stringshare_del(path);
*cfg.certificate_revogation_lists = eina_list_remove_list(*cfg.certificate_revogation_lists, n);
*cfg.certificate_revocation_lists = eina_list_remove_list(*cfg.certificate_revocation_lists, n);
continue;
}
DBG("ssl_ctx=%p loaded certificate revogation lists '%s'", ctx, path);
DBG("ssl_ctx=%p loaded certificate revocation lists '%s'", ctx, path);
x509_store_flags |= X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL;
}
if (certificate_revogation_lists_count && !*cfg.certificate_revogation_lists)
if (certificate_revocation_lists_count && !*cfg.certificate_revocation_lists)
{
ERR("ssl_ctx=%p none of the required certificate revogation lists were loaded!", ctx);
ERR("ssl_ctx=%p none of the required certificate revocation lists were loaded!", ctx);
return EINVAL;
}
X509_STORE_set_flags(x509_store, x509_store_flags);