mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
8e87aecebf
7db7a009b0 proto: Client complains about stub compressors 390154d0e4 Update Build instructions for OSX 1b92069834 deps: Update to mbedtls-2.7.12 8cab79540d compression: Extend compression alert to include server pushes 67b4641a99 CompressContext: Add is_any_stub() method cdf9e7bece compression: Issue an Event if compression is activated fa38064403 build script: added a new PROF type "auto" that tries to automatically determine the local platform 7ce7b52b7c MTRand: added OPENVPN_INSECURE_RANDOM compile flag that allows MTRand to masquerade as a secure RNG 85e7e49f72 MTRand: added constructor accepting an initialization seed 1fa3229a10 IPv4, IPv6: added #include <openvpn/common/hash.hpp> 48e9217d26 vcxproj: add missing header file d2a2601b2f Wintun: unmap ring buffers e320bc63ff openssl: Improve OpenSSLContext fencing against multiple declarations 2f8fe2d318 openssl: Missing inline keyword in a couple of compat functions 32b984c0ff enum_dir: use a function template 725ee04593 VPNServerNetblock::Netblock::to_string(): show prefix_len 409d1c52b8 ManClientInstance::Send::describe_user(): added bool show_userprop parameter e05fc16b20 string::indent(): try to fix all the corner cases 4e1645ea80 RunContext: mark virtual Stop* async_stop() with override attribute e8b31c5454 cli: advertise "openurl" as supported SSO method 80b45731eb ICMPv6: added DEST_UNREACH code 679003094d AsioTimerSafe: refactor to allow as drop-in replacement for AsioTimer f7845578f1 RunContext: check for halt in timer closure 84483eda25 AsioPolySock: add support for socket shutdown 1b3402aec3 tcplinkcommon.hpp: added missing include 2e26c7565c time: added nanotime_t typedef c3c8ab7f6b string: added additional detail to split() comment 95ce4f22c8 string: added to_delim() method then redefined first_line() method to use it 448218b1e1 string: added add_leading() method e3b0bf4f5c MSF iterator: allow conversion from ordinary iterator and added exists() method 11412ac50a AsioPolySock: in remote_endpoint_str() method, test for alt_routing_enabled() 9fb4e705f9 Added TimeSkew to skew a time duration by a random flux 7496383002 write_binary_atomic: reduce the length of the temporary filename b31d9c0191 auth-token-user: increase size limit to 340 chars c82644c03a Added BufferLineIterator 115cb656b6 RandomAPI: added randbyte() and randbool() methods 4fa8348689 RunContext: ASIO SIGNAL message now shows signal name rather than number ebfce58513 Added StaticBuffer, a constant-length Buffer for writing that cannot be extended c8f9cb88a4 string::split(): call reserve() on return vector f15e566065 read_binary_unix_fast: should return an int (i.e. errno), not a bool 60501b4513 random: factor out rand32_distribute() from RandomAPI::randrange32() 90123495a5 wintun: get device interfaces list only once ec790df73b wintun: read packets in bulk 0f85d3f729 wintun: use correct io_context when performing initial read a6151cdeab wintun: use auto-reset events 29acfd95f3 libs: update ASIO to 1.14.0 438a0ef287 Remove outdated and unused android build files e9df57969f Merge remote-tracking branch 'origin/released' 44725ad094 ssl: Fix building with OpenSSL 1.0.2 efe3f1f635 version: Reset version reference for git master 8c79c06d94 Make tls-crypt/tls-cryptv2 compile with multiple compilation units 4d18aaeb88 Fix LLVM warnings reported during OS X build 8c9496bb4d Use const_cast for SSL_session_reused 33be562a39 Add missing override keywords to openssl/sslctx.hpp 2c5435a000 dcocli: use compile time define for Tun methods instead of hardcoded iproute 7c39088f00 Allow overriding reported HW_ADDR and support IV_PLAT_VER 7bb1ea19ee Move sending IV_UI_VER and IV_SSO to build_peer_info 23959fa705 Add reporting of IV_SSL_VER 63ab5b5e46 Only initialise static member in OpenSSLContext once ecebb40304 Merge remote-tracking branch 'origin/qa' 52c9702502 wintun: replace volatiles with atomics d720c7104c appveyor: install Strawberry perl 60a253a7ef appveyor: update to VS2019 48f2b5100b wintun: support for privilege separation 6f266be3d8 wintun: ring buffers support baa1ce2ccf vcxproj: bump VS version to 2019 98bfd037e3 tun/win: factor out ClientConfig into separate header aeb5ce0ad7 wintun: open device with SetupAPI 3998d303ce Finalizing the OpenVPN 3 Core library 3.3 release 728733aee7 deps/mbedtls: rebase "enable unsupported critical extensions" patch 43e36ca45a lib-version: update to mbedtls-2.7.11 4dbcd85e50 openssl/cipher.hpp: add missing include <compat.hpp> 69d72ed64f DCOTransport: Fix server side specific trunk handling ff732e3b5d Fix OpenVPN Core build with OpenSSL 1.1.0 0da42f393f Do not use deprecated OpenSSL 1.1.0 methods 35062c0b60 travis.yml: update environment 47046cf6d2 Merge branch 'qa' 6933c395a4 [OVPN3-423] cliconnect.hpp: fix reconnect on Windows after sleep 462c36c813 random_subnet(): added comment ac1d447156 IP::Addr::from_byte_string(): fixed bug for IPv6 case d6eaea3468 string::split(): minor implementation tweaks ca15b7cdf4 hexstr: added dump_hex() variant accepting void * 0e61a2afd7 SessionIDType::find_weak: added conflict parameter 089aec00b1 DCOTransport: new routing code for trunk links 5befbd430f build: added CAP=1 -- build with libcap eb85ada21e signals: added trivial signal_name() function f89013ef92 RunContext: don't try to catch SIGQUIT by default e0ee540135 SessionIDType: added hash() method f0e1f8aa42 logging: added basic components for logrotate fbb0c81f29 UMask: added UMaskDaemon, a umask context object appropriate for daemons 1c7bac90d9 build script: when building with DEBUG=1 on Linux, use -ggdb instead of -g 73cce80e43 OpenSSL: added openssl_reseed_rng() function 25780cf798 OpenSSL: fixed some memory leaks in CipherContextGCM and TokenEncrypt 168dba95f5 OpenSSL: define OPENSSL_SERVER_SNI when OpenSSL version is at least 1.1 84e78d8fed SNI: added OpenVPN client support for SNI (currently OpenSSL only) 310766b270 build: added MTLS_DIST setting 4eaa46a879 MbedTLS: added MBEDTLS_DISABLE_NAME_CONSTRAINTS preprocessor flag 16226d1b05 OpenSSLSign: updated for OpenSSL 1.1 aed0678c96 SSL: added SNI::Metadata, an abstract base class for packaging app-specific SNI metadata in AuthCert 001b731fe2 SNI: create SNI namespace and rename SNIHandlerBase -> SNI::HandlerBase 4bd5869305 README.rst: Make Windows-specific build steps up to date. ac365ee977 wintun: support for 0.4 9245056a2a wintun: support for 0.3 b73d484950 mbedtls: throw exception on unsupported SSL:Const::PEER_CERT_OPTIONAL option 1d6bae4b5b tcplinkcommon: bubble up real exception error c18c8bd156 tcpcli: ensure SSL Factory survives as long as TLS link 4192193087 tls: parse and load TLS specific CA 2a19b7fcff win/tuncli.hpp: fix Wintun padding calculation 44cb9f44da appveyor: make ReleaseOpenSSL default configuration 5485de19a2 win/impersonate: refactor impersonate logic 29a655147b win/tunsetup.hpp: remove unneeded parameter 61794b0efd win: link OpenSSL dynamically e569b84465 win/tuncli.hpp: fix indentation 374c57e708 frame_init.hpp: tweak wintun read buf size c3c45c9b38 tun: added Error::TUN_HALT for tun_error() signaling acd7af5e9a RandomAPI: added randrange32() method c1a7f8cc68 std::clamp() is useful but only available in C++17 and up, so we add our own clamp() f8c71ef1ce Minor change to Error::INACTIVE_TIMEOUT handler 3202ab5fce OpenSSLSign: renamed OpenSSLPKI::X509Base to OpenSSLPKI::X509 to conform to changes in OpenSSLPKI 8d767febb5 ReachabilityBase: added virtual destructor 6a4826965f MbedTLS: update json_override() prototype bee0d8d187 SSL: added SSLConst::SEND_CLIENT_CA_LIST server-side flag and implemented for OpenSSL 5eb39c1dea AuthCert: save the SNI name 3b34449d0e SSLAPI: auth_cert() can now be const a672e91631 SNI server-side: support additional JSON configuration settings 95e761f3cc OpenSSL PKI cleanup d5eb77c53c AuthCert::Fail cleanup 6e98b9aadc SSLAPI: move PKType from SSLConfigAPI into standalone header to avoid dependency inversion bbae814864 OpenSSL: added SNI implementation 5def1d23ab OpenSSLContext: in constructor, removed redundant if statement 1a0747e783 OpenSSLContext: in constructor, consolidate sslopt fixed flags eef9868816 OpenSSLContext::SSL::ssl_handshake_details(): include leaf-cert CN in details f9631cd90f AuthCert::Fail: use std::string for the reason string (instead of const char *) a17b77641f OpenSSLPKI::X509: copy constructor doesn't need erase() and define X509::Ptr 78cae5bb52 OpenSSLPKI::DH: copy constructor doesn't need erase() c0d43a4153 RCPtr: added static_pointer_cast() method 34a3f264f5 [OVPN-314] Add support for signalling SSO support via IV_SSO 7d112eb3e5 cli: enable utf8 console output 980ef1eff8 win/call.hpp: re-encode command output to utf8 fddb440e99 unicode.hpp: customize utf16 conversion routine 4d7c12ac4d [OVPN3-405] Support for non-ASCII profile path on Windows git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: 7db7a009b0b4eca0fc3733c99c50aff7f7c2556f
488 lines
14 KiB
C++
488 lines
14 KiB
C++
// OpenVPN -- An application to securely tunnel IP networks
|
|
// over a single port, with support for SSL/TLS-based
|
|
// session authentication and key exchange,
|
|
// packet encryption, packet authentication, and
|
|
// packet compression.
|
|
//
|
|
// Copyright (C) 2012-2017 OpenVPN Inc.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License Version 3
|
|
// as published by the Free Software Foundation.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program in the COPYING file.
|
|
// If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// A collection of functions for rendering and parsing hexadecimal strings
|
|
|
|
#ifndef OPENVPN_COMMON_HEXSTR_H
|
|
#define OPENVPN_COMMON_HEXSTR_H
|
|
|
|
#include <string>
|
|
#include <iomanip>
|
|
#include <sstream>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/string.hpp>
|
|
|
|
namespace openvpn {
|
|
|
|
/**
|
|
* Renders an integer value within the hexadecimal range (0-15)
|
|
* to a hexadecimal character.
|
|
*
|
|
* @param c Integer to render as a hexadecimal character.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a char with the hexadecimal representation of
|
|
* the input value. If the value is out-of-range (outside
|
|
* of 0-15), it will be replaced with a questionmark (?).
|
|
*/
|
|
inline char render_hex_char(const int c, const bool caps=false)
|
|
{
|
|
if (c < 10)
|
|
return '0' + c;
|
|
else if (c < 16)
|
|
return (caps ? 'A' : 'a') - 10 + c;
|
|
else
|
|
return '?';
|
|
}
|
|
|
|
|
|
/**
|
|
* Parses a character in the range {0..9,A-F,a-f} to an
|
|
* integer value. Used to convert hexadecimal character to integer.
|
|
* Only a single character is parsed by this function.
|
|
*
|
|
* @param c Character to be be parsed.
|
|
*
|
|
* @return Returns an integer value of the hexadecimal input. If the
|
|
* input character is invalid, outside of {0..9,A-F,a-f}, it will
|
|
* return -1.
|
|
*/
|
|
inline int parse_hex_char(const char c)
|
|
{
|
|
if (c >= '0' && c <= '9')
|
|
return c - '0';
|
|
else if (c >= 'a' && c <= 'f')
|
|
return c - 'a' + 10;
|
|
else if (c >= 'A' && c <= 'F')
|
|
return c - 'A' + 10;
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
|
|
/**
|
|
* Class which Renders a single byte as hexadecimal
|
|
*/
|
|
class RenderHexByte
|
|
{
|
|
public:
|
|
/**
|
|
* Initializes a new object
|
|
*
|
|
* @param byte Unsigned char (one byte) to be processed
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*/
|
|
RenderHexByte(const unsigned char byte, const bool caps=false)
|
|
{
|
|
c[0] = render_hex_char(byte >> 4, caps);
|
|
c[1] = render_hex_char(byte & 0x0F, caps);
|
|
}
|
|
|
|
char char1() const { return c[0]; }
|
|
char char2() const { return c[1]; }
|
|
|
|
/**
|
|
* Retrieve the hexadecimal representation of the value.
|
|
* Warning: The result is a non-NULL terminated string.
|
|
*
|
|
* @return Returns a non-NULL terminated 2 byte string with the hexadecimal
|
|
* representation of the initial value. The return value is guaranteed
|
|
* to always be 2 bytes.
|
|
*/
|
|
const char *str2() const { return c; } // Note: length=2, NOT null terminated
|
|
|
|
private:
|
|
char c[2];
|
|
};
|
|
|
|
|
|
/**
|
|
* Render a byte buffer (unsigned char *) as a hexadecimal string.
|
|
*
|
|
* @param data Unsigned char pointer to buffer to render.
|
|
* @param size size_t of the number of bytes to parse from the buffer.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string of the complete hexadecimal representation
|
|
*/
|
|
inline std::string render_hex(const unsigned char *data, size_t size, const bool caps=false)
|
|
{
|
|
if (!data)
|
|
return "NULL";
|
|
std::string ret;
|
|
ret.reserve(size*2+1);
|
|
while (size--)
|
|
{
|
|
const RenderHexByte b(*data++, caps);
|
|
ret += b.char1();
|
|
ret += b.char2();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
/**
|
|
* Render a byte buffer (void *) as a hexadecimal string.
|
|
*
|
|
* @param data Void pointer to buffer to render.
|
|
* @param size size_t of the number of bytes to parse from the buffer.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string of the complete hexadecimal representation.
|
|
*/
|
|
inline std::string render_hex(const void *data, const size_t size, const bool caps=false)
|
|
{
|
|
return render_hex((const unsigned char *)data, size, caps);
|
|
}
|
|
|
|
|
|
/**
|
|
* Variant of @render_hex(const unsiged char *,...) which adds a
|
|
* separator between each byte
|
|
*
|
|
* @param data Unsigned char pointer to buffer to render.
|
|
* @param size size_t of the number of bytes to parse from the buffer.
|
|
* @param sep A single character to use as the separator.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string of the complete hexadecimal representation
|
|
* with each byte separated by a given character.
|
|
*/
|
|
inline std::string render_hex_sep(const unsigned char *data, size_t size, const char sep, const bool caps=false)
|
|
{
|
|
if (!data)
|
|
return "NULL";
|
|
std::string ret;
|
|
ret.reserve(size*3);
|
|
bool prsep = false;
|
|
while (size--)
|
|
{
|
|
if (prsep)
|
|
ret += sep;
|
|
const RenderHexByte b(*data++, caps);
|
|
ret += b.char1();
|
|
ret += b.char2();
|
|
prsep = true;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Variant of @render_hex(const void *,...) which adds a
|
|
* separator between each byte
|
|
|
|
* @param data Void pointer to buffer to render.
|
|
* @param size size_t of the number of bytes to parse from the buffer.
|
|
* @param sep A single character to use as the separator.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string of the complete hexadecimal representation
|
|
* with each byte separated by a given character.
|
|
*/
|
|
inline std::string render_hex_sep(const void *data, const size_t size, const char sep, const bool caps=false)
|
|
{
|
|
return render_hex_sep((const unsigned char *)data, size, sep, caps);
|
|
}
|
|
|
|
|
|
/**
|
|
* Render a std::vector<T> container as a hexadecimal string.
|
|
* T must be a data type compatible with
|
|
* RenderHexByte(const unsigned char,...)
|
|
*
|
|
* @param data std::vector<T> containing the data to render
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string of the complete hexadecimal representation.
|
|
*/
|
|
template <typename V>
|
|
inline std::string render_hex_generic(const V& data, const bool caps=false)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(data.size()*2+1);
|
|
for (size_t i = 0; i < data.size(); ++i)
|
|
{
|
|
const RenderHexByte b(data[i], caps);
|
|
ret += b.char1();
|
|
ret += b.char2();
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
|
|
/**
|
|
* Renders a combined hexadecimal and character dump of a buffer,
|
|
* with the typical 16 bytes split between hexadecimal and character
|
|
* separation per line.
|
|
*
|
|
* @param data Unsigned char pointer to the buffer to dump.
|
|
* @param size Size of the buffer to render.
|
|
*
|
|
* @return Returns a string containing a preformatted output of the
|
|
* hexadecimal dump.
|
|
*/
|
|
inline std::string dump_hex(const unsigned char *data, size_t size)
|
|
{
|
|
if (!data)
|
|
return "NULL\n";
|
|
const unsigned int mask = 0x0F; // N bytes per line - 1
|
|
std::ostringstream os;
|
|
os << std::hex;
|
|
std::string chars;
|
|
size_t i;
|
|
for (i = 0; i < size; ++i)
|
|
{
|
|
if (!(i & mask))
|
|
{
|
|
if (i)
|
|
{
|
|
os << " " << chars << std::endl;
|
|
chars.clear();
|
|
}
|
|
os << std::setfill(' ') << std::setw(8) << i << ":";
|
|
}
|
|
const unsigned char c = data[i];
|
|
os << ' ' << std::setfill('0') << std::setw(2) << (unsigned int)c;
|
|
if (string::is_printable(c))
|
|
chars += c;
|
|
else
|
|
chars += '.';
|
|
}
|
|
if (i)
|
|
os << string::spaces(2 + (((i-1) & mask) ^ mask) * 3) << chars << std::endl;
|
|
return os.str();
|
|
}
|
|
|
|
/**
|
|
* Renders a combined hexadecimal and character dump of a buffer,
|
|
* with the typical 16 bytes split between hexadecimal and character
|
|
* separation per line.
|
|
*
|
|
* @param data Void pointer to the buffer to dump.
|
|
* @param size Size of the buffer to render.
|
|
*
|
|
* @return Returns a string containing a preformatted output of the
|
|
* hexadecimal dump.
|
|
*/
|
|
inline std::string dump_hex(void* data, size_t size)
|
|
{
|
|
return dump_hex((const unsigned char *)data, size);
|
|
}
|
|
|
|
/**
|
|
* Renders a combined hexadecimal and character dump of a std::string buffer,
|
|
* with the typical 16 bytes split between hexadecimal and character
|
|
* separation per line.
|
|
*
|
|
* @param data std::string containing the buffer to render
|
|
*
|
|
* @return Returns a string containing a preformatted output of the
|
|
* hexadecimal dump.
|
|
*/
|
|
inline std::string dump_hex(const std::string& str)
|
|
{
|
|
return dump_hex((const unsigned char *)str.c_str(), str.length());
|
|
}
|
|
|
|
|
|
/**
|
|
* Renders a combined hexadecimal and character dump of a std::vector<T>
|
|
* based buffer, with the typical 16 bytes split between hexadecimal and
|
|
* character separation per line.
|
|
*
|
|
* @param data std::vector<T> containing the buffer to render
|
|
*
|
|
* @return Returns a string containing a preformatted output of the
|
|
* hexadecimal dump.
|
|
*/
|
|
template <typename V>
|
|
inline std::string dump_hex(const V& data)
|
|
{
|
|
return dump_hex(data.c_data(), data.size());
|
|
}
|
|
|
|
/**
|
|
* Declaration of a hexadecimal parsing error exception class
|
|
*/
|
|
OPENVPN_SIMPLE_EXCEPTION(parse_hex_error);
|
|
|
|
|
|
/**
|
|
* Parses a std::string containing a hexadecimal value into
|
|
* a std::vector<T>.
|
|
*
|
|
* @param dest std::vector<T> destination buffer to use.
|
|
* @param str std::string& containing the hexadecimal string to parse.
|
|
*
|
|
* @return Returns nothing on success. Will throw a parse_hex_error
|
|
* exception if the input is invalid/not parseable as a hexadecimal
|
|
* number.
|
|
*/
|
|
template <typename V>
|
|
inline void parse_hex(V& dest, const std::string& str)
|
|
{
|
|
const int len = int(str.length());
|
|
int i;
|
|
for (i = 0; i <= len - 2; i += 2)
|
|
{
|
|
const int high = parse_hex_char(str[i]);
|
|
const int low = parse_hex_char(str[i+1]);
|
|
if (high == -1 || low == -1)
|
|
throw parse_hex_error();
|
|
dest.push_back((high<<4) + low);
|
|
}
|
|
if (i != len)
|
|
throw parse_hex_error(); // straggler char
|
|
}
|
|
|
|
|
|
/**
|
|
* Parses a char buffer (C string) containing a hexadecimal
|
|
* string into a templated (T) variable. The input buffer
|
|
* MUST be NULL terminated.
|
|
*
|
|
* WARNING: There are _NO_ overflow checks.
|
|
*
|
|
* @param str Char pointer (char *) to the buffer to be parsed.
|
|
* @param retval Return buffer where the parsed value is stored.
|
|
*
|
|
* @return Returns true on successful parsing, otherwise false.
|
|
*/
|
|
template <typename T>
|
|
inline bool parse_hex_number(const char *str, T& retval)
|
|
{
|
|
if (!str[0])
|
|
return false; // empty string
|
|
size_t i = 0;
|
|
T ret = T(0);
|
|
while (true)
|
|
{
|
|
const char c = str[i++];
|
|
const int hd = parse_hex_char(c);
|
|
if (hd >= 0)
|
|
{
|
|
ret *= T(16);
|
|
ret += T(hd);
|
|
}
|
|
else if (!c)
|
|
{
|
|
retval = ret;
|
|
return true;
|
|
}
|
|
else
|
|
return false; // non-hex-digit
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Variant of @parse_hex_number(const char *, ...) which takes a std::string
|
|
* as the input.
|
|
*
|
|
* @param str std::string containing the hexadecimal string to be parsed.
|
|
* @param retval Return buffer where the parsed value is stored.
|
|
*
|
|
* @return Returns true on successful parsing, otherwise false.
|
|
*/
|
|
template <typename T>
|
|
inline bool parse_hex_number(const std::string& str, T& retval)
|
|
{
|
|
return parse_hex_number(str.c_str(), retval);
|
|
}
|
|
|
|
|
|
/**
|
|
* Parses a std::string containing a hexadecimal
|
|
* string into a templated (T) variable.
|
|
*
|
|
* NOTE: Currently doesn't detect overflow
|
|
*
|
|
* @param str std::string containing the hexadecimal
|
|
* string to be parsed.
|
|
*
|
|
* @return Returns a template T variable containing the
|
|
* parsed value on success. Will throw the parse_hex_error
|
|
* exception on parsing errors.
|
|
*
|
|
*/
|
|
template <typename T>
|
|
inline T parse_hex_number(const std::string& str)
|
|
{
|
|
T ret;
|
|
if (!parse_hex_number<T>(str.c_str(), ret))
|
|
throw parse_hex_error();
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Renders a templated T variable containing a numeric value
|
|
* into a std::string containing a hexadecimal representation.
|
|
*
|
|
* @param value Numeric (T) value to represent as hexadecimal.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Retuns a std::string containing the hexadecimal
|
|
* representation on succes. Will throw a parse_hex_error
|
|
* exception on parsing errors.
|
|
*/
|
|
template <typename T>
|
|
std::string render_hex_number(T value, const bool caps=false)
|
|
{
|
|
unsigned char buf[sizeof(T)];
|
|
for (size_t i = sizeof(T); i --> 0 ;)
|
|
{
|
|
buf[i] = value & 0xFF;
|
|
value >>= 8;
|
|
}
|
|
return render_hex(buf, sizeof(T), caps);
|
|
}
|
|
|
|
|
|
/**
|
|
* Renders a single byte as a hexadecimal string
|
|
*
|
|
* @param value Unsigned char (byte) to be represented as hexadecimal.
|
|
* @param caps Boolean (default false) which sets the outout to
|
|
* be either lower case (false) or upper case (true).
|
|
*
|
|
* @return Returns a std::string with the hexadecimal representation
|
|
* of the input value. The result will always contain only
|
|
* two characters.
|
|
*/
|
|
inline std::string render_hex_number(unsigned char uc, const bool caps=false)
|
|
{
|
|
RenderHexByte b(uc, caps);
|
|
return std::string(b.str2(), 2);
|
|
}
|
|
|
|
} // namespace openvpn
|
|
|
|
#endif // OPENVPN_COMMON_HEXSTR_H
|