ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-26 13:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert throws and catch alls (RIPD-1046)

Browse Source
This commit is contained in:
Miguel Portilla
2015-11-11 10:47:21 -05:00
committed by Nik Bougalis
parent 0633ef1ba1
commit 880f354b90
127 changed files with 786 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/ripple/basics/impl/make_SSLContext.cpp
View File

@@ -18,8 +18,9 @@
//==============================================================================
#include <BeastConfig.h>
#include <ripple/basics/make_SSLContext.h>
#include <ripple/basics/chrono.h>
#include <ripple/basics/contract.h>
#include <ripple/basics/make_SSLContext.h>
#include <beast/container/aged_unordered_set.h>
#include <beast/module/core/diagnostic/FatalError.h>
#include <cstdint>
@@ -81,9 +82,7 @@ static rsa_ptr rsa_generate_key (int n_bits)
RSA* rsa = RSA_generate_key (n_bits, RSA_F4, nullptr, nullptr);
if (rsa == nullptr)
{
throw std::runtime_error ("RSA_generate_key failed");
}
Throw<std::runtime_error> ("RSA_generate_key failed");
return rsa_ptr (rsa);
}
@@ -97,9 +96,7 @@ static evp_pkey_ptr evp_pkey_new()
EVP_PKEY* evp_pkey = EVP_PKEY_new();
if (evp_pkey == nullptr)
{
throw std::runtime_error ("EVP_PKEY_new failed");
}
Throw<std::runtime_error> ("EVP_PKEY_new failed");
return evp_pkey_ptr (evp_pkey);
}
@@ -107,9 +104,7 @@ static evp_pkey_ptr evp_pkey_new()
static void evp_pkey_assign_rsa (EVP_PKEY* evp_pkey, rsa_ptr&& rsa)
{
if (! EVP_PKEY_assign_RSA (evp_pkey, rsa.get()))
{
throw std::runtime_error ("EVP_PKEY_assign_RSA failed");
}
Throw<std::runtime_error> ("EVP_PKEY_assign_RSA failed");
rsa.release();
}
@@ -123,9 +118,7 @@ static x509_ptr x509_new()
X509* x509 = X509_new();
if (x509 == nullptr)
{
throw std::runtime_error ("X509_new failed");
}
Throw<std::runtime_error> ("X509_new failed");
X509_set_version (x509, NID_X509);
@@ -146,25 +139,19 @@ static void x509_set_pubkey (X509* x509, EVP_PKEY* evp_pkey)
static void x509_sign (X509* x509, EVP_PKEY* evp_pkey)
{
if (! X509_sign (x509, evp_pkey, EVP_sha1()))
{
throw std::runtime_error ("X509_sign failed");
}
Throw<std::runtime_error> ("X509_sign failed");
}
static void ssl_ctx_use_certificate (SSL_CTX* const ctx, x509_ptr& cert)
{
if (SSL_CTX_use_certificate (ctx, cert.release()) <= 0)
{
throw std::runtime_error ("SSL_CTX_use_certificate failed");
}
Throw<std::runtime_error> ("SSL_CTX_use_certificate failed");
}
static void ssl_ctx_use_privatekey (SSL_CTX* const ctx, evp_pkey_ptr& key)
{
if (SSL_CTX_use_PrivateKey (ctx, key.release()) <= 0)
{
throw std::runtime_error ("SSL_CTX_use_PrivateKey failed");
}
Throw<std::runtime_error> ("SSL_CTX_use_PrivateKey failed");
}
// track when SSL connections have last negotiated
@@ -406,7 +393,7 @@ initAnonymous (
context.native_handle (),
cipherList.c_str ());
if (result != 1)
throw std::invalid_argument("SSL_CTX_set_cipher_list failed");
Throw<std::invalid_argument> ("SSL_CTX_set_cipher_list failed");
using namespace openssl;
@@ -490,7 +477,7 @@ initAuthenticated (boost::asio::ssl::context& context,
fclose (f);
}
catch (...)
catch (std::exception const&)
{
fclose (f);
beast::FatalError ("Reading the SSL chain file generated an exception.",