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 2003/11/17 00:49:15 UTC
cvs commit: apr/test Makefile.win testall.dsp testrand2.c
wrowe 2003/11/16 15:49:15
Modified: . apr.dsp configure.in
include apr.h.in apr.hnw apr.hw apr_random.h
random/unix apr_random.c sha2.c sha2_glue.c
test Makefile.win testall.dsp testrand2.c
Log:
With the exception of some intersting(1) output from testall random2,
Win32 APR1.0 now builds with apr_random.
Required us to compliment APR_INT64_C with a corresponding APR_UINT64_C,
and finish up Brad's efforts to APR_DECLARE() the various entry points.
Revision Changes Path
1.128 +16 -0 apr/apr.dsp
Index: apr.dsp
===================================================================
RCS file: /home/cvs/apr/apr.dsp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- apr.dsp 28 Sep 2003 16:46:29 -0000 1.127
+++ apr.dsp 16 Nov 2003 23:49:14 -0000 1.128
@@ -297,6 +297,22 @@
SOURCE=.\passwd\apr_getpass.c
# End Source File
# End Group
+# Begin Group "random"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\random\unix\apr_random.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\random\unix\sha2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\random\unix\sha2_glue.c
+# End Source File
+# End Group
# Begin Group "shmem"
# PROP Default_Filter ""
1.552 +7 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- configure.in 6 Nov 2003 09:18:22 -0000 1.551
+++ configure.in 16 Nov 2003 23:49:14 -0000 1.552
@@ -1051,6 +1051,7 @@
# The first match is our preference.
if test "$ac_cv_sizeof_int" = "8"; then
int64_literal='#define APR_INT64_C(val) (val)'
+ uint64_literal='#define APR_UINT64_C(val) (val)'
int64_t_fmt='#define APR_INT64_T_FMT "d"'
uint64_t_fmt='#define APR_UINT64_T_FMT "u"'
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "x"'
@@ -1059,6 +1060,7 @@
int64_strfn="strtoi"
elif test "$ac_cv_sizeof_long" = "8"; then
int64_literal='#define APR_INT64_C(val) (val##L)'
+ uint64_literal='#define APR_UINT64_C(val) (val##UL)'
int64_t_fmt='#define APR_INT64_T_FMT "ld"'
uint64_t_fmt='#define APR_UINT64_T_FMT "lu"'
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "lx"'
@@ -1067,6 +1069,7 @@
int64_strfn="strtol"
elif test "$ac_cv_sizeof_long_long" = "8"; then
int64_literal='#define APR_INT64_C(val) (val##LL)'
+ uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
# Linux, Solaris, FreeBSD all support ll with printf.
# BSD 4.4 originated 'q'. Solaris is more popular and
# doesn't support 'q'. Solaris wins. Exceptions can
@@ -1079,6 +1082,7 @@
int64_strfn="strtoll"
elif test "$ac_cv_sizeof_long_double" = "8"; then
int64_literal='#define APR_INT64_C(val) (val##LD)'
+ uint64_literal='#define APR_UINT64_C(val) (val##ULD)'
int64_t_fmt='#define APR_INT64_T_FMT "Ld"'
uint64_t_fmt='#define APR_UINT64_T_FMT "Lu"'
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "Lx"'
@@ -1087,6 +1091,7 @@
int64_strfn="strtoll"
elif test "$ac_cv_sizeof_longlong" = "8"; then
int64_literal='#define APR_INT64_C(val) (val##LL)'
+ uint64_literal='#define APR_UINT64_C(val) (val##ULL)'
int64_t_fmt='#define APR_INT64_T_FMT "qd"'
uint64_t_fmt='#define APR_UINT64_T_FMT "qu"'
uint64_t_hex_fmt='#define APR_UINT64_T_HEX_FMT "qx"'
@@ -1116,6 +1121,7 @@
if test "$apr_cv_define_INT64_C" = "yes"; then
int64_literal='#define APR_INT64_C(val) INT64_C(val)'
+ uint64_literal='#define APR_UINT64_C(val) UINT64_C(val##U)'
stdint=1
else
stdint=0
@@ -1249,6 +1255,7 @@
AC_SUBST(off_t_fmt)
AC_SUBST(pid_t_fmt)
AC_SUBST(int64_literal)
+AC_SUBST(uint64_literal)
AC_SUBST(stdint)
AC_SUBST(bigendian)
1.131 +1 -0 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- apr.h.in 5 Nov 2003 13:34:52 -0000 1.130
+++ apr.h.in 16 Nov 2003 23:49:14 -0000 1.131
@@ -310,6 +310,7 @@
/* Mechanisms to properly type numeric literals */
@int64_literal@
+@uint64_literal@
/* Definitions that APR programs need to work properly. */
1.39 +3 -1 apr/include/apr.hnw
Index: apr.hnw
===================================================================
RCS file: /home/cvs/apr/include/apr.hnw,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- apr.hnw 17 Oct 2003 20:23:38 -0000 1.38
+++ apr.hnw 16 Nov 2003 23:49:14 -0000 1.39
@@ -274,9 +274,11 @@
/* Mechanisms to properly type numeric literals */
#ifdef __GNUC__
-#define APR_INT64_C(val) (val)
+#define APR_INT64_C(val) (val##LL)
+#define APR_UINT64_C(val) (val##ULL)
#else
#define APR_INT64_C(val) (val##i64)
+#define APR_UINT64_C(val) (val##Ui64)
#endif
/* PROC mutex is a GLOBAL mutex on Netware */
1.119 +1 -0 apr/include/apr.hw
Index: apr.hw
===================================================================
RCS file: /home/cvs/apr/include/apr.hw,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- apr.hw 14 Oct 2003 23:47:29 -0000 1.118
+++ apr.hw 16 Nov 2003 23:49:14 -0000 1.119
@@ -388,6 +388,7 @@
/* Mechanisms to properly type numeric literals */
#define APR_INT64_C(val) (val##i64)
+#define APR_UINT64_C(val) (val##Ui64)
#if APR_HAVE_IPV6
1.7 +12 -8 apr/include/apr_random.h
Index: apr_random.h
===================================================================
RCS file: /home/cvs/apr/include/apr_random.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_random.h 11 Nov 2003 22:03:00 -0000 1.6
+++ apr_random.h 16 Nov 2003 23:49:14 -0000 1.7
@@ -79,15 +79,19 @@
typedef struct apr_random_t apr_random_t;
APR_DECLARE(void) apr_random_init(apr_random_t *g,apr_pool_t *p,
- apr_crypto_hash_t *pool_hash,apr_crypto_hash_t *key_hash,
- apr_crypto_hash_t *prng_hash);
+ apr_crypto_hash_t *pool_hash,
+ apr_crypto_hash_t *key_hash,
+ apr_crypto_hash_t *prng_hash);
APR_DECLARE(apr_random_t *) apr_random_standard_new(apr_pool_t *p);
-APR_DECLARE(void) apr_random_add_entropy(apr_random_t *g,const void *entropy_,
- apr_size_t bytes);
-APR_DECLARE(apr_status_t) apr_random_insecure_bytes(apr_random_t *g,void *random,
- apr_size_t bytes);
-APR_DECLARE(apr_status_t) apr_random_secure_bytes(apr_random_t *g,void *random,
- apr_size_t bytes);
+APR_DECLARE(void) apr_random_add_entropy(apr_random_t *g,
+ const void *entropy_,
+ apr_size_t bytes);
+APR_DECLARE(apr_status_t) apr_random_insecure_bytes(apr_random_t *g,
+ void *random,
+ apr_size_t bytes);
+APR_DECLARE(apr_status_t) apr_random_secure_bytes(apr_random_t *g,
+ void *random,
+ apr_size_t bytes);
APR_DECLARE(void) apr_random_barrier(apr_random_t *g);
APR_DECLARE(apr_status_t) apr_random_secure_ready(apr_random_t *r);
APR_DECLARE(apr_status_t) apr_random_insecure_ready(apr_random_t *r);
1.7 +20 -14 apr/random/unix/apr_random.c
Index: apr_random.c
===================================================================
RCS file: /home/cvs/apr/random/unix/apr_random.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_random.c 6 Nov 2003 16:26:09 -0000 1.6
+++ apr_random.c 16 Nov 2003 23:49:15 -0000 1.7
@@ -61,6 +61,9 @@
#include "apr_thread_proc.h"
#include <assert.h>
+#ifdef min
+#undef min
+#endif
#define min(a,b) ((a) < (b) ? (a) : (b))
#define APR_RANDOM_DEFAULT_POOLS 32
@@ -118,9 +121,10 @@
static apr_random_t *all_random;
-void apr_random_init(apr_random_t *g,apr_pool_t *p,
- apr_crypto_hash_t *pool_hash,apr_crypto_hash_t *key_hash,
- apr_crypto_hash_t *prng_hash)
+APR_DECLARE(void) apr_random_init(apr_random_t *g,apr_pool_t *p,
+ apr_crypto_hash_t *pool_hash,
+ apr_crypto_hash_t *key_hash,
+ apr_crypto_hash_t *prng_hash)
{
int n;
@@ -185,7 +189,7 @@
g->random_bytes = 0;
}
-void apr_random_after_fork(apr_proc_t *proc)
+APR_DECLARE(void) apr_random_after_fork(apr_proc_t *proc)
{
apr_random_t *r;
@@ -193,7 +197,7 @@
mixer(r,proc->pid);
}
-apr_random_t *apr_random_standard_new(apr_pool_t *p)
+APR_DECLARE(apr_random_t *) apr_random_standard_new(apr_pool_t *p)
{
apr_random_t *r = apr_palloc(p,sizeof *r);
@@ -231,8 +235,8 @@
}
}
-void apr_random_add_entropy(apr_random_t *g,const void *entropy_,
- apr_size_t bytes)
+APR_DECLARE(void) apr_random_add_entropy(apr_random_t *g,const void *entropy_,
+ apr_size_t bytes)
{
int n;
const unsigned char *entropy = entropy_;
@@ -293,8 +297,9 @@
}
}
-apr_status_t apr_random_secure_bytes(apr_random_t *g,void *random,
- apr_size_t bytes)
+APR_DECLARE(apr_status_t) apr_random_secure_bytes(apr_random_t *g,
+ void *random,
+ apr_size_t bytes)
{
if (!g->secure_started)
return APR_ENOTENOUGHENTROPY;
@@ -302,8 +307,9 @@
return APR_SUCCESS;
}
-apr_status_t apr_random_insecure_bytes(apr_random_t *g,void *random,
- apr_size_t bytes)
+APR_DECLARE(apr_status_t) apr_random_insecure_bytes(apr_random_t *g,
+ void *random,
+ apr_size_t bytes)
{
if (!g->insecure_started)
return APR_ENOTENOUGHENTROPY;
@@ -311,20 +317,20 @@
return APR_SUCCESS;
}
-void apr_random_barrier(apr_random_t *g)
+APR_DECLARE(void) apr_random_barrier(apr_random_t *g)
{
g->secure_started = 0;
g->secure_base = g->generation;
}
-apr_status_t apr_random_secure_ready(apr_random_t *r)
+APR_DECLARE(apr_status_t) apr_random_secure_ready(apr_random_t *r)
{
if (!r->secure_started)
return APR_ENOTENOUGHENTROPY;
return APR_SUCCESS;
}
-apr_status_t apr_random_insecure_ready(apr_random_t *r)
+APR_DECLARE(apr_status_t) apr_random_insecure_ready(apr_random_t *r)
{
if (!r->insecure_started)
return APR_ENOTENOUGHENTROPY;
1.5 +60 -60 apr/random/unix/sha2.c
Index: sha2.c
===================================================================
RCS file: /home/cvs/apr/random/unix/sha2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sha2.c 6 Nov 2003 00:25:33 -0000 1.4
+++ sha2.c 16 Nov 2003 23:49:15 -0000 1.5
@@ -104,10 +104,10 @@
#define REVERSE64(w,x) { \
sha2_word64 tmp = (w); \
tmp = (tmp >> 32) | (tmp << 32); \
- tmp = ((tmp & 0xff00ff00ff00ff00ULL) >> 8) | \
- ((tmp & 0x00ff00ff00ff00ffULL) << 8); \
- (x) = ((tmp & 0xffff0000ffff0000ULL) >> 16) | \
- ((tmp & 0x0000ffff0000ffffULL) << 16); \
+ tmp = ((tmp & APR_UINT64_C(0xff00ff00ff00ff00)) >> 8) | \
+ ((tmp & APR_UINT64_C(0x00ff00ff00ff00ff)) << 8); \
+ (x) = ((tmp & APR_UINT64_C(0xffff0000ffff0000)) >> 16) | \
+ ((tmp & APR_UINT64_C(0x0000ffff0000ffff)) << 16); \
}
#endif /* !APR_IS_BIGENDIAN */
@@ -228,70 +228,70 @@
/* Hash constant words K for SHA-384 and SHA-512: */
const static sha2_word64 K512[80] = {
- 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL,
- 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
- 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
- 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
- 0xd807aa98a3030242ULL, 0x12835b0145706fbeULL,
- 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
- 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL,
- 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
- 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
- 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
- 0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL,
- 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
- 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL,
- 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
- 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
- 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
- 0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL,
- 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
- 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL,
- 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
- 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
- 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
- 0xd192e819d6ef5218ULL, 0xd69906245565a910ULL,
- 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
- 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL,
- 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
- 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
- 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
- 0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL,
- 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
- 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL,
- 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
- 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
- 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
- 0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL,
- 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
- 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL,
- 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
- 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
- 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
+ APR_UINT64_C(0x428a2f98d728ae22), APR_UINT64_C(0x7137449123ef65cd),
+ APR_UINT64_C(0xb5c0fbcfec4d3b2f), APR_UINT64_C(0xe9b5dba58189dbbc),
+ APR_UINT64_C(0x3956c25bf348b538), APR_UINT64_C(0x59f111f1b605d019),
+ APR_UINT64_C(0x923f82a4af194f9b), APR_UINT64_C(0xab1c5ed5da6d8118),
+ APR_UINT64_C(0xd807aa98a3030242), APR_UINT64_C(0x12835b0145706fbe),
+ APR_UINT64_C(0x243185be4ee4b28c), APR_UINT64_C(0x550c7dc3d5ffb4e2),
+ APR_UINT64_C(0x72be5d74f27b896f), APR_UINT64_C(0x80deb1fe3b1696b1),
+ APR_UINT64_C(0x9bdc06a725c71235), APR_UINT64_C(0xc19bf174cf692694),
+ APR_UINT64_C(0xe49b69c19ef14ad2), APR_UINT64_C(0xefbe4786384f25e3),
+ APR_UINT64_C(0x0fc19dc68b8cd5b5), APR_UINT64_C(0x240ca1cc77ac9c65),
+ APR_UINT64_C(0x2de92c6f592b0275), APR_UINT64_C(0x4a7484aa6ea6e483),
+ APR_UINT64_C(0x5cb0a9dcbd41fbd4), APR_UINT64_C(0x76f988da831153b5),
+ APR_UINT64_C(0x983e5152ee66dfab), APR_UINT64_C(0xa831c66d2db43210),
+ APR_UINT64_C(0xb00327c898fb213f), APR_UINT64_C(0xbf597fc7beef0ee4),
+ APR_UINT64_C(0xc6e00bf33da88fc2), APR_UINT64_C(0xd5a79147930aa725),
+ APR_UINT64_C(0x06ca6351e003826f), APR_UINT64_C(0x142929670a0e6e70),
+ APR_UINT64_C(0x27b70a8546d22ffc), APR_UINT64_C(0x2e1b21385c26c926),
+ APR_UINT64_C(0x4d2c6dfc5ac42aed), APR_UINT64_C(0x53380d139d95b3df),
+ APR_UINT64_C(0x650a73548baf63de), APR_UINT64_C(0x766a0abb3c77b2a8),
+ APR_UINT64_C(0x81c2c92e47edaee6), APR_UINT64_C(0x92722c851482353b),
+ APR_UINT64_C(0xa2bfe8a14cf10364), APR_UINT64_C(0xa81a664bbc423001),
+ APR_UINT64_C(0xc24b8b70d0f89791), APR_UINT64_C(0xc76c51a30654be30),
+ APR_UINT64_C(0xd192e819d6ef5218), APR_UINT64_C(0xd69906245565a910),
+ APR_UINT64_C(0xf40e35855771202a), APR_UINT64_C(0x106aa07032bbd1b8),
+ APR_UINT64_C(0x19a4c116b8d2d0c8), APR_UINT64_C(0x1e376c085141ab53),
+ APR_UINT64_C(0x2748774cdf8eeb99), APR_UINT64_C(0x34b0bcb5e19b48a8),
+ APR_UINT64_C(0x391c0cb3c5c95a63), APR_UINT64_C(0x4ed8aa4ae3418acb),
+ APR_UINT64_C(0x5b9cca4f7763e373), APR_UINT64_C(0x682e6ff3d6b2b8a3),
+ APR_UINT64_C(0x748f82ee5defb2fc), APR_UINT64_C(0x78a5636f43172f60),
+ APR_UINT64_C(0x84c87814a1f0ab72), APR_UINT64_C(0x8cc702081a6439ec),
+ APR_UINT64_C(0x90befffa23631e28), APR_UINT64_C(0xa4506cebde82bde9),
+ APR_UINT64_C(0xbef9a3f7b2c67915), APR_UINT64_C(0xc67178f2e372532b),
+ APR_UINT64_C(0xca273eceea26619c), APR_UINT64_C(0xd186b8c721c0c207),
+ APR_UINT64_C(0xeada7dd6cde0eb1e), APR_UINT64_C(0xf57d4f7fee6ed178),
+ APR_UINT64_C(0x06f067aa72176fba), APR_UINT64_C(0x0a637dc5a2c898a6),
+ APR_UINT64_C(0x113f9804bef90dae), APR_UINT64_C(0x1b710b35131c471b),
+ APR_UINT64_C(0x28db77f523047d84), APR_UINT64_C(0x32caab7b40c72493),
+ APR_UINT64_C(0x3c9ebe0a15c9bebc), APR_UINT64_C(0x431d67c49c100d4c),
+ APR_UINT64_C(0x4cc5d4becb3e42b6), APR_UINT64_C(0x597f299cfc657e2a),
+ APR_UINT64_C(0x5fcb6fab3ad6faec), APR_UINT64_C(0x6c44198c4a475817)
};
/* Initial hash value H for SHA-384 */
const static sha2_word64 sha384_initial_hash_value[8] = {
- 0xcbbb9d5dc1059ed8ULL,
- 0x629a292a367cd507ULL,
- 0x9159015a3070dd17ULL,
- 0x152fecd8f70e5939ULL,
- 0x67332667ffc00b31ULL,
- 0x8eb44a8768581511ULL,
- 0xdb0c2e0d64f98fa7ULL,
- 0x47b5481dbefa4fa4ULL
+ APR_UINT64_C(0xcbbb9d5dc1059ed8),
+ APR_UINT64_C(0x629a292a367cd507),
+ APR_UINT64_C(0x9159015a3070dd17),
+ APR_UINT64_C(0x152fecd8f70e5939),
+ APR_UINT64_C(0x67332667ffc00b31),
+ APR_UINT64_C(0x8eb44a8768581511),
+ APR_UINT64_C(0xdb0c2e0d64f98fa7),
+ APR_UINT64_C(0x47b5481dbefa4fa4)
};
/* Initial hash value H for SHA-512 */
const static sha2_word64 sha512_initial_hash_value[8] = {
- 0x6a09e667f3bcc908ULL,
- 0xbb67ae8584caa73bULL,
- 0x3c6ef372fe94f82bULL,
- 0xa54ff53a5f1d36f1ULL,
- 0x510e527fade682d1ULL,
- 0x9b05688c2b3e6c1fULL,
- 0x1f83d9abfb41bd6bULL,
- 0x5be0cd19137e2179ULL
+ APR_UINT64_C(0x6a09e667f3bcc908),
+ APR_UINT64_C(0xbb67ae8584caa73b),
+ APR_UINT64_C(0x3c6ef372fe94f82b),
+ APR_UINT64_C(0xa54ff53a5f1d36f1),
+ APR_UINT64_C(0x510e527fade682d1),
+ APR_UINT64_C(0x9b05688c2b3e6c1f),
+ APR_UINT64_C(0x1f83d9abfb41bd6b),
+ APR_UINT64_C(0x5be0cd19137e2179)
};
/*
1.2 +1 -1 apr/random/unix/sha2_glue.c
Index: sha2_glue.c
===================================================================
RCS file: /home/cvs/apr/random/unix/sha2_glue.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sha2_glue.c 3 Nov 2003 13:25:00 -0000 1.1
+++ sha2_glue.c 16 Nov 2003 23:49:15 -0000 1.2
@@ -19,7 +19,7 @@
SHA256_Final(result,h->data);
}
-apr_crypto_hash_t *apr_crypto_sha256_new(apr_pool_t *p)
+APR_DECLARE(apr_crypto_hash_t *) apr_crypto_sha256_new(apr_pool_t *p)
{
apr_crypto_hash_t *h=apr_palloc(p,sizeof *h);
1.11 +1 -1 apr/test/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/apr/test/Makefile.win,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.win 17 Sep 2003 18:46:23 -0000 1.10
+++ Makefile.win 16 Nov 2003 23:49:15 -0000 1.11
@@ -99,7 +99,7 @@
testdso.obj testoc.obj testdup.obj testsockets.obj testproc.obj \
testpoll.obj testlock.obj testsockopt.obj testpipe.obj testthread.obj \
testhash.obj testargs.obj testnames.obj testuser.obj testpath.obj \
- testenv.obj testprocmutex.obj
+ testenv.obj testprocmutex.obj testrand2.obj
testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
$(LINK) /debug /subsystem:console /machine:I386 $(TESTS) CuTest.obj \
1.4 +4 -0 apr/test/testall.dsp
Index: testall.dsp
===================================================================
RCS file: /home/cvs/apr/test/testall.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testall.dsp 12 Feb 2003 20:20:55 -0000 1.3
+++ testall.dsp 16 Nov 2003 23:49:15 -0000 1.4
@@ -195,6 +195,10 @@
# End Source File
# Begin Source File
+SOURCE=.\testrand2.c
+# End Source File
+# Begin Source File
+
SOURCE=.\testshm.c
# End Source File
# Begin Source File
1.5 +1 -1 apr/test/testrand2.c
Index: testrand2.c
===================================================================
RCS file: /home/cvs/apr/test/testrand2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- testrand2.c 11 Nov 2003 22:27:07 -0000 1.4
+++ testrand2.c 16 Nov 2003 23:49:15 -0000 1.5
@@ -83,7 +83,7 @@
static apr_random_t *r;
-typedef apr_status_t rnd_fn(apr_random_t *r,void *b,apr_size_t n);
+typedef apr_status_t APR_THREAD_FUNC rnd_fn(apr_random_t *r,void *b,apr_size_t n);
static void rand_run_kat(CuTest *tc,rnd_fn *f,apr_random_t *r,
const unsigned char expected[128])