github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-12-18 05:15:54 +01:00
Code Releases Activity

Merge pull request #2933

Browse Source 
1e7d829 openpgp: fix gcc 5.4.0 compilation (xiphon)
This commit is contained in:
luigi1111 2020-06-19 16:56:05 -05:00
commit 3fee17e564
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openpgp/hash.h
View File

@ -48,10 +48,10 @@ public:
hash &operator=(const hash &) = delete;
hash(uint8_t algorithm)
: algorithm(algorithm)
: algo(algorithm)
, consumed(0)
{
if (gcry_md_open(&md, algorithm, 0) != GPG_ERR_NO_ERROR)
if (gcry_md_open(&md, algo, 0) != GPG_ERR_NO_ERROR)
{
throw std::runtime_error("failed to create message digest object");
}
@ -83,8 +83,8 @@ public:
std::vector<uint8_t> finish() const
{
std::vector<uint8_t> result(gcry_md_get_algo_dlen(algorithm));
const void *digest = gcry_md_read(md, algorithm);
std::vector<uint8_t> result(gcry_md_get_algo_dlen(algo));
const void *digest = gcry_md_read(md, algo);
if (digest == nullptr)
{
throw std::runtime_error("failed to read the digest");
@ -99,7 +99,7 @@ public:
}
private:
const uint8_t algorithm;
const uint8_t algo;
gcry_md_hd_t md;
size_t consumed;
};

4
src/openpgp/openpgp.cpp
View File

@ -139,7 +139,7 @@ public_key_block::public_key_block(const epee::span<const uint8_t> buffer)
/* const auto timestamp = */ serialized.read_big_endian<uint32_t>();
const auto algorithm = serialized.read_big_endian<uint8_t>();
if (algorithm != algorithm::rsa)
if (algorithm != openpgp::algorithm::rsa)
{
throw std::runtime_error("unsupported public key algorithm");
}
@ -219,7 +219,7 @@ signature_rsa signature_rsa::from_buffer(const epee::span<const uint8_t> input)
const auto signature_type = static_cast<type>(buffer.read_big_endian<uint8_t>());
const auto algorithm = buffer.read_big_endian<uint8_t>();
if (algorithm != algorithm::rsa)
if (algorithm != openpgp::algorithm::rsa)
{
throw std::runtime_error("unsupported signature algorithm");
}