You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2017/06/13 20:28:00 UTC
svn commit: r1798638 - in /apr/apr-util/branches/1.6.x: crypto/apr_crypto.c
crypto/apr_siphash.c include/apr_crypto.h include/apr_siphash.h
Author: wrowe
Date: Tue Jun 13 20:28:00 2017
New Revision: 1798638
URL: http://svn.apache.org/viewvc?rev=1798638&view=rev
Log:
Correct APU exports; likely missed due to the fact that
these are APR_DECLARE in the APR 2.0 branch, where all
components are exported in a single loadable library.
Reported by: Brecht Sanders <brecht sanders.org>
Modified:
apr/apr-util/branches/1.6.x/crypto/apr_crypto.c
apr/apr-util/branches/1.6.x/crypto/apr_siphash.c
apr/apr-util/branches/1.6.x/include/apr_crypto.h
apr/apr-util/branches/1.6.x/include/apr_siphash.h
Modified: apr/apr-util/branches/1.6.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/crypto/apr_crypto.c?rev=1798638&r1=1798637&r2=1798638&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.6.x/crypto/apr_crypto.c Tue Jun 13 20:28:00 2017
@@ -151,7 +151,7 @@ void apr__memzero_explicit(void *buffer,
}
#endif
-APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size)
+APU_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size)
{
#if defined(WIN32)
SecureZeroMemory(buffer, size);
@@ -173,7 +173,7 @@ APR_DECLARE(apr_status_t) apr_crypto_mem
return APR_SUCCESS;
}
-APR_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
+APU_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
apr_size_t size)
{
const unsigned char *p1 = buf1;
@@ -386,7 +386,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
* not known. APR_EPADDING if padding was requested but is not supported.
* APR_ENOTIMPL if not implemented.
*/
-APR_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
+APU_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
const apr_crypto_key_rec_t *rec, const apr_crypto_t *f, apr_pool_t *p)
{
return f->provider->key(key, rec, f, p);
Modified: apr/apr-util/branches/1.6.x/crypto/apr_siphash.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/crypto/apr_siphash.c?rev=1798638&r1=1798637&r2=1798638&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/crypto/apr_siphash.c (original)
+++ apr/apr-util/branches/1.6.x/crypto/apr_siphash.c Tue Jun 13 20:28:00 2017
@@ -95,7 +95,7 @@ do { \
r = v0 ^ v1 ^ v2 ^ v3; \
} while (0)
-APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE],
unsigned int c, unsigned int d)
{
@@ -118,7 +118,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash(co
return h;
}
-APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE],
unsigned int c, unsigned int d)
@@ -128,7 +128,7 @@ APR_DECLARE(void) apr_siphash_auth(unsig
U64TO8_LE(out, h);
}
-APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE])
{
apr_uint64_t h;
@@ -149,7 +149,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash24(
return h;
}
-APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE])
{
@@ -158,7 +158,7 @@ APR_DECLARE(void) apr_siphash24_auth(uns
U64TO8_LE(out, h);
}
-APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE])
{
apr_uint64_t h;
@@ -185,7 +185,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash48(
return h;
}
-APR_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE])
{
Modified: apr/apr-util/branches/1.6.x/include/apr_crypto.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/include/apr_crypto.h?rev=1798638&r1=1798637&r2=1798638&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/include/apr_crypto.h (original)
+++ apr/apr-util/branches/1.6.x/include/apr_crypto.h Tue Jun 13 20:28:00 2017
@@ -194,7 +194,7 @@ APU_DECLARE(apr_status_t) apr_crypto_cle
* @param buffer - buffer to zero out
* @param size - size of the buffer to zero out
*/
-APR_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size);
+APU_DECLARE(apr_status_t) apr_crypto_memzero(void *buffer, apr_size_t size);
/**
* @brief Timing attacks safe buffers comparison, where the executing time does
@@ -205,7 +205,7 @@ APR_DECLARE(apr_status_t) apr_crypto_mem
* @param size - size of the buffers to compare
* @return 1 if the buffers are equals, 0 otherwise.
*/
-APR_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
+APU_DECLARE(int) apr_crypto_equals(const void *buf1, const void *buf2,
apr_size_t size);
/**
@@ -309,7 +309,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
* not known. APR_EPADDING if padding was requested but is not supported.
* APR_ENOTIMPL if not implemented.
*/
-APR_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
+APU_DECLARE(apr_status_t) apr_crypto_key(apr_crypto_key_t **key,
const apr_crypto_key_rec_t *rec, const apr_crypto_t *f, apr_pool_t *p);
/**
Modified: apr/apr-util/branches/1.6.x/include/apr_siphash.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/include/apr_siphash.h?rev=1798638&r1=1798637&r2=1798638&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/include/apr_siphash.h (original)
+++ apr/apr-util/branches/1.6.x/include/apr_siphash.h Tue Jun 13 20:28:00 2017
@@ -66,7 +66,7 @@ extern "C" {
* @param d The number of finalization rounds
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE],
unsigned int c, unsigned int d);
@@ -83,7 +83,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash(co
* @param d The number of finalization rounds
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE],
unsigned int c, unsigned int d);
@@ -96,7 +96,7 @@ APR_DECLARE(void) apr_siphash_auth(unsig
* @param key The secret key
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash24(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE]);
/**
@@ -110,7 +110,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash24(
* @param key The secret key
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash24_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE]);
@@ -122,7 +122,7 @@ APR_DECLARE(void) apr_siphash24_auth(uns
* @param key The secret key
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
+APU_DECLARE(apr_uint64_t) apr_siphash48(const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE]);
/**
@@ -136,7 +136,7 @@ APR_DECLARE(apr_uint64_t) apr_siphash48(
* @param key The secret key
* @return The hash value as a 64bit unsigned integer
*/
-APR_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
+APU_DECLARE(void) apr_siphash48_auth(unsigned char out[APR_SIPHASH_DSIZE],
const void *src, apr_size_t len,
const unsigned char key[APR_SIPHASH_KSIZE]);