[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-15-g588f31d
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-15-g588f31d |
|
Date: |
Tue, 01 Nov 2011 12:11:02 +0000 |
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=588f31dfe633c8210ca8d4f3f08149e1d67ebde3
The branch, master has been updated
via 588f31dfe633c8210ca8d4f3f08149e1d67ebde3 (commit)
from a893dd2f0685b8bd92ae87ffa0962a79c2bf744f (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 588f31dfe633c8210ca8d4f3f08149e1d67ebde3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Tue Nov 1 12:58:41 2011 +0100
hmac-md5 gnulib module was removed (it was no longer used)
-----------------------------------------------------------------------
Summary of changes:
gl/Makefile.am | 26 +---
gl/hmac-md5.c | 81 --------
gl/hmac.h | 41 ----
gl/m4/gnulib-cache.m4 | 4 +-
gl/m4/gnulib-comp.m4 | 17 --
gl/m4/md5.m4 | 13 --
gl/m4/memxor.m4 | 10 -
gl/md5.c | 462 ----------------------------------------------
gl/md5.h | 126 -------------
gl/memxor.c | 35 ----
gl/memxor.h | 31 ---
gl/tests/Makefile.am | 16 --
gl/tests/test-hmac-md5.c | 147 ---------------
gl/tests/test-md5.c | 67 -------
14 files changed, 2 insertions(+), 1074 deletions(-)
delete mode 100644 gl/hmac-md5.c
delete mode 100644 gl/hmac.h
delete mode 100644 gl/m4/md5.m4
delete mode 100644 gl/m4/memxor.m4
delete mode 100644 gl/md5.c
delete mode 100644 gl/md5.h
delete mode 100644 gl/memxor.c
delete mode 100644 gl/memxor.h
delete mode 100644 gl/tests/test-hmac-md5.c
delete mode 100644 gl/tests/test-md5.c
diff --git a/gl/Makefile.am b/gl/Makefile.am
index 428ee44..a4548c1 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests
--avoid=lseek-tests --no-conditional-dependencies --libtool --macro-prefix=gl
--no-vc-files accept alloca alphasort argp bind byteswap c-ctype close connect
crypto/hmac-md5 crypto/md5 error extensions func getpass getsubopt gettext
gettime havelib inet_ntop inet_pton lib-msvc-compat lib-symbol-versions listen
maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in progname
read-file recv recvfrom scandir select send sendto setsockopt shutdown snprintf
socket sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r
timespec u64 unistd valgrind-tests vasprintf version-etc version-etc-fsf
vfprintf-posix vprintf-posix vsnprintf warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override
--lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc
--tests-base=gl/tests --aux-dir=build-aux --with-tests --avoid=alignof-tests
--avoid=lseek-tests --no-conditional-dependencies --libtool --macro-prefix=gl
--no-vc-files accept alloca alphasort argp bind byteswap c-ctype close connect
error extensions func getpass getsubopt gettext gettime havelib inet_ntop
inet_pton lib-msvc-compat lib-symbol-versions listen maintainer-makefile
manywarnings memmem-simple minmax netdb netinet_in progname read-file recv
recvfrom scandir select send sendto setsockopt shutdown snprintf socket sockets
socklen stdint strcase strverscmp sys_socket sys_stat time_r timespec u64
unistd valgrind-tests vasprintf version-etc version-etc-fsf vfprintf-posix
vprintf-posix vsnprintf warnings
AUTOMAKE_OPTIONS = 1.5 gnits
@@ -227,22 +227,6 @@ EXTRA_libgnu_la_SOURCES += connect.c
## end gnulib module connect
-## begin gnulib module crypto/hmac-md5
-
-libgnu_la_SOURCES += hmac-md5.c
-
-EXTRA_DIST += hmac.h
-
-## end gnulib module crypto/hmac-md5
-
-## begin gnulib module crypto/md5
-
-libgnu_la_SOURCES += md5.c
-
-EXTRA_DIST += md5.h
-
-## end gnulib module crypto/md5
-
## begin gnulib module dirent
BUILT_SOURCES += dirent.h
@@ -889,14 +873,6 @@ EXTRA_libgnu_la_SOURCES += mempcpy.c
## end gnulib module mempcpy
-## begin gnulib module memxor
-
-libgnu_la_SOURCES += memxor.c
-
-EXTRA_DIST += memxor.h
-
-## end gnulib module memxor
-
## begin gnulib module minmax
libgnu_la_SOURCES += minmax.h
diff --git a/gl/hmac-md5.c b/gl/hmac-md5.c
deleted file mode 100644
index 2c0edf5..0000000
--- a/gl/hmac-md5.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* hmac-md5.c -- hashed message authentication codes
- Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-/* Written by Simon Josefsson. */
-
-#include <config.h>
-
-#include "hmac.h"
-
-#include "memxor.h"
-#include "md5.h"
-
-#include <string.h>
-
-#define IPAD 0x36
-#define OPAD 0x5c
-
-int
-hmac_md5 (const void *key, size_t keylen,
- const void *in, size_t inlen, void *resbuf)
-{
- struct md5_ctx inner;
- struct md5_ctx outer;
- char optkeybuf[16];
- char block[64];
- char innerhash[16];
-
- /* Reduce the key's size, so that it becomes <= 64 bytes large. */
-
- if (keylen > 64)
- {
- struct md5_ctx keyhash;
-
- md5_init_ctx (&keyhash);
- md5_process_bytes (key, keylen, &keyhash);
- md5_finish_ctx (&keyhash, optkeybuf);
-
- key = optkeybuf;
- keylen = 16;
- }
-
- /* Compute INNERHASH from KEY and IN. */
-
- md5_init_ctx (&inner);
-
- memset (block, IPAD, sizeof (block));
- gl_memxor (block, key, keylen);
-
- md5_process_block (block, 64, &inner);
- md5_process_bytes (in, inlen, &inner);
-
- md5_finish_ctx (&inner, innerhash);
-
- /* Compute result from KEY and INNERHASH. */
-
- md5_init_ctx (&outer);
-
- memset (block, OPAD, sizeof (block));
- gl_memxor (block, key, keylen);
-
- md5_process_block (block, 64, &outer);
- md5_process_bytes (innerhash, 16, &outer);
-
- md5_finish_ctx (&outer, resbuf);
-
- return 0;
-}
diff --git a/gl/hmac.h b/gl/hmac.h
deleted file mode 100644
index 67cb72e..0000000
--- a/gl/hmac.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* hmac.h -- hashed message authentication codes
- Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-/* Written by Simon Josefsson. */
-
-#ifndef HMAC_H
-# define HMAC_H 1
-
-#include <stddef.h>
-
-/* Compute Hashed Message Authentication Code with MD5, as described
- in RFC 2104, over BUFFER data of BUFLEN bytes using the KEY of
- KEYLEN bytes, writing the output to pre-allocated 16 byte minimum
- RESBUF buffer. Return 0 on success. */
-int
-hmac_md5 (const void *key, size_t keylen,
- const void *buffer, size_t buflen, void *resbuf);
-
-/* Compute Hashed Message Authentication Code with SHA-1, over BUFFER
- data of BUFLEN bytes using the KEY of KEYLEN bytes, writing the
- output to pre-allocated 20 byte minimum RESBUF buffer. Return 0 on
- success. */
-int
-hmac_sha1 (const void *key, size_t keylen,
- const void *in, size_t inlen, void *resbuf);
-
-#endif /* HMAC_H */
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 4777c60..d43ce3f 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests
--aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept
alloca alphasort argp bind byteswap c-ctype close connect crypto/hmac-md5
crypto/md5 error extensions func getpass getsubopt gettext gettime havelib
inet_ntop inet_pton lib-msvc-compat lib-symbol-versions listen
maintainer-makefile manywarnings memmem-simple minmax netdb netinet_in progname
read-file recv recvfrom scandir select send sendto setsockopt shutdown snprintf
socket sockets socklen stdint strcase strverscmp sys_socket sys_stat time_r
timespec u64 unistd valgrind-tests vasprintf version-etc version-etc-fsf
vfprintf-posix vprintf-posix vsnprintf warnings
+# gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu
--source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gl/tests
--aux-dir=build-aux --with-tests --avoid=alignof-tests --avoid=lseek-tests
--no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept
alloca alphasort argp bind byteswap c-ctype close connect error extensions func
getpass getsubopt gettext gettime havelib inet_ntop inet_pton lib-msvc-compat
lib-symbol-versions listen maintainer-makefile manywarnings memmem-simple
minmax netdb netinet_in progname read-file recv recvfrom scandir select send
sendto setsockopt shutdown snprintf socket sockets socklen stdint strcase
strverscmp sys_socket sys_stat time_r timespec u64 unistd valgrind-tests
vasprintf version-etc version-etc-fsf vfprintf-posix vprintf-posix vsnprintf
warnings
# Specification in the form of a few gnulib-tool.m4 macro invocations:
gl_LOCAL_DIR([gl/override])
@@ -41,8 +41,6 @@ gl_MODULES([
c-ctype
close
connect
- crypto/hmac-md5
- crypto/md5
error
extensions
func
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 1461989..9e8e355 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -63,10 +63,6 @@ AC_DEFUN([gl_EARLY],
# Code from module closedir:
# Code from module connect:
# Code from module connect-tests:
- # Code from module crypto/hmac-md5:
- # Code from module crypto/hmac-md5-tests:
- # Code from module crypto/md5:
- # Code from module crypto/md5-tests:
# Code from module dirent:
# Code from module dirent-tests:
# Code from module dirname-lgpl:
@@ -183,7 +179,6 @@ AC_DEFUN([gl_EARLY],
# Code from module memchr-tests:
# Code from module memmem-simple:
# Code from module mempcpy:
- # Code from module memxor:
# Code from module minmax:
# Code from module msvc-inval:
# Code from module msvc-nothrow:
@@ -404,7 +399,6 @@ if test "$ac_cv_header_winsock2_h" = yes; then
AC_LIBOBJ([connect])
fi
gl_SYS_SOCKET_MODULE_INDICATOR([connect])
-gl_MD5
gl_DIRENT_H
gl_DIRNAME_LGPL
gl_DOUBLE_SLASH_ROOT
@@ -592,7 +586,6 @@ if test $HAVE_MEMPCPY = 0; then
gl_PREREQ_MEMPCPY
fi
gl_STRING_MODULE_INDICATOR([mempcpy])
-gl_MEMXOR
gl_MINMAX
gl_MSVC_INVAL
if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
@@ -1153,8 +1146,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/gettext.h
lib/gettime.c
lib/gettimeofday.c
- lib/hmac-md5.c
- lib/hmac.h
lib/inet_ntop.c
lib/inet_pton.c
lib/intprops.h
@@ -1170,14 +1161,10 @@ AC_DEFUN([gl_FILE_LIST], [
lib/lseek.c
lib/malloc.c
lib/math.in.h
- lib/md5.c
- lib/md5.h
lib/memchr.c
lib/memchr.valgrind
lib/memmem.c
lib/mempcpy.c
- lib/memxor.c
- lib/memxor.h
lib/minmax.h
lib/msvc-inval.c
lib/msvc-inval.h
@@ -1349,11 +1336,9 @@ AC_DEFUN([gl_FILE_LIST], [
m4/malloca.m4
m4/manywarnings.m4
m4/math_h.m4
- m4/md5.m4
m4/memchr.m4
m4/memmem.m4
m4/mempcpy.m4
- m4/memxor.m4
m4/minmax.m4
m4/mmap-anon.m4
m4/mode_t.m4
@@ -1508,7 +1493,6 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-getopt_long.h
tests/test-getpeername.c
tests/test-gettimeofday.c
- tests/test-hmac-md5.c
tests/test-ignore-value.c
tests/test-inet_ntop.c
tests/test-inet_pton.c
@@ -1528,7 +1512,6 @@ AC_DEFUN([gl_FILE_LIST], [
tests/test-malloc-gnu.c
tests/test-malloca.c
tests/test-math.c
- tests/test-md5.c
tests/test-memchr.c
tests/test-netdb.c
tests/test-netinet_in.c
diff --git a/gl/m4/md5.m4 b/gl/m4/md5.m4
deleted file mode 100644
index 4b41a85..0000000
--- a/gl/m4/md5.m4
+++ /dev/null
@@ -1,13 +0,0 @@
-# md5.m4 serial 12
-dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MD5],
-[
- dnl Prerequisites of lib/md5.c.
- AC_REQUIRE([gl_BIGENDIAN])
- AC_REQUIRE([AC_C_INLINE])
- :
-])
diff --git a/gl/m4/memxor.m4 b/gl/m4/memxor.m4
deleted file mode 100644
index 10c3313..0000000
--- a/gl/m4/memxor.m4
+++ /dev/null
@@ -1,10 +0,0 @@
-# memxor.m4 serial 4
-dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_MEMXOR],
-[
- AC_REQUIRE([AC_C_RESTRICT])
-])
diff --git a/gl/md5.c b/gl/md5.c
deleted file mode 100644
index b7fad63..0000000
--- a/gl/md5.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/* Functions to compute MD5 message digest of files or memory blocks.
- according to the definition of MD5 in RFC 1321 from April 1992.
- Copyright (C) 1995-1997, 1999-2001, 2005-2006, 2008-2011 Free Software
- Foundation, Inc.
- This file is part of the GNU C Library.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 3, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-/* Written by Ulrich Drepper <address@hidden>, 1995. */
-
-#include <config.h>
-
-#include "md5.h"
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#if USE_UNLOCKED_IO
-# include "unlocked-io.h"
-#endif
-
-#ifdef _LIBC
-# include <endian.h>
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define WORDS_BIGENDIAN 1
-# endif
-/* We need to keep the namespace clean so define the MD5 function
- protected using leading __ . */
-# define md5_init_ctx __md5_init_ctx
-# define md5_process_block __md5_process_block
-# define md5_process_bytes __md5_process_bytes
-# define md5_finish_ctx __md5_finish_ctx
-# define md5_read_ctx __md5_read_ctx
-# define md5_stream __md5_stream
-# define md5_buffer __md5_buffer
-#endif
-
-#ifdef WORDS_BIGENDIAN
-# define SWAP(n) \
- (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
-#else
-# define SWAP(n) (n)
-#endif
-
-#define BLOCKSIZE 32768
-#if BLOCKSIZE % 64 != 0
-# error "invalid BLOCKSIZE"
-#endif
-
-/* This array contains the bytes used to pad the buffer to the next
- 64-byte boundary. (RFC 1321, 3.1: Step 1) */
-static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
-
-
-/* Initialize structure containing state of computation.
- (RFC 1321, 3.3: Step 3) */
-void
-md5_init_ctx (struct md5_ctx *ctx)
-{
- ctx->A = 0x67452301;
- ctx->B = 0xefcdab89;
- ctx->C = 0x98badcfe;
- ctx->D = 0x10325476;
-
- ctx->total[0] = ctx->total[1] = 0;
- ctx->buflen = 0;
-}
-
-/* Copy the 4 byte value from v into the memory location pointed to by *cp,
- If your architecture allows unaligned access this is equivalent to
- * (uint32_t *) cp = v */
-static inline void
-set_uint32 (char *cp, uint32_t v)
-{
- memcpy (cp, &v, sizeof v);
-}
-
-/* Put result from CTX in first 16 bytes following RESBUF. The result
- must be in little endian byte order. */
-void *
-md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
-{
- char *r = resbuf;
- set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A));
- set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B));
- set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C));
- set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D));
-
- return resbuf;
-}
-
-/* Process the remaining bytes in the internal buffer and the usual
- prolog according to the standard and write the result to RESBUF. */
-void *
-md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
-{
- /* Take yet unprocessed bytes into account. */
- uint32_t bytes = ctx->buflen;
- size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
-
- /* Now count remaining bytes. */
- ctx->total[0] += bytes;
- if (ctx->total[0] < bytes)
- ++ctx->total[1];
-
- /* Put the 64-bit file length in *bits* at the end of the buffer. */
- ctx->buffer[size - 2] = SWAP (ctx->total[0] << 3);
- ctx->buffer[size - 1] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
-
- memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes);
-
- /* Process last bytes. */
- md5_process_block (ctx->buffer, size * 4, ctx);
-
- return md5_read_ctx (ctx, resbuf);
-}
-
-/* Compute MD5 message digest for bytes read from STREAM. The
- resulting message digest number will be written into the 16 bytes
- beginning at RESBLOCK. */
-int
-md5_stream (FILE *stream, void *resblock)
-{
- struct md5_ctx ctx;
- size_t sum;
-
- char *buffer = malloc (BLOCKSIZE + 72);
- if (!buffer)
- return 1;
-
- /* Initialize the computation context. */
- md5_init_ctx (&ctx);
-
- /* Iterate over full file contents. */
- while (1)
- {
- /* We read the file in blocks of BLOCKSIZE bytes. One call of the
- computation function processes the whole buffer so that with the
- next round of the loop another block can be read. */
- size_t n;
- sum = 0;
-
- /* Read block. Take care for partial reads. */
- while (1)
- {
- n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
-
- sum += n;
-
- if (sum == BLOCKSIZE)
- break;
-
- if (n == 0)
- {
- /* Check for the error flag IFF N == 0, so that we don't
- exit the loop after a partial read due to e.g., EAGAIN
- or EWOULDBLOCK. */
- if (ferror (stream))
- {
- free (buffer);
- return 1;
- }
- goto process_partial_block;
- }
-
- /* We've read at least one byte, so ignore errors. But always
- check for EOF, since feof may be true even though N > 0.
- Otherwise, we could end up calling fread after EOF. */
- if (feof (stream))
- goto process_partial_block;
- }
-
- /* Process buffer with BLOCKSIZE bytes. Note that
- BLOCKSIZE % 64 == 0
- */
- md5_process_block (buffer, BLOCKSIZE, &ctx);
- }
-
-process_partial_block:
-
- /* Process any remaining bytes. */
- if (sum > 0)
- md5_process_bytes (buffer, sum, &ctx);
-
- /* Construct result in desired memory. */
- md5_finish_ctx (&ctx, resblock);
- free (buffer);
- return 0;
-}
-
-/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
- result is always in little endian byte order, so that a byte-wise
- output yields to the wanted ASCII representation of the message
- digest. */
-void *
-md5_buffer (const char *buffer, size_t len, void *resblock)
-{
- struct md5_ctx ctx;
-
- /* Initialize the computation context. */
- md5_init_ctx (&ctx);
-
- /* Process whole buffer but last len % 64 bytes. */
- md5_process_bytes (buffer, len, &ctx);
-
- /* Put result in desired memory area. */
- return md5_finish_ctx (&ctx, resblock);
-}
-
-
-void
-md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
- /* When we already have some bits in our internal buffer concatenate
- both inputs first. */
- if (ctx->buflen != 0)
- {
- size_t left_over = ctx->buflen;
- size_t add = 128 - left_over > len ? len : 128 - left_over;
-
- memcpy (&((char *) ctx->buffer)[left_over], buffer, add);
- ctx->buflen += add;
-
- if (ctx->buflen > 64)
- {
- md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
-
- ctx->buflen &= 63;
- /* The regions in the following copy operation cannot overlap. */
- memcpy (ctx->buffer,
- &((char *) ctx->buffer)[(left_over + add) & ~63],
- ctx->buflen);
- }
-
- buffer = (const char *) buffer + add;
- len -= add;
- }
-
- /* Process available complete blocks. */
- if (len >= 64)
- {
-#if !_STRING_ARCH_unaligned
-# define alignof(type) offsetof (struct { char c; type x; }, x)
-# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0)
- if (UNALIGNED_P (buffer))
- while (len > 64)
- {
- md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
- buffer = (const char *) buffer + 64;
- len -= 64;
- }
- else
-#endif
- {
- md5_process_block (buffer, len & ~63, ctx);
- buffer = (const char *) buffer + (len & ~63);
- len &= 63;
- }
- }
-
- /* Move remaining bytes in internal buffer. */
- if (len > 0)
- {
- size_t left_over = ctx->buflen;
-
- memcpy (&((char *) ctx->buffer)[left_over], buffer, len);
- left_over += len;
- if (left_over >= 64)
- {
- md5_process_block (ctx->buffer, 64, ctx);
- left_over -= 64;
- memcpy (ctx->buffer, &ctx->buffer[16], left_over);
- }
- ctx->buflen = left_over;
- }
-}
-
-
-/* These are the four functions used in the four steps of the MD5 algorithm
- and defined in the RFC 1321. The first function is a little bit optimized
- (as found in Colin Plumbs public domain implementation). */
-/* #define FF(b, c, d) ((b & c) | (~b & d)) */
-#define FF(b, c, d) (d ^ (b & (c ^ d)))
-#define FG(b, c, d) FF (d, b, c)
-#define FH(b, c, d) (b ^ c ^ d)
-#define FI(b, c, d) (c ^ (b | ~d))
-
-/* Process LEN bytes of BUFFER, accumulating context into CTX.
- It is assumed that LEN % 64 == 0. */
-
-void
-md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
-{
- uint32_t correct_words[16];
- const uint32_t *words = buffer;
- size_t nwords = len / sizeof (uint32_t);
- const uint32_t *endp = words + nwords;
- uint32_t A = ctx->A;
- uint32_t B = ctx->B;
- uint32_t C = ctx->C;
- uint32_t D = ctx->D;
-
- /* First increment the byte count. RFC 1321 specifies the possible
- length of the file up to 2^64 bits. Here we only compute the
- number of bytes. Do a double word increment. */
- ctx->total[0] += len;
- if (ctx->total[0] < len)
- ++ctx->total[1];
-
- /* Process all bytes in the buffer with 64 bytes in each round of
- the loop. */
- while (words < endp)
- {
- uint32_t *cwp = correct_words;
- uint32_t A_save = A;
- uint32_t B_save = B;
- uint32_t C_save = C;
- uint32_t D_save = D;
-
- /* First round: using the given function, the context and a constant
- the next context is computed. Because the algorithms processing
- unit is a 32-bit word and it is determined to work on words in
- little endian byte order we perhaps have to change the byte order
- before the computation. To reduce the work for the next steps
- we store the swapped words in the array CORRECT_WORDS. */
-
-#define OP(a, b, c, d, s, T) \
- do \
- { \
- a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
- ++words; \
- CYCLIC (a, s); \
- a += b; \
- } \
- while (0)
-
- /* It is unfortunate that C does not provide an operator for
- cyclic rotation. Hope the C compiler is smart enough. */
-#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
-
- /* Before we start, one word to the strange constants.
- They are defined in RFC 1321 as
-
- T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
-
- Here is an equivalent invocation using Perl:
-
- perl -e 'foreach(1..64){printf "0x%08x\n", int (4294967296 * abs (sin
$_))}'
- */
-
- /* Round 1. */
- OP (A, B, C, D, 7, 0xd76aa478);
- OP (D, A, B, C, 12, 0xe8c7b756);
- OP (C, D, A, B, 17, 0x242070db);
- OP (B, C, D, A, 22, 0xc1bdceee);
- OP (A, B, C, D, 7, 0xf57c0faf);
- OP (D, A, B, C, 12, 0x4787c62a);
- OP (C, D, A, B, 17, 0xa8304613);
- OP (B, C, D, A, 22, 0xfd469501);
- OP (A, B, C, D, 7, 0x698098d8);
- OP (D, A, B, C, 12, 0x8b44f7af);
- OP (C, D, A, B, 17, 0xffff5bb1);
- OP (B, C, D, A, 22, 0x895cd7be);
- OP (A, B, C, D, 7, 0x6b901122);
- OP (D, A, B, C, 12, 0xfd987193);
- OP (C, D, A, B, 17, 0xa679438e);
- OP (B, C, D, A, 22, 0x49b40821);
-
- /* For the second to fourth round we have the possibly swapped words
- in CORRECT_WORDS. Redefine the macro to take an additional first
- argument specifying the function to use. */
-#undef OP
-#define OP(f, a, b, c, d, k, s, T) \
- do \
- { \
- a += f (b, c, d) + correct_words[k] + T; \
- CYCLIC (a, s); \
- a += b; \
- } \
- while (0)
-
- /* Round 2. */
- OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
- OP (FG, D, A, B, C, 6, 9, 0xc040b340);
- OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
- OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
- OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
- OP (FG, D, A, B, C, 10, 9, 0x02441453);
- OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
- OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
- OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
- OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
- OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
- OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
- OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
- OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
- OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
- OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
-
- /* Round 3. */
- OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
- OP (FH, D, A, B, C, 8, 11, 0x8771f681);
- OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
- OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
- OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
- OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
- OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
- OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
- OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
- OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
- OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
- OP (FH, B, C, D, A, 6, 23, 0x04881d05);
- OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
- OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
- OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
- OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
-
- /* Round 4. */
- OP (FI, A, B, C, D, 0, 6, 0xf4292244);
- OP (FI, D, A, B, C, 7, 10, 0x432aff97);
- OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
- OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
- OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
- OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
- OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
- OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
- OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
- OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
- OP (FI, C, D, A, B, 6, 15, 0xa3014314);
- OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
- OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
- OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
- OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
- OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
-
- /* Add the starting values of the context. */
- A += A_save;
- B += B_save;
- C += C_save;
- D += D_save;
- }
-
- /* Put checksum in context given as argument. */
- ctx->A = A;
- ctx->B = B;
- ctx->C = C;
- ctx->D = D;
-}
diff --git a/gl/md5.h b/gl/md5.h
deleted file mode 100644
index 53e6048..0000000
--- a/gl/md5.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* Declaration of functions and data types used for MD5 sum computing
- library functions.
- Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2008-2011 Free Software
- Foundation, Inc.
- This file is part of the GNU C Library.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 3, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-#ifndef _MD5_H
-#define _MD5_H 1
-
-#include <stdio.h>
-#include <stdint.h>
-
-#define MD5_DIGEST_SIZE 16
-#define MD5_BLOCK_SIZE 64
-
-#ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-# define __GNUC_PREREQ(maj, min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-# define __GNUC_PREREQ(maj, min) 0
-# endif
-#endif
-
-#ifndef __THROW
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-# define __THROW throw ()
-# else
-# define __THROW
-# endif
-#endif
-
-#ifndef _LIBC
-# define __md5_buffer md5_buffer
-# define __md5_finish_ctx md5_finish_ctx
-# define __md5_init_ctx md5_init_ctx
-# define __md5_process_block md5_process_block
-# define __md5_process_bytes md5_process_bytes
-# define __md5_read_ctx md5_read_ctx
-# define __md5_stream md5_stream
-#endif
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-/* Structure to save state of computation between the single steps. */
-struct md5_ctx
-{
- uint32_t A;
- uint32_t B;
- uint32_t C;
- uint32_t D;
-
- uint32_t total[2];
- uint32_t buflen;
- uint32_t buffer[32];
-};
-
-/*
- * The following three functions are build up the low level used in
- * the functions `md5_stream' and `md5_buffer'.
- */
-
-/* Initialize structure containing state of computation.
- (RFC 1321, 3.3: Step 3) */
-extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
-
-/* Starting with the result of former calls of this function (or the
- initialization function update the context for the next LEN bytes
- starting at BUFFER.
- It is necessary that LEN is a multiple of 64!!! */
-extern void __md5_process_block (const void *buffer, size_t len,
- struct md5_ctx *ctx) __THROW;
-
-/* Starting with the result of former calls of this function (or the
- initialization function update the context for the next LEN bytes
- starting at BUFFER.
- It is NOT required that LEN is a multiple of 64. */
-extern void __md5_process_bytes (const void *buffer, size_t len,
- struct md5_ctx *ctx) __THROW;
-
-/* Process the remaining bytes in the buffer and put result from CTX
- in first 16 bytes following RESBUF. The result is always in little
- endian byte order, so that a byte-wise output yields to the wanted
- ASCII representation of the message digest. */
-extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
-
-
-/* Put result from CTX in first 16 bytes following RESBUF. The result is
- always in little endian byte order, so that a byte-wise output yields
- to the wanted ASCII representation of the message digest. */
-extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
-
-
-/* Compute MD5 message digest for bytes read from STREAM. The
- resulting message digest number will be written into the 16 bytes
- beginning at RESBLOCK. */
-extern int __md5_stream (FILE *stream, void *resblock) __THROW;
-
-/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
- result is always in little endian byte order, so that a byte-wise
- output yields to the wanted ASCII representation of the message
- digest. */
-extern void *__md5_buffer (const char *buffer, size_t len,
- void *resblock) __THROW;
-
-# ifdef __cplusplus
-}
-# endif
-
-#endif /* md5.h */
diff --git a/gl/memxor.c b/gl/memxor.c
deleted file mode 100644
index b80b430..0000000
--- a/gl/memxor.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* memxor.c -- perform binary exclusive OR operation of two memory blocks.
- Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-/* Written by Simon Josefsson. The interface was inspired by memxor
- in Niels Möller's Nettle. */
-
-#include <config.h>
-
-#include "memxor.h"
-
-void *
-gl_memxor (void *restrict dest, const void *restrict src, size_t n)
-{
- char const *s = src;
- char *d = dest;
-
- for (; n > 0; n--)
- *d++ ^= *s++;
-
- return dest;
-}
diff --git a/gl/memxor.h b/gl/memxor.h
deleted file mode 100644
index fbf2ac3..0000000
--- a/gl/memxor.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* memxor.h -- perform binary exclusive OR operation on memory blocks.
- Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-
-/* Written by Simon Josefsson. The interface was inspired by memxor
- in Niels Möller's Nettle. */
-
-#ifndef MEMXOR_H
-# define MEMXOR_H
-
-#include <stddef.h>
-
-/* 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 *gl_memxor (void *restrict dest, const void *restrict src, size_t n);
-
-#endif /* MEMXOR_H */
diff --git a/gl/tests/Makefile.am b/gl/tests/Makefile.am
index 4759912..4a96e59 100644
--- a/gl/tests/Makefile.am
+++ b/gl/tests/Makefile.am
@@ -151,22 +151,6 @@ EXTRA_DIST += test-connect.c signature.h macros.h
## end gnulib module connect-tests
-## begin gnulib module crypto/hmac-md5-tests
-
-TESTS += test-hmac-md5
-check_PROGRAMS += test-hmac-md5
-EXTRA_DIST += test-hmac-md5.c
-
-## end gnulib module crypto/hmac-md5-tests
-
-## begin gnulib module crypto/md5-tests
-
-TESTS += test-md5
-check_PROGRAMS += test-md5
-EXTRA_DIST += test-md5.c
-
-## end gnulib module crypto/md5-tests
-
## begin gnulib module dirent-tests
TESTS += test-dirent
diff --git a/gl/tests/test-hmac-md5.c b/gl/tests/test-hmac-md5.c
deleted file mode 100644
index 575a716..0000000
--- a/gl/tests/test-hmac-md5.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2005, 2010-2011 Free Software Foundation, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Simon Josefsson. */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-#include "hmac.h"
-
-/* Test vectors from RFC 2104. */
-
-int
-main (int argc, char *argv[])
-{
- {
- /*
- key = 0x0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b
- key_len = 16 bytes
- data = "Hi There"
- data_len = 8 bytes
- digest = 0x9294727a3638bb1c13f48ef8158bfc9d
- */
- char *key =
- "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b";
- size_t key_len = 16;
- char *data = "Hi There";
- size_t data_len = 8;
- char *digest =
- "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d";
- char out[16];
-
- if (hmac_md5 (key, key_len, data, data_len, out) != 0)
- {
- printf ("call failure\n");
- return 1;
- }
-
- if (memcmp (digest, out, 16) != 0)
- {
- size_t i;
- printf ("hash 1 mismatch. expected:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", digest[i] & 0xFF);
- printf ("\ncomputed:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", out[i] & 0xFF);
- printf ("\n");
- return 1;
- }
- }
-
- {
- /*
- key = "Jefe"
- data = "what do ya want for nothing?"
- data_len = 28 bytes
- digest = 0x750c783e6ab0b503eaa86e310a5db738
- */
- char *key = "Jefe";
- size_t key_len = 4;
- char *data = "what do ya want for nothing?";
- size_t data_len = 28;
- char *digest =
- "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38";
- char out[16];
-
- if (hmac_md5 (key, key_len, data, data_len, out) != 0)
- {
- printf ("call failure\n");
- return 1;
- }
-
- if (memcmp (digest, out, 16) != 0)
- {
- size_t i;
- printf ("hash 2 mismatch. expected:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", digest[i] & 0xFF);
- printf ("\ncomputed:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", out[i] & 0xFF);
- printf ("\n");
- return 1;
- }
- }
-
- {
- /*
- key = 0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
- key_len 16 bytes
- data = 0xDDDDDDDDDDDDDDDDDDDD...
- ..DDDDDDDDDDDDDDDDDDDD...
- ..DDDDDDDDDDDDDDDDDDDD...
- ..DDDDDDDDDDDDDDDDDDDD...
- ..DDDDDDDDDDDDDDDDDDDD
- data_len = 50 bytes
- digest = 0x56be34521d144c88dbb8c733f0e8b3f6
- */
- char *key =
- "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA";
- size_t key_len = 16;
- char *data = "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
- "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
- "\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD"
- "\xDD\xDD";
- size_t data_len = 50;
- char *digest =
- "\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6";
- char out[16];
-
- if (hmac_md5 (key, key_len, data, data_len, out) != 0)
- {
- printf ("call failure\n");
- return 1;
- }
-
- if (memcmp (digest, out, 16) != 0)
- {
- size_t i;
- printf ("hash 3 mismatch. expected:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", digest[i] & 0xFF);
- printf ("\ncomputed:\n");
- for (i = 0; i < 16; i++)
- printf ("%02x ", out[i] & 0xFF);
- printf ("\n");
- return 1;
- }
- }
-
- return 0;
-}
diff --git a/gl/tests/test-md5.c b/gl/tests/test-md5.c
deleted file mode 100644
index 99d49b8..0000000
--- a/gl/tests/test-md5.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
- * Written by Simon Josefsson
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-/* Written by Simon Josefsson. */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "md5.h"
-
-int
-main (void)
-{
- /* Test vectors from RFC 1321. */
-
- const char *in1 = "abc";
- const char *out1 =
- "\x90\x01\x50\x98\x3C\xD2\x4F\xB0\xD6\x96\x3F\x7D\x28\xE1\x7F\x72";
- const char *in2 = "message digest";
- const char *out2 =
- "\xF9\x6B\x69\x7D\x7C\xB7\x93\x8D\x52\x5A\x2F\x31\xAA\xF1\x61\xD0";
- char buf[MD5_DIGEST_SIZE];
-
- if (memcmp (md5_buffer (in1, strlen (in1), buf), out1, MD5_DIGEST_SIZE) != 0)
- {
- size_t i;
- printf ("expected:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", out1[i] & 0xFF);
- printf ("\ncomputed:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", buf[i] & 0xFF);
- printf ("\n");
- return 1;
- }
-
- if (memcmp (md5_buffer (in2, strlen (in2), buf), out2, MD5_DIGEST_SIZE) != 0)
- {
- size_t i;
- printf ("expected:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", out2[i] & 0xFF);
- printf ("\ncomputed:\n");
- for (i = 0; i < MD5_DIGEST_SIZE; i++)
- printf ("%02x ", buf[i] & 0xFF);
- printf ("\n");
- return 1;
- }
-
- return 0;
-}
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_0_5-15-g588f31d,
Nikos Mavrogiannopoulos <=