diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-13 20:03:57 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-04-13 20:03:57 +0200 |
| commit | a523d2afa6b083401c589576b54ac5af91482647 (patch) | |
| tree | 88a50bac2f97681c41a22ea4698458f26791f7e7 | |
| parent | da7563294b63d006a15c8bdcbb3d6d4d87b72558 (diff) | |
| download | gnutls-a523d2afa6b083401c589576b54ac5af91482647.tar.gz | |
renamed memxor to gl_memxor.
| -rw-r--r-- | libextra/gl/hmac-md5.c | 4 | ||||
| -rw-r--r-- | libextra/gl/memxor.c | 2 | ||||
| -rw-r--r-- | libextra/gl/memxor.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libextra/gl/hmac-md5.c b/libextra/gl/hmac-md5.c index eed16573ba..2c0edf5e86 100644 --- a/libextra/gl/hmac-md5.c +++ b/libextra/gl/hmac-md5.c @@ -58,7 +58,7 @@ hmac_md5 (const void *key, size_t keylen, md5_init_ctx (&inner); memset (block, IPAD, sizeof (block)); - memxor (block, key, keylen); + gl_memxor (block, key, keylen); md5_process_block (block, 64, &inner); md5_process_bytes (in, inlen, &inner); @@ -70,7 +70,7 @@ hmac_md5 (const void *key, size_t keylen, md5_init_ctx (&outer); memset (block, OPAD, sizeof (block)); - memxor (block, key, keylen); + gl_memxor (block, key, keylen); md5_process_block (block, 64, &outer); md5_process_bytes (innerhash, 16, &outer); diff --git a/libextra/gl/memxor.c b/libextra/gl/memxor.c index 4eeebcbd56..b80b4308ef 100644 --- a/libextra/gl/memxor.c +++ b/libextra/gl/memxor.c @@ -23,7 +23,7 @@ #include "memxor.h" void * -memxor (void *restrict dest, const void *restrict src, size_t n) +gl_memxor (void *restrict dest, const void *restrict src, size_t n) { char const *s = src; char *d = dest; diff --git a/libextra/gl/memxor.h b/libextra/gl/memxor.h index dafa2cfca7..fbf2ac3c54 100644 --- a/libextra/gl/memxor.h +++ b/libextra/gl/memxor.h @@ -26,6 +26,6 @@ /* Compute binary exclusive OR of memory areas DEST and SRC, putting the result in DEST, of length N bytes. Returns a pointer to DEST. */ -void *memxor (void *restrict dest, const void *restrict src, size_t n); +void *gl_memxor (void *restrict dest, const void *restrict src, size_t n); #endif /* MEMXOR_H */ |