diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ap_sha1.c | 13 | ||||
| -rw-r--r-- | crypto/apr_sha1.c | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/crypto/ap_sha1.c b/crypto/ap_sha1.c index 08d8054e..847a3c10 100644 --- a/crypto/ap_sha1.c +++ b/crypto/ap_sha1.c @@ -82,7 +82,6 @@ * This code is hereby placed in the public domain */ -#include "ap_config.h" #include "ap_sha1.h" #include "ap_base64.h" #include "apr_strings.h" @@ -122,7 +121,7 @@ #ifdef CHARSET_EBCDIC static apr_xlate_t *ebcdic2ascii_xlate; -AP_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x) +APR_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x) { apr_status_t rv; int onoff; @@ -243,7 +242,7 @@ static void maybe_byte_reverse(apr_uint32_t *buffer, int count) /* initialize the SHA digest */ -AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) +APR_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) { sha_info->digest[0] = 0x67452301L; sha_info->digest[1] = 0xefcdab89L; @@ -257,7 +256,7 @@ AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) /* update the SHA digest */ -AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, +APR_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, const unsigned char *buffer, unsigned int count) { @@ -296,7 +295,7 @@ AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, sha_info->local = count; } -AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, +APR_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, unsigned int count) { #ifdef CHARSET_EBCDIC @@ -350,7 +349,7 @@ AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, /* finish computing the SHA digest */ -AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], +APR_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], AP_SHA1_CTX *sha_info) { int count, i, j; @@ -385,7 +384,7 @@ AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], } -AP_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out) +APR_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out) { int l; AP_SHA1_CTX context; diff --git a/crypto/apr_sha1.c b/crypto/apr_sha1.c index 08d8054e..847a3c10 100644 --- a/crypto/apr_sha1.c +++ b/crypto/apr_sha1.c @@ -82,7 +82,6 @@ * This code is hereby placed in the public domain */ -#include "ap_config.h" #include "ap_sha1.h" #include "ap_base64.h" #include "apr_strings.h" @@ -122,7 +121,7 @@ #ifdef CHARSET_EBCDIC static apr_xlate_t *ebcdic2ascii_xlate; -AP_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x) +APR_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x) { apr_status_t rv; int onoff; @@ -243,7 +242,7 @@ static void maybe_byte_reverse(apr_uint32_t *buffer, int count) /* initialize the SHA digest */ -AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) +APR_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) { sha_info->digest[0] = 0x67452301L; sha_info->digest[1] = 0xefcdab89L; @@ -257,7 +256,7 @@ AP_DECLARE(void) ap_SHA1Init(AP_SHA1_CTX *sha_info) /* update the SHA digest */ -AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, +APR_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, const unsigned char *buffer, unsigned int count) { @@ -296,7 +295,7 @@ AP_DECLARE(void) ap_SHA1Update_binary(AP_SHA1_CTX *sha_info, sha_info->local = count; } -AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, +APR_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, unsigned int count) { #ifdef CHARSET_EBCDIC @@ -350,7 +349,7 @@ AP_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf, /* finish computing the SHA digest */ -AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], +APR_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], AP_SHA1_CTX *sha_info) { int count, i, j; @@ -385,7 +384,7 @@ AP_DECLARE(void) ap_SHA1Final(unsigned char digest[SHA_DIGESTSIZE], } -AP_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out) +APR_DECLARE(void) ap_sha1_base64(const char *clear, int len, char *out) { int l; AP_SHA1_CTX context; |