9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GNUTLS: Add rb_ssl_strerror() function in line with other backends

Browse source
This commit is contained in:
Aaron Jones 2016-09-16 20:38:41 +00:00
parent d70129a0d6
commit c6600fe290
No known key found for this signature in database
GPG key ID: EC6F86EE9CD840B5
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libratbox/src/gnutls.c
View file

@ -71,6 +71,7 @@ struct ssl_connect
int timeout; int timeout;
}; };
static const char *rb_ssl_strerror(int);
static void rb_ssl_connect_realcb(rb_fde_t *, int, struct ssl_connect *); static void rb_ssl_connect_realcb(rb_fde_t *, int, struct ssl_connect *);
static ssize_t rb_sock_net_recv(gnutls_transport_ptr_t, void *, size_t); static ssize_t rb_sock_net_recv(gnutls_transport_ptr_t, void *, size_t);
@ -114,6 +115,12 @@ rb_ssl_cert_auth_cb(gnutls_session_t session,
return 0; return 0;
} }
static const char *
rb_ssl_strerror(int err)
{
return gnutls_strerror(err);
}
static ssize_t static ssize_t
rb_sock_net_recv(gnutls_transport_ptr_t context_ptr, void *const buf, const size_t count) rb_sock_net_recv(gnutls_transport_ptr_t context_ptr, void *const buf, const size_t count)
{ {
@ -336,7 +343,7 @@ rb_init_ssl(void)
if ((ret = gnutls_global_init()) != GNUTLS_E_SUCCESS) if ((ret = gnutls_global_init()) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_global_init: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_global_init: %s", __func__, rb_ssl_strerror(ret));
return 0; return 0;
} }
@ -444,7 +451,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if((ret = gnutls_certificate_allocate_credentials(&server_cert_key)) != GNUTLS_E_SUCCESS) if((ret = gnutls_certificate_allocate_credentials(&server_cert_key)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_certificate_allocate_credentials: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_certificate_allocate_credentials: %s", __func__, rb_ssl_strerror(ret));
rb_free_datum_t(d_cert); rb_free_datum_t(d_cert);
rb_free_datum_t(d_key); rb_free_datum_t(d_key);
return 0; return 0;
@ -459,7 +466,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if((ret = gnutls_certificate_set_x509_key_mem(server_cert_key, d_cert, d_key, if((ret = gnutls_certificate_set_x509_key_mem(server_cert_key, d_cert, d_key,
GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS) GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_certificate_set_x509_key_mem: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_certificate_set_x509_key_mem: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
rb_free_datum_t(d_cert); rb_free_datum_t(d_cert);
rb_free_datum_t(d_key); rb_free_datum_t(d_key);
@ -468,7 +475,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if((ret = gnutls_x509_crt_list_import(client_cert, &client_cert_count, d_cert, GNUTLS_X509_FMT_PEM, if((ret = gnutls_x509_crt_list_import(client_cert, &client_cert_count, d_cert, GNUTLS_X509_FMT_PEM,
GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED)) < 1) GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED)) < 1)
{ {
rb_lib_log("%s: gnutls_x509_crt_list_import: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_x509_crt_list_import: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
rb_free_datum_t(d_cert); rb_free_datum_t(d_cert);
rb_free_datum_t(d_key); rb_free_datum_t(d_key);
@ -478,7 +485,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if((ret = gnutls_x509_privkey_init(&client_key)) != GNUTLS_E_SUCCESS) if((ret = gnutls_x509_privkey_init(&client_key)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_x509_privkey_init: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_x509_privkey_init: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
for(unsigned int i = 0; i < client_cert_count; i++) for(unsigned int i = 0; i < client_cert_count; i++)
gnutls_x509_crt_deinit(client_cert[i]); gnutls_x509_crt_deinit(client_cert[i]);
@ -488,7 +495,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
} }
if((ret = gnutls_x509_privkey_import(client_key, d_key, GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS) if((ret = gnutls_x509_privkey_import(client_key, d_key, GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_x509_privkey_import: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: gnutls_x509_privkey_import: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
for(unsigned int i = 0; i < client_cert_count; i++) for(unsigned int i = 0; i < client_cert_count; i++)
gnutls_x509_crt_deinit(client_cert[i]); gnutls_x509_crt_deinit(client_cert[i]);
@ -516,7 +523,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
} }
if((ret = gnutls_dh_params_init(&server_dhp)) != GNUTLS_E_SUCCESS) if((ret = gnutls_dh_params_init(&server_dhp)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: Error parsing DH parameters: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: Error parsing DH parameters: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
for(unsigned int i = 0; i < client_cert_count; i++) for(unsigned int i = 0; i < client_cert_count; i++)
gnutls_x509_crt_deinit(client_cert[i]); gnutls_x509_crt_deinit(client_cert[i]);
@ -526,7 +533,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
} }
if((ret = gnutls_dh_params_import_pkcs3(server_dhp, d_dhp, GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS) if((ret = gnutls_dh_params_import_pkcs3(server_dhp, d_dhp, GNUTLS_X509_FMT_PEM)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: Error parsing DH parameters: %s", __func__, gnutls_strerror(ret)); rb_lib_log("%s: Error parsing DH parameters: %s", __func__, rb_ssl_strerror(ret));
gnutls_certificate_free_credentials(server_cert_key); gnutls_certificate_free_credentials(server_cert_key);
for(unsigned int i = 0; i < client_cert_count; i++) for(unsigned int i = 0; i < client_cert_count; i++)
gnutls_x509_crt_deinit(client_cert[i]); gnutls_x509_crt_deinit(client_cert[i]);
@ -544,7 +551,7 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
if((ret = gnutls_priority_init(&default_priority, cipherlist, &err)) != GNUTLS_E_SUCCESS) if((ret = gnutls_priority_init(&default_priority, cipherlist, &err)) != GNUTLS_E_SUCCESS)
{ {
rb_lib_log("%s: gnutls_priority_init: %s, error begins at '%s'? -- using defaults instead", rb_lib_log("%s: gnutls_priority_init: %s, error begins at '%s'? -- using defaults instead",
__func__, gnutls_strerror(ret), err ? err : "<unknown>"); __func__, rb_ssl_strerror(ret), err ? err : "<unknown>");
(void) gnutls_priority_init(&default_priority, NULL, &err); (void) gnutls_priority_init(&default_priority, NULL, &err);
} }
@ -683,7 +690,7 @@ rb_get_random(void *buf, size_t length)
const char * const char *
rb_get_ssl_strerror(rb_fde_t *F) rb_get_ssl_strerror(rb_fde_t *F)
{ {
return gnutls_strerror(F->ssl_errno); return rb_ssl_strerror(F->ssl_errno);
} }
int int