mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

Separated out class HashString from HTTPProxy::Digest, making

Browse Source 
it standalone for use by other code.
This commit is contained in:
James Yonan 2016-03-08 13:16:52 -07:00
parent 1e907bc0e6
commit e3e903c3b6
2 changed files with 80 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
openvpn/crypto/hashstr.hpp Normal file
View File

@ -0,0 +1,79 @@
// 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-2015 OpenVPN Technologies, 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/>.
#ifndef OPENVPN_CRYPTO_HASHSTR_H
#define OPENVPN_CRYPTO_HASHSTR_H
#include <string>
#include <openvpn/buffer/buffer.hpp>
#include <openvpn/common/hexstr.hpp>
#include <openvpn/crypto/digestapi.hpp>
namespace openvpn {
class HashString
{
public:
HashString(DigestFactory& digest_factory,
const CryptoAlgs::Type digest_type)
: ctx(digest_factory.new_digest(digest_type))
{
}
void update(const std::string& str)
{
ctx->update((unsigned char *)str.c_str(), str.length());
}
void update(const char *str)
{
ctx->update((unsigned char *)str, std::strlen(str));
}
void update(const char c)
{
ctx->update((unsigned char *)&c, 1);
}
void update(const Buffer& buf)
{
ctx->update(buf.c_data(), buf.size());
}
BufferPtr final()
{
BufferPtr ret(new BufferAllocated(ctx->size(), BufferAllocated::ARRAY));
ctx->final(ret->data());
return ret;
}
std::string final_hex()
{
BufferPtr bp = final();
return render_hex_generic(*bp);
}
private:
DigestInstance::Ptr ctx;
};
}
#endif

50
openvpn/proxy/httpdigest.hpp
View File

@ -27,61 +27,13 @@
#include <cstring> // for std::strlen and others
#include <string>
#include <openvpn/buffer/buffer.hpp>
#include <openvpn/common/hexstr.hpp>
#include <openvpn/crypto/digestapi.hpp>
#include <openvpn/crypto/hashstr.hpp>
namespace openvpn {
namespace HTTPProxy {
class Digest
{
class HashString
{
public:
HashString(DigestFactory& digest_factory,
const CryptoAlgs::Type digest_type)
: ctx(digest_factory.new_digest(digest_type))
{
}
void update(const std::string& str)
{
ctx->update((unsigned char *)str.c_str(), str.length());
}
void update(const char *str)
{
ctx->update((unsigned char *)str, std::strlen(str));
}
void update(const char c)
{
ctx->update((unsigned char *)&c, 1);
}
void update(const Buffer& buf)
{
ctx->update(buf.c_data(), buf.size());
}
BufferPtr final()
{
BufferPtr ret(new BufferAllocated(ctx->size(), BufferAllocated::ARRAY));
ctx->final(ret->data());
return ret;
}
std::string final_hex()
{
BufferPtr bp = final();
return render_hex_generic(*bp);
}
private:
DigestInstance::Ptr ctx;
};
public:
// calculate H(A1) as per spec
static std::string calcHA1(DigestFactory& digest_factory,