[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_2-14-ga523d2a

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=a523d2afa6b083401c589576b54ac5af91482647

The branch, gnutls_2_12_x has been updated
       via  a523d2afa6b083401c589576b54ac5af91482647 (commit)
      from  da7563294b63d006a15c8bdcbb3d6d4d87b72558 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a523d2afa6b083401c589576b54ac5af91482647
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Apr 13 20:03:57 2011 +0200

    renamed memxor to gl_memxor.

-----------------------------------------------------------------------

Summary of changes:
 libextra/gl/hmac-md5.c |    4 ++--
 libextra/gl/memxor.c   |    2 +-
 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 eed1657..2c0edf5 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 4eeebcb..b80b430 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 dafa2cf..fbf2ac3 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 */


hooks/post-receive
-- 
GNU gnutls