rpms/apr/devel apr-1.2.2-random.patch,NONE,1.1 apr.spec,1.45,1.46
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 4 16:50:45 UTC 2006
Author: jorton
Update of /cvs/dist/rpms/apr/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26218
Modified Files:
apr.spec
Added Files:
apr-1.2.2-random.patch
Log Message:
* Wed Jan 4 2006 Joe Orton <jorton at redhat.com> 1.2.2-7
- fix namespace pollution (r354824, r355464)
apr-1.2.2-random.patch:
sha2.c | 92 ++++++++++++++++++++++++++++++------------------------------
sha2.h | 30 +++++++++----------
sha2_glue.c | 6 +--
3 files changed, 64 insertions(+), 64 deletions(-)
--- NEW FILE apr-1.2.2-random.patch ---
--- apr-1.2.2/random/unix/sha2.h.random
+++ apr-1.2.2/random/unix/sha2.h
@@ -57,25 +57,25 @@
/*** SHA-256/384/512 Function Prototypes ******************************/
-void SHA256_Init(SHA256_CTX *);
-void SHA256_Update(SHA256_CTX *, const apr_byte_t *, size_t);
-void SHA256_Final(apr_byte_t [SHA256_DIGEST_LENGTH], SHA256_CTX *);
-char* SHA256_End(SHA256_CTX *, char [SHA256_DIGEST_STRING_LENGTH]);
-char* SHA256_Data(const apr_byte_t *, size_t,
+void apr__SHA256_Init(SHA256_CTX *);
+void apr__SHA256_Update(SHA256_CTX *, const apr_byte_t *, size_t);
+void apr__SHA256_Final(apr_byte_t [SHA256_DIGEST_LENGTH], SHA256_CTX *);
+char* apr__SHA256_End(SHA256_CTX *, char [SHA256_DIGEST_STRING_LENGTH]);
+char* apr__SHA256_Data(const apr_byte_t *, size_t,
char [SHA256_DIGEST_STRING_LENGTH]);
-void SHA384_Init(SHA384_CTX *);
-void SHA384_Update(SHA384_CTX *, const apr_byte_t *, size_t);
-void SHA384_Final(apr_byte_t [SHA384_DIGEST_LENGTH], SHA384_CTX *);
-char* SHA384_End(SHA384_CTX *, char [SHA384_DIGEST_STRING_LENGTH]);
-char* SHA384_Data(const apr_byte_t *, size_t,
+void apr__SHA384_Init(SHA384_CTX *);
+void apr__SHA384_Update(SHA384_CTX *, const apr_byte_t *, size_t);
+void apr__SHA384_Final(apr_byte_t [SHA384_DIGEST_LENGTH], SHA384_CTX *);
+char* apr__SHA384_End(SHA384_CTX *, char [SHA384_DIGEST_STRING_LENGTH]);
+char* apr__SHA384_Data(const apr_byte_t *, size_t,
char [SHA384_DIGEST_STRING_LENGTH]);
-void SHA512_Init(SHA512_CTX *);
-void SHA512_Update(SHA512_CTX *, const apr_byte_t *, size_t);
-void SHA512_Final(apr_byte_t [SHA512_DIGEST_LENGTH], SHA512_CTX *);
-char* SHA512_End(SHA512_CTX *, char [SHA512_DIGEST_STRING_LENGTH]);
-char* SHA512_Data(const apr_byte_t *, size_t,
+void apr__SHA512_Init(SHA512_CTX *);
+void apr__SHA512_Update(SHA512_CTX *, const apr_byte_t *, size_t);
+void apr__SHA512_Final(apr_byte_t [SHA512_DIGEST_LENGTH], SHA512_CTX *);
+char* apr__SHA512_End(SHA512_CTX *, char [SHA512_DIGEST_STRING_LENGTH]);
+char* apr__SHA512_Data(const apr_byte_t *, size_t,
char [SHA512_DIGEST_STRING_LENGTH]);
#ifdef __cplusplus
--- apr-1.2.2/random/unix/sha2_glue.c.random
+++ apr-1.2.2/random/unix/sha2_glue.c
@@ -5,18 +5,18 @@
static void sha256_init(apr_crypto_hash_t *h)
{
- SHA256_Init(h->data);
+ apr__SHA256_Init(h->data);
}
static void sha256_add(apr_crypto_hash_t *h,const void *data,
apr_size_t bytes)
{
- SHA256_Update(h->data,data,bytes);
+ apr__SHA256_Update(h->data,data,bytes);
}
static void sha256_finish(apr_crypto_hash_t *h,unsigned char *result)
{
- SHA256_Final(result,h->data);
+ apr__SHA256_Final(result,h->data);
}
APR_DECLARE(apr_crypto_hash_t *) apr_crypto_sha256_new(apr_pool_t *p)
--- apr-1.2.2/random/unix/sha2.c.random
+++ apr-1.2.2/random/unix/sha2.c
@@ -150,9 +150,9 @@
* library -- they are intended for private internal visibility/use
* only.
*/
-void SHA512_Last(SHA512_CTX*);
-void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
+void apr__SHA512_Last(SHA512_CTX*);
+void apr__SHA256_Transform(SHA256_CTX*, const sha2_word32*);
+void apr__SHA512_Transform(SHA512_CTX*, const sha2_word64*);
/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
@@ -264,7 +264,7 @@
/*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
+void apr__SHA256_Init(SHA256_CTX* context) {
if (context == (SHA256_CTX*)0) {
return;
}
@@ -310,7 +310,7 @@
(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
j++
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+void apr__SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
sha2_word32 T1, *W256;
int j;
@@ -368,7 +368,7 @@
#else /* SHA2_UNROLL_TRANSFORM */
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
+void apr__SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
sha2_word32 T1, T2, *W256;
int j;
@@ -448,7 +448,7 @@
#endif /* SHA2_UNROLL_TRANSFORM */
-void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
+void apr__SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
unsigned int freespace, usedspace;
if (len == 0) {
@@ -471,7 +471,7 @@
context->bitcount += freespace << 3;
len -= freespace;
data += freespace;
- SHA256_Transform(context, (sha2_word32*)context->buffer);
+ apr__SHA256_Transform(context, (sha2_word32*)context->buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@@ -483,7 +483,7 @@
}
while (len >= SHA256_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */
- SHA256_Transform(context, (sha2_word32*)data);
+ apr__SHA256_Transform(context, (sha2_word32*)data);
context->bitcount += SHA256_BLOCK_LENGTH << 3;
len -= SHA256_BLOCK_LENGTH;
data += SHA256_BLOCK_LENGTH;
@@ -497,7 +497,7 @@
usedspace = freespace = 0;
}
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
+void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
sha2_word32 *d = (sha2_word32*)digest;
unsigned int usedspace;
@@ -524,7 +524,7 @@
MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
}
/* Do second-to-last transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
+ apr__SHA256_Transform(context, (sha2_word32*)context->buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
@@ -540,7 +540,7 @@
*(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
/* Final transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
+ apr__SHA256_Transform(context, (sha2_word32*)context->buffer);
#if !APR_IS_BIGENDIAN
{
@@ -561,7 +561,7 @@
usedspace = 0;
}
-char *SHA256_End(SHA256_CTX* context, char buffer[]) {
+char *apr__SHA256_End(SHA256_CTX* context, char buffer[]) {
sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest;
int i;
@@ -569,7 +569,7 @@
assert(context != (SHA256_CTX*)0);
if (buffer != (char*)0) {
- SHA256_Final(digest, context);
+ apr__SHA256_Final(digest, context);
for (i = 0; i < SHA256_DIGEST_LENGTH; i++) {
*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
@@ -584,17 +584,17 @@
return buffer;
}
-char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
+char* apr__SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) {
SHA256_CTX context;
- SHA256_Init(&context);
- SHA256_Update(&context, data, len);
- return SHA256_End(&context, digest);
+ apr__SHA256_Init(&context);
+ apr__SHA256_Update(&context, data, len);
+ return apr__SHA256_End(&context, digest);
}
/*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
+void apr__SHA512_Init(SHA512_CTX* context) {
if (context == (SHA512_CTX*)0) {
return;
}
@@ -639,7 +639,7 @@
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
j++
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+void apr__SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
sha2_word64 T1, *W512 = (sha2_word64*)context->buffer;
int j;
@@ -694,7 +694,7 @@
#else /* SHA2_UNROLL_TRANSFORM */
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
+void apr__SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer;
int j;
@@ -772,7 +772,7 @@
#endif /* SHA2_UNROLL_TRANSFORM */
-void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
+void apr__SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
unsigned int freespace, usedspace;
if (len == 0) {
@@ -795,7 +795,7 @@
ADDINC128(context->bitcount, freespace << 3);
len -= freespace;
data += freespace;
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ apr__SHA512_Transform(context, (sha2_word64*)context->buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@@ -807,7 +807,7 @@
}
while (len >= SHA512_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */
- SHA512_Transform(context, (sha2_word64*)data);
+ apr__SHA512_Transform(context, (sha2_word64*)data);
ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
len -= SHA512_BLOCK_LENGTH;
data += SHA512_BLOCK_LENGTH;
@@ -821,7 +821,7 @@
usedspace = freespace = 0;
}
-void SHA512_Last(SHA512_CTX* context) {
+void apr__SHA512_Last(SHA512_CTX* context) {
unsigned int usedspace;
usedspace = (unsigned int)((context->bitcount[0] >> 3)
@@ -843,7 +843,7 @@
MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
}
/* Do second-to-last transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ apr__SHA512_Transform(context, (sha2_word64*)context->buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
@@ -860,10 +860,10 @@
*(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
/* Final transform: */
- SHA512_Transform(context, (sha2_word64*)context->buffer);
+ apr__SHA512_Transform(context, (sha2_word64*)context->buffer);
}
-void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
+void apr__SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
sha2_word64 *d = (sha2_word64*)digest;
/* Sanity check: */
@@ -871,7 +871,7 @@
/* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) {
- SHA512_Last(context);
+ apr__SHA512_Last(context);
/* Save the hash data for output: */
#if !APR_IS_BIGENDIAN
@@ -892,7 +892,7 @@
MEMSET_BZERO(context, sizeof(context));
}
-char *SHA512_End(SHA512_CTX* context, char buffer[]) {
+char *apr__SHA512_End(SHA512_CTX* context, char buffer[]) {
sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest;
int i;
@@ -900,7 +900,7 @@
assert(context != (SHA512_CTX*)0);
if (buffer != (char*)0) {
- SHA512_Final(digest, context);
+ apr__SHA512_Final(digest, context);
for (i = 0; i < SHA512_DIGEST_LENGTH; i++) {
*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
@@ -915,17 +915,17 @@
return buffer;
}
-char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
+char* apr__SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) {
SHA512_CTX context;
- SHA512_Init(&context);
- SHA512_Update(&context, data, len);
- return SHA512_End(&context, digest);
+ apr__SHA512_Init(&context);
+ apr__SHA512_Update(&context, data, len);
+ return apr__SHA512_End(&context, digest);
}
/*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
+void apr__SHA384_Init(SHA384_CTX* context) {
if (context == (SHA384_CTX*)0) {
return;
}
@@ -934,11 +934,11 @@
context->bitcount[0] = context->bitcount[1] = 0;
}
-void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
- SHA512_Update((SHA512_CTX*)context, data, len);
+void apr__SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
+ apr__SHA512_Update((SHA512_CTX*)context, data, len);
}
-void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
+void apr__SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
sha2_word64 *d = (sha2_word64*)digest;
/* Sanity check: */
@@ -946,7 +946,7 @@
/* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) {
- SHA512_Last((SHA512_CTX*)context);
+ apr__SHA512_Last((SHA512_CTX*)context);
/* Save the hash data for output: */
#if !APR_IS_BIGENDIAN
@@ -967,7 +967,7 @@
MEMSET_BZERO(context, sizeof(context));
}
-char *SHA384_End(SHA384_CTX* context, char buffer[]) {
+char *apr__SHA384_End(SHA384_CTX* context, char buffer[]) {
sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest;
int i;
@@ -975,7 +975,7 @@
assert(context != (SHA384_CTX*)0);
if (buffer != (char*)0) {
- SHA384_Final(digest, context);
+ apr__SHA384_Final(digest, context);
for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {
*buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4];
@@ -990,11 +990,11 @@
return buffer;
}
-char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
+char* apr__SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) {
SHA384_CTX context;
- SHA384_Init(&context);
- SHA384_Update(&context, data, len);
- return SHA384_End(&context, digest);
+ apr__SHA384_Init(&context);
+ apr__SHA384_Update(&context, data, len);
+ return apr__SHA384_End(&context, digest);
}
Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- apr.spec 4 Jan 2006 12:50:00 -0000 1.45
+++ apr.spec 4 Jan 2006 16:50:43 -0000 1.46
@@ -3,7 +3,7 @@
Summary: Apache Portable Runtime library
Name: apr
Version: 1.2.2
-Release: 6
+Release: 7
License: Apache Software License
Group: System Environment/Libraries
URL: http://apr.apache.org/
@@ -16,6 +16,7 @@
Patch6: apr-1.2.2-locktimeout.patch
Patch7: apr-1.2.2-libdir.patch
Patch8: apr-1.2.2-seekflush.patch
+Patch9: apr-1.2.2-random.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildPrereq: autoconf, libtool, doxygen
Conflicts: subversion < 0.20.1-2
@@ -49,6 +50,7 @@
%patch6 -p1 -b .locktimeout
%patch7 -p1 -b .libdir
%patch8 -p1 -b .seekflush
+%patch9 -p1 -b .random
%build
# regenerate configure script etc.
@@ -125,6 +127,9 @@
%{_includedir}/apr-%{aprver}/*.h
%changelog
+* Wed Jan 4 2006 Joe Orton <jorton at redhat.com> 1.2.2-7
+- fix namespace pollution (r354824, r355464)
+
* Wed Jan 4 2006 Joe Orton <jorton at redhat.com> 1.2.2-6
- fix build with recent glibc (#176911)
More information about the fedora-cvs-commits
mailing list