aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/vendor
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-02-22 16:07:08 +0000
committerlloyd <[email protected]>2015-02-22 16:07:08 +0000
commita29ea0e7a493b0076cd9c91b2a89d7452b9f90d8 (patch)
tree85793121afc24bafb72b3a51f0c31d94e6acb2fa /src/lib/vendor
parent5ef7108d620a00ce5b2f6997c8b6ffc0708467d6 (diff)
Amalgamation fixes; inline the poly1305 header and :: namespace OpenSSL funcs
Diffstat (limited to 'src/lib/vendor')
-rw-r--r--src/lib/vendor/openssl/openssl_rc4.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/vendor/openssl/openssl_rc4.cpp b/src/lib/vendor/openssl/openssl_rc4.cpp
index 966aecd66..9a11ca949 100644
--- a/src/lib/vendor/openssl/openssl_rc4.cpp
+++ b/src/lib/vendor/openssl/openssl_rc4.cpp
@@ -31,12 +31,12 @@ class OpenSSL_RC4 : public StreamCipher
private:
void cipher(const byte in[], byte out[], size_t length)
{
- RC4(&m_rc4, length, in, out);
+ ::RC4(&m_rc4, length, in, out);
}
void key_schedule(const byte key[], size_t length)
{
- RC4_set_key(&m_rc4, length, key);
+ ::RC4_set_key(&m_rc4, length, key);
}
RC4_KEY m_rc4;