diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | cipher/ChangeLog | 6 | ||||
| -rw-r--r-- | cipher/Makefile.am | 18 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | random/ChangeLog | 17 | ||||
| -rw-r--r-- | random/Makefile.am | 47 | ||||
| -rw-r--r-- | random/rand-internal.h (renamed from cipher/rand-internal.h) | 0 | ||||
| -rw-r--r-- | random/random-daemon.c (renamed from cipher/random-daemon.c) | 0 | ||||
| -rw-r--r-- | random/random.c (renamed from cipher/random.c) | 2 | ||||
| -rw-r--r-- | random/random.h (renamed from cipher/random.h) | 0 | ||||
| -rw-r--r-- | random/rndegd.c (renamed from cipher/rndegd.c) | 0 | ||||
| -rw-r--r-- | random/rndhw.c (renamed from cipher/rndhw.c) | 0 | ||||
| -rw-r--r-- | random/rndlinux.c (renamed from cipher/rndlinux.c) | 0 | ||||
| -rw-r--r-- | random/rndunix.c (renamed from cipher/rndunix.c) | 0 | ||||
| -rw-r--r-- | random/rndw32.c (renamed from cipher/rndw32.c) | 0 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/cipher.h | 2 |
19 files changed, 95 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2008-07-05 Werner Koch <wk@g10code.com> + + * random/: New. + * Makefile.am (DIST_SUBDIRS): Add random. + * configure.ac (AC_CONFIG_FILES): Add random/Makefile. + 2008-04-25 Werner Koch <wk@g10code.com> Release 1.4.1. diff --git a/Makefile.am b/Makefile.am index d73eea2c..87eeff00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia -DIST_SUBDIRS = m4 mpi cipher src doc tests -SUBDIRS = mpi cipher src doc tests +DIST_SUBDIRS = m4 mpi cipher random src doc tests +SUBDIRS = mpi cipher random src doc tests EXTRA_DIST = BUGS autogen.sh README.SVN DISTCLEANFILES = diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 425e1985..b5b52161 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,9 @@ +2008-07-05 Werner Koch <wk@g10code.com> + + * random-daemon.c, random.h, rndhw.c, rndunix.c, rand-internal.h + * random.c, rndegd.c, rndlinux.c, rndw32.c: Move to ../cipher. + * Makefile.am: Remove random stuff. + 2008-06-24 Szakats Istvan <szaki.ms@gmail.com> (wk) * ac.c (_gcry_ac_key_destroy, _gcry_ac_key_pair_generate): Relase diff --git a/cipher/Makefile.am b/cipher/Makefile.am index f1c32f4d..40ece5a6 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -15,8 +15,7 @@ # GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# License along with this program; if not, see <http://www.gnu.org/licenses/>. # Process this file with automake to produce Makefile.in @@ -30,8 +29,7 @@ AM_CFLAGS = $(GPG_ERROR_CFLAGS) noinst_LTLIBRARIES = libcipher.la -GCRYPT_MODULES = @GCRYPT_CIPHERS@ @GCRYPT_PUBKEY_CIPHERS@ @GCRYPT_DIGESTS@ \ - @GCRYPT_RANDOM@ +GCRYPT_MODULES = @GCRYPT_CIPHERS@ @GCRYPT_PUBKEY_CIPHERS@ @GCRYPT_DIGESTS@ libcipher_la_DEPENDENCIES = $(GCRYPT_MODULES) libcipher_la_LIBADD = $(GCRYPT_MODULES) @@ -40,16 +38,8 @@ libcipher_la_SOURCES = \ cipher.c pubkey.c ac.c md.c \ bithelp.h \ primegen.c \ -random.c random.h \ -rndhw.c \ -rand-internal.h \ rmd.h -if USE_RANDOM_DAEMON -libcipher_la_SOURCES += random-daemon.c -endif USE_RANDOM_DAEMON - - EXTRA_libcipher_la_SOURCES = \ arcfour.c \ blowfish.c \ @@ -63,10 +53,6 @@ md4.c \ md5.c \ rijndael.c rijndael-tables.h \ rmd160.c \ -rndlinux.c \ -rndegd.c \ -rndunix.c \ -rndw32.c \ rsa.c \ seed.c \ serpent.c \ diff --git a/configure.ac b/configure.ac index cc659ed7..c81903f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,6 +1081,7 @@ Makefile m4/Makefile mpi/Makefile cipher/Makefile +random/Makefile doc/Makefile src/Makefile src/gcrypt.h diff --git a/random/ChangeLog b/random/ChangeLog new file mode 100644 index 00000000..f3e685de --- /dev/null +++ b/random/ChangeLog @@ -0,0 +1,17 @@ +2008-07-05 Werner Koch <wk@g10code.com> + + * random-daemon.c, random.h, rndhw.c, rndunix.c, rand-internal.h * + random.c, rndegd.c, rndlinux.c, rndw32.c: Move from ../cipher/ to + here. + * Makefile.am: New. + + Copyright 2008 Free Software Foundation, Inc. + + This file is free software; as a special exception the author gives + unlimited permission to copy and/or distribute it, with or without + modifications, as long as this notice is preserved. + + This file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +
\ No newline at end of file diff --git a/random/Makefile.am b/random/Makefile.am new file mode 100644 index 00000000..b5a7c457 --- /dev/null +++ b/random/Makefile.am @@ -0,0 +1,47 @@ +# Makefile for cipher modules +# Copyright (C) 2008 Free Software Foundation, Inc. +# +# This file is part of Libgcrypt. +# +# Libgcrypt is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# Libgcrypt 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, see <http://www.gnu.org/licenses/>. + +# Process this file with automake to produce Makefile.in + +# Need to include ../src in addition to top_srcdir because gcrypt.h is +# a built header. +AM_CPPFLAGS = -I../src -I$(top_srcdir)/src +AM_CFLAGS = $(GPG_ERROR_CFLAGS) + +noinst_LTLIBRARIES = librandom.la + +GCRYPT_MODULES = @GCRYPT_RANDOM@ + +librandom_la_DEPENDENCIES = $(GCRYPT_MODULES) +librandom_la_LIBADD = $(GCRYPT_MODULES) + +librandom_la_SOURCES = \ +random.c random.h \ +rndhw.c \ +rand-internal.h + +if USE_RANDOM_DAEMON +librandom_la_SOURCES += random-daemon.c +endif USE_RANDOM_DAEMON + + +EXTRA_librandom_la_SOURCES = \ +rndlinux.c \ +rndegd.c \ +rndunix.c \ +rndw32.c diff --git a/cipher/rand-internal.h b/random/rand-internal.h index 9ba40229..9ba40229 100644 --- a/cipher/rand-internal.h +++ b/random/rand-internal.h diff --git a/cipher/random-daemon.c b/random/random-daemon.c index 0b79e5c5..0b79e5c5 100644 --- a/cipher/random-daemon.c +++ b/random/random-daemon.c diff --git a/cipher/random.c b/random/random.c index f145116f..3db72961 100644 --- a/cipher/random.c +++ b/random/random.c @@ -51,7 +51,7 @@ #include <process.h> #endif #include "g10lib.h" -#include "rmd.h" +#include "../cipher/rmd.h" #include "random.h" #include "rand-internal.h" #include "cipher.h" /* Required for the rmd160_hash_buffer() prototype. */ diff --git a/cipher/random.h b/random/random.h index 726a3794..726a3794 100644 --- a/cipher/random.h +++ b/random/random.h diff --git a/cipher/rndegd.c b/random/rndegd.c index 63a5e0f1..63a5e0f1 100644 --- a/cipher/rndegd.c +++ b/random/rndegd.c diff --git a/cipher/rndhw.c b/random/rndhw.c index 577bd155..577bd155 100644 --- a/cipher/rndhw.c +++ b/random/rndhw.c diff --git a/cipher/rndlinux.c b/random/rndlinux.c index 574ef6dc..574ef6dc 100644 --- a/cipher/rndlinux.c +++ b/random/rndlinux.c diff --git a/cipher/rndunix.c b/random/rndunix.c index 0524ca8c..0524ca8c 100644 --- a/cipher/rndunix.c +++ b/random/rndunix.c diff --git a/cipher/rndw32.c b/random/rndw32.c index 74007e31..74007e31 100644 --- a/cipher/rndw32.c +++ b/random/rndw32.c diff --git a/src/ChangeLog b/src/ChangeLog index 25faf359..427e86e6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-07-05 Werner Koch <wk@g10code.com> + + * Makefile.am: Include librandom.la. + 2008-04-18 Werner Koch <wk@g10code.com> * missing-string.c (vasprintf): Remove. It is not used. Reported diff --git a/src/Makefile.am b/src/Makefile.am index e2e27fe8..046116a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,9 +88,15 @@ endif !HAVE_W32_SYSTEM libgcrypt_la_LDFLAGS = $(gcrypt_res_ldflag) $(no_undefined) $(export_symbols) \ $(libgcrypt_version_script_cmd) -version-info \ @LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@ -libgcrypt_la_DEPENDENCIES = ../cipher/libcipher.la ../mpi/libmpi.la \ +libgcrypt_la_DEPENDENCIES = \ + ../cipher/libcipher.la \ + ../random/librandom.la \ + ../mpi/libmpi.la \ $(srcdir)/libgcrypt.vers $(gcrypt_deps) -libgcrypt_la_LIBADD = ../cipher/libcipher.la ../mpi/libmpi.la \ +libgcrypt_la_LIBADD = \ + ../cipher/libcipher.la \ + ../random/librandom.la \ + ../mpi/libmpi.la \ @LTLIBOBJS@ @GPG_ERROR_LIBS@ diff --git a/src/cipher.h b/src/cipher.h index 4ac8d7a3..bec4453c 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -24,7 +24,7 @@ #define DBG_CIPHER _gcry_get_debug_flag( 1 ) -#include "../cipher/random.h" +#include "../random/random.h" #define PUBKEY_FLAG_NO_BLINDING (1 << 0) |