GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-27 10:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Certificates

Browse source 
- CA is now checked for existence before use.
- Error messages no longer have 'ERROR:' prepended.
This commit is contained in:
Paul Beckingham 2013-09-16 00:06:49 -04:00
parent 9e7e807909
commit 6fc065e03e
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/TLSClient.cpp
View file

@ -34,12 +34,14 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <TLSClient.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <netdb.h> #include <netdb.h>
#include <File.h>
#include <TLSClient.h>
#include <text.h>
#include <i18n.h> #include <i18n.h>
#define MAX_BUF 16384 #define MAX_BUF 16384
@ -95,6 +97,9 @@ void TLSClient::debug (int level)
void TLSClient::init (const std::string& ca) void TLSClient::init (const std::string& ca)
{ {
_ca = ca; _ca = ca;
File ca_file (_ca);
if (!ca_file.exists ())
throw std::string (STRING_CMD_SYNC_NO_CA);
gnutls_global_init (); gnutls_global_init ();
gnutls_certificate_allocate_credentials (&_credentials); gnutls_certificate_allocate_credentials (&_credentials);
@ -127,7 +132,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
struct addrinfo* res; struct addrinfo* res;
if (::getaddrinfo (host.c_str (), port.c_str (), &hints, &res) != 0) if (::getaddrinfo (host.c_str (), port.c_str (), &hints, &res) != 0)
throw std::string ("ERROR: ") + ::gai_strerror (errno); throw std::string (::gai_strerror (errno));
// Try them all, stop on success. // Try them all, stop on success.
struct addrinfo* p; struct addrinfo* p;
@ -145,7 +150,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
SO_REUSEADDR, SO_REUSEADDR,
(const void*) &on, (const void*) &on,
sizeof (on)) == -1) sizeof (on)) == -1)
throw std::string ("ERROR: ") + ::strerror (errno); throw std::string (::strerror (errno));
if (::connect (_socket, p->ai_addr, p->ai_addrlen) == -1) if (::connect (_socket, p->ai_addr, p->ai_addrlen) == -1)
continue; continue;
@ -156,7 +161,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
free (res); free (res);
if (p == NULL) if (p == NULL)
throw std::string ("ERROR: Could not connect to ") + host + " " + port; throw format (STRING_CMD_SYNC_CONNECT, host, port);
gnutls_transport_set_ptr (_session, (gnutls_transport_ptr_t) (long) _socket); gnutls_transport_set_ptr (_session, (gnutls_transport_ptr_t) (long) _socket);
@ -168,7 +173,7 @@ void TLSClient::connect (const std::string& host, const std::string& port)
} }
while (ret < 0 && gnutls_error_is_fatal (ret) == 0); while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
if (ret < 0) if (ret < 0)
throw std::string ("ERROR: Handshake failed. ") + gnutls_strerror (ret); throw format (STRING_CMD_SYNC_HANDSHAKE, gnutls_strerror (ret));
if (_debug) if (_debug)
std::cout << "c: INFO Handshake was completed\n"; std::cout << "c: INFO Handshake was completed\n";
@ -273,7 +278,7 @@ void TLSClient::recv (std::string& data)
// Something happened. // Something happened.
if (received < 0) if (received < 0)
throw std::string ("ERROR: ") + gnutls_strerror (received); throw std::string (gnutls_strerror (received));
buffer [received] = '\0'; buffer [received] = '\0';
data += buffer; data += buffer;