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

TLS

Browse source 
- Connected code paths to use CA or trust.
This commit is contained in:
Paul Beckingham 2013-11-03 12:51:13 -05:00
parent f1f93aa5d5
commit 7fa3f71575
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/TLSClient.cpp
View file

@ -156,17 +156,19 @@ void TLSClient::trust (bool value)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void TLSClient::init ( void TLSClient::init (
const std::string& ca,
const std::string& cert, const std::string& cert,
const std::string& key) const std::string& key)
{ {
_ca = ca;
_cert = cert; _cert = cert;
_key = key; _key = key;
gnutls_global_init (); gnutls_global_init ();
gnutls_certificate_allocate_credentials (&_credentials); gnutls_certificate_allocate_credentials (&_credentials);
if (_cert != "" && if (_ca != "" &&
gnutls_certificate_set_x509_trust_file (_credentials, _cert.c_str (), GNUTLS_X509_FMT_PEM) < 0) gnutls_certificate_set_x509_trust_file (_credentials, _ca.c_str (), GNUTLS_X509_FMT_PEM) < 0)
throw std::string ("Missing CA file."); throw std::string ("Missing CA file.");
if (_cert != "" && if (_cert != "" &&

2
src/TLSClient.h
View file

@ -40,7 +40,7 @@ public:
void limit (int); void limit (int);
void debug (int); void debug (int);
void trust (bool); void trust (bool);
void init (const std::string&, const std::string&); void init (const std::string&, const std::string&, const std::string&);
void connect (const std::string&, const std::string&); void connect (const std::string&, const std::string&);
void bye (); void bye ();

7
src/commands/CmdSync.cpp
View file

@ -344,11 +344,8 @@ bool CmdSync::send (
TLSClient client; TLSClient client;
client.debug (context.config.getInteger ("debug.tls")); client.debug (context.config.getInteger ("debug.tls"));
// TODO Either use 'ca' or 'trust', but not both. client.trust (trust);
if (trust && ca == "") client.init (ca, certificate, key);
client.trust (trust);
client.init (certificate, key);
client.connect (server, port); client.connect (server, port);
client.send (request.serialize () + "\n"); client.send (request.serialize () + "\n");