Skip to content

Commit

Permalink
* random/unix/sha2.h, random/unix/sha2.c: Fix more global symbols.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@355464 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@notroj
notroj committed Dec 9, 2005
1 parent 634ce46 commit 8754e69
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
26 changes: 13 additions & 13 deletions random/unix/sha2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ typedef apr_uint64_t sha2_word64; /* Exactly 8 bytes */
* library -- they are intended for private internal visibility/use
* only.
*/
void SHA512_Last(SHA512_CTX*);
void apr__SHA512_Last(SHA512_CTX*);
void apr__SHA256_Transform(SHA256_CTX*, const sha2_word32*);
void apr__SHA512_Transform(SHA512_CTX*, const sha2_word64*);

Expand Down Expand Up @@ -561,7 +561,7 @@ void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
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;

Expand All @@ -584,12 +584,12 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) {
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;

apr__SHA256_Init(&context);
apr__SHA256_Update(&context, data, len);
return SHA256_End(&context, digest);
return apr__SHA256_End(&context, digest);
}


Expand Down Expand Up @@ -821,7 +821,7 @@ void apr__SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len)
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)
Expand Down Expand Up @@ -871,7 +871,7 @@ void apr__SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {

/* 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
Expand All @@ -892,7 +892,7 @@ void apr__SHA512_Final(sha2_byte digest[], SHA512_CTX* context) {
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;

Expand All @@ -915,12 +915,12 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) {
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;

apr__SHA512_Init(&context);
apr__SHA512_Update(&context, data, len);
return SHA512_End(&context, digest);
return apr__SHA512_End(&context, digest);
}


Expand All @@ -946,7 +946,7 @@ void apr__SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {

/* 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
Expand All @@ -967,7 +967,7 @@ void apr__SHA384_Final(sha2_byte digest[], SHA384_CTX* context) {
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;

Expand All @@ -990,11 +990,11 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) {
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;

apr__SHA384_Init(&context);
apr__SHA384_Update(&context, data, len);
return SHA384_End(&context, digest);
return apr__SHA384_End(&context, digest);
}

12 changes: 6 additions & 6 deletions random/unix/sha2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,22 @@ typedef SHA512_CTX SHA384_CTX;
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* SHA256_End(SHA256_CTX *, char [SHA256_DIGEST_STRING_LENGTH]);
char* SHA256_Data(const apr_byte_t *, size_t,
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 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* SHA384_End(SHA384_CTX *, char [SHA384_DIGEST_STRING_LENGTH]);
char* SHA384_Data(const apr_byte_t *, size_t,
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 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* SHA512_End(SHA512_CTX *, char [SHA512_DIGEST_STRING_LENGTH]);
char* SHA512_Data(const apr_byte_t *, size_t,
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
Expand Down

0 comments on commit 8754e69

Please sign in to comment.