github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

TLS: Minor code cleanups

pull/128/head
Nils Maier 2013-09-23 15:13:42 +02:00
parent d560bf0e6f
commit 063451f0c9
3 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LibgnutlsTLSContext.h
View File

@ -53,7 +53,7 @@ public:
// private key `keyfile' must be decrypted. // private key `keyfile' must be decrypted.
virtual bool addCredentialFile(const std::string& certfile, virtual bool addCredentialFile(const std::string& certfile,
const std::string& keyfile) CXX11_OVERRIDE; const std::string& keyfile) CXX11_OVERRIDE;
virtual bool addP12CredentialFile(const std::string& p12file); bool addP12CredentialFile(const std::string& p12file);
virtual bool addSystemTrustedCACerts() CXX11_OVERRIDE; virtual bool addSystemTrustedCACerts() CXX11_OVERRIDE;

82
src/LibsslTLSContext.cc
View File

@ -52,11 +52,31 @@ namespace {
if (b) BIO_free(b); if (b) BIO_free(b);
} }
}; };
using bio_t = std::unique_ptr<BIO, bio_deleter>;
struct p12_deleter { struct p12_deleter {
void operator()(PKCS12 *p) { void operator()(PKCS12 *p) {
if (p) PKCS12_free(p); if (p) PKCS12_free(p);
} }
}; };
using p12_t = std::unique_ptr<PKCS12, p12_deleter>;
struct pkey_deleter {
void operator()(EVP_PKEY *x) {
if (x) EVP_PKEY_free(x);
}
};
using pkey_t = std::unique_ptr<EVP_PKEY, pkey_deleter>;
struct x509_deleter {
void operator()(X509 *x) {
if (x) X509_free(x);
}
};
using x509_t = std::unique_ptr<X509, x509_deleter>;
struct x509_sk_deleter {
void operator()(STACK_OF(X509) *x) {
if (x) sk_X509_pop_free(x, X509_free);
}
};
using x509_sk_t = std::unique_ptr<STACK_OF(X509), x509_sk_deleter>;
} // namespace } // namespace
namespace aria2 { namespace aria2 {
@ -138,14 +158,13 @@ bool OpenSSLTLSContext::addP12CredentialFile(const std::string& p12file)
auto data = ss.str(); auto data = ss.str();
void *ptr = const_cast<char*>(data.c_str()); void *ptr = const_cast<char*>(data.c_str());
size_t len = data.length(); size_t len = data.length();
std::unique_ptr<BIO, bio_deleter> bio(BIO_new_mem_buf(ptr, len)); bio_t bio(BIO_new_mem_buf(ptr, len));
A2_LOG_DEBUG(fmt("p12 size: %" PRIu64, len));
if (!bio) { if (!bio) {
A2_LOG_ERROR("Failed to open p12 file: no memory"); A2_LOG_ERROR("Failed to open p12 file: no memory");
return false; return false;
} }
std::unique_ptr<PKCS12, p12_deleter> p12(d2i_PKCS12_bio(bio.get(), nullptr)); p12_t p12(d2i_PKCS12_bio(bio.get(), nullptr));
if (!p12) { if (!p12) {
A2_LOG_ERROR(fmt("Failed to open p12 file: %s", A2_LOG_ERROR(fmt("Failed to open p12 file: %s",
ERR_error_string(ERR_get_error(), nullptr))); ERR_error_string(ERR_get_error(), nullptr)));
@ -160,44 +179,33 @@ bool OpenSSLTLSContext::addP12CredentialFile(const std::string& p12file)
return false; return false;
} }
bool rv = false; pkey_t pkey_holder(pkey);
if (pkey && cert) { x509_t cert_holder(cert);
rv = SSL_CTX_use_PrivateKey(sslCtx_, pkey); x509_sk_t ca_holder(ca);
if (!rv) {
A2_LOG_ERROR(fmt("Failed to use p12 file pkey: %s", if (!pkey || !cert) {
ERR_error_string(ERR_get_error(), nullptr)));
}
if (rv) {
rv = SSL_CTX_use_certificate(sslCtx_, cert);
if (!rv) {
A2_LOG_ERROR(fmt("Failed to use p12 file cert: %s",
ERR_error_string(ERR_get_error(), nullptr)));
}
}
if (rv && ca && sk_X509_num(ca)) {
rv = SSL_CTX_add_extra_chain_cert(sslCtx_, ca);
if (!rv) {
A2_LOG_ERROR(fmt("Failed to use p12 file chain: %s",
ERR_error_string(ERR_get_error(), nullptr)));
}
}
}
else {
A2_LOG_ERROR(fmt("Failed to use p12 file: no pkey or cert %s", A2_LOG_ERROR(fmt("Failed to use p12 file: no pkey or cert %s",
ERR_error_string(ERR_get_error(), nullptr))); ERR_error_string(ERR_get_error(), nullptr)));
return false;
}
if (!SSL_CTX_use_PrivateKey(sslCtx_, pkey)) {
A2_LOG_ERROR(fmt("Failed to use p12 file pkey: %s",
ERR_error_string(ERR_get_error(), nullptr)));
return false;
}
if (!SSL_CTX_use_certificate(sslCtx_, cert)) {
A2_LOG_ERROR(fmt("Failed to use p12 file cert: %s",
ERR_error_string(ERR_get_error(), nullptr)));
return false;
}
if (ca && sk_X509_num(ca) && !SSL_CTX_add_extra_chain_cert(sslCtx_, ca)) {
A2_LOG_ERROR(fmt("Failed to use p12 file chain: %s",
ERR_error_string(ERR_get_error(), nullptr)));
return false;
} }
if (pkey) EVP_PKEY_free(pkey);
if (cert) X509_free(cert);
if (ca) sk_X509_pop_free(ca, X509_free);
if (!rv) { A2_LOG_INFO("Using certificate and key from p12 file");
A2_LOG_ERROR(fmt("Failed to use p12 file: %s", return true;
ERR_error_string(ERR_get_error(), nullptr)));
}
else {
A2_LOG_INFO("Using certificate and key from p12 file");
}
return rv;
} }
bool OpenSSLTLSContext::addSystemTrustedCACerts() bool OpenSSLTLSContext::addSystemTrustedCACerts()

2
src/LibsslTLSContext.h
View File

@ -55,7 +55,7 @@ public:
// private key `keyfile' must be decrypted. // private key `keyfile' must be decrypted.
virtual bool addCredentialFile(const std::string& certfile, virtual bool addCredentialFile(const std::string& certfile,
const std::string& keyfile) CXX11_OVERRIDE; const std::string& keyfile) CXX11_OVERRIDE;
virtual bool addP12CredentialFile(const std::string& p12file); bool addP12CredentialFile(const std::string& p12file);
virtual bool addSystemTrustedCACerts() CXX11_OVERRIDE; virtual bool addSystemTrustedCACerts() CXX11_OVERRIDE;