diff -ruN silc-toolkit-1.0.2.orig/debian/changelog silc-toolkit-1.0.2/debian/changelog --- silc-toolkit-1.0.2.orig/debian/changelog 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/changelog 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,93 @@ +silc-toolkit (1.0.2-1~dkg1) unstable; urgency=low + + * Example for new upstream release (Closes: #413790) + * NMU: offered by dkg instead of regular maintainer (tweaks to debian/rules and control.sh) + + -- Daniel Kahn Gillmor Sat, 7 Apr 2007 15:30:45 -0400 + +silc-toolkit (0.9.12-6) unstable; urgency=high + + * debian/copyright: Mention new license of SILC draft RFCs. + + Urgency high due to RC bug (Closes: #393412) + + -- Michael C. Schultheiss Mon, 16 Oct 2006 16:32:22 +0000 + +silc-toolkit (0.9.12-5) unstable; urgency=low + + * New Maintainer (Closes: #370794) + + debian/control{,.sh}: Update maintainer address, update Standards + version + * Incorporate NMUs + + -- Michael C. Schultheiss Thu, 24 Aug 2006 20:40:12 +0000 + +silc-toolkit (0.9.12-4.4) unstable; urgency=low + + * Non-maintainer upload. + * Move libsilc.so and libsilcclient.so to the -dev package (Closes: + #379800). + + -- Julien Cristau Wed, 26 Jul 2006 13:42:57 +0200 + +silc-toolkit (0.9.12-4.3) unstable; urgency=high + + * Non-maintainer upload. + * Fix empty packages (Closes: #331630) + * Bump standards version + + -- Julien Danjou Tue, 25 Jul 2006 17:50:00 +0200 + +silc-toolkit (0.9.12-4.2) unstable; urgency=low + + * 0-day NMU to fix an RC bug. + * Explicitly execute debian/control.sh with sh as suggested by Andreas + Jochens (closes: bug#328924). + + -- Aurelien Jarno Mon, 6 Feb 2006 20:24:24 +0100 + +silc-toolkit (0.9.12-4.1) unstable; urgency=low + + * This is an NMU, I don't know why Tamas didn't want to fix this. + rebuild control file whenever shared library's soname + changes, to satisfy debian policy requirements for + shared package names. (closes: 323035) See section 8.1 + for more details. + http://www.debian.org/doc/debian-policy/ch-sharedlibs.html + Though policy doesn't mention it, the point is to provide a migration + path when for other packages when changes to the lib require changes + to the soname. + + -- Raul Miller Sat, 10 Sep 2005 13:04:57 -0400 + +silc-toolkit (0.9.12-4) unstable; urgency=low + + * RC5 removed (closes: #279146) + * check the list archive, I asked for some problems, + nobody answered it (closes: #273871) + + -- Tamas SZERB Sun, 7 Nov 2004 17:06:53 +0100 + +silc-toolkit (0.9.12-3) unstable; urgency=low + + * beat me, Randall Donald noticed + that I messed up the license file pointer to the copyright + file, it is fixed now. + + -- Tamas SZERB Tue, 17 Aug 2004 12:21:38 +0200 + +silc-toolkit (0.9.12-2) unstable; urgency=low + + * according the email of Randall Donald + on Mon, 16 Aug 2004 02:42:14 -0400 + file pointer to the full GPL text in base-files applied into + the copyright file and + * the -dev packaged moved from devel to libdevel + + -- Tamas SZERB Mon, 16 Aug 2004 12:30:17 +0200 + +silc-toolkit (0.9.12-1) unstable; urgency=low + + * Initial Release. (closes: #118202, #246148) + + -- Tamas SZERB Wed, 7 Jan 2004 15:56:35 +0100 + diff -ruN silc-toolkit-1.0.2.orig/debian/compat silc-toolkit-1.0.2/debian/compat --- silc-toolkit-1.0.2.orig/debian/compat 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/compat 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1 @@ +4 diff -ruN silc-toolkit-1.0.2.orig/debian/control silc-toolkit-1.0.2/debian/control --- silc-toolkit-1.0.2.orig/debian/control 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/control 2007-04-08 12:56:33.000000000 -0400 @@ -0,0 +1,35 @@ +Source: silc-toolkit +Priority: optional +Maintainer: Michael C. Schultheiss +Section: devel +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib1.2-dev +Standards-Version: 3.7.2 + +Package: libsilc-1.0-2-dev +Section: libdevel +Architecture: any +Depends: libsilc-1.0-2 (= ${Source-Version}) +Provides: libsilc-dev +Replaces: libsilc-dev +Conflicts: libsilc-dev +Description: developer files for SILC library (silc-toolkit) + silc-toolkit developer files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + +Package: libsilc-1.0-2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: libsilc +Replaces: libsilc +Conflicts: libsilc +Description: SILC library (silc-toolkit) + silc-toolkit library files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + diff -ruN silc-toolkit-1.0.2.orig/debian/control.sh silc-toolkit-1.0.2/debian/control.sh --- silc-toolkit-1.0.2.orig/debian/control.sh 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/control.sh 2007-04-08 12:56:15.000000000 -0400 @@ -0,0 +1,58 @@ +#!/bin/sh +# +# bring debian/control up to date with the current library soname + +# Note: libsilc should always consist of a single word +# if it's something else, something has been drastically +# changed and it's time to re-think this script +libsilc=$( + objdump -p $2/libsilc.so | + awk '/SONAME/{print $2}' | + sed -e 's/\([0-9]\)\.so\./\1-/; s/\.so\.//' +) + +cat <<___ >$1.tmp +Source: silc-toolkit +Priority: optional +Maintainer: Michael C. Schultheiss +Section: devel +Build-Depends: debhelper (>= 4.0.0), autotools-dev, libglib1.2-dev +Standards-Version: 3.7.2 + +Package: $libsilc-dev +Section: libdevel +Architecture: any +Depends: $libsilc (= \${Source-Version}) +Provides: libsilc-dev +Replaces: libsilc-dev +Conflicts: libsilc-dev +Description: developer files for SILC library (silc-toolkit) + silc-toolkit developer files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + +Package: $libsilc +Section: libs +Architecture: any +Depends: \${shlibs:Depends}, \${misc:Depends} +Provides: libsilc +Replaces: libsilc +Conflicts: libsilc +Description: SILC library (silc-toolkit) + silc-toolkit library files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + +___ + +if diff $1.tmp $1; then + # preserve file modification timestamp on control + rm $1.tmp +else + # update control with recent changes + mv $1.tmp $1 +fi diff -ruN silc-toolkit-1.0.2.orig/debian/copyright silc-toolkit-1.0.2/debian/copyright --- silc-toolkit-1.0.2.orig/debian/copyright 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/copyright 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,65 @@ +This package was debianized by Tamas SZERB on +Wed, 7 Jan 2004 15:56:35 +0100. + +It was downloaded from http://silcnet.org/ + +Upstream Authors: see CREDITS file! + +Copyright: GNU GENERAL PUBLIC LICENSE Version 2 +see: /usr/share/common-licenses/GPL-2 + +The draft SILC RFCs (draft-riikonen-presence-attrs-03.txt, +draft-riikonen-silc-commands-06.txt, +draft-riikonen-silc-flags-payloads-04.txt, +draft-riikonen-silc-ke-auth-08.txt, draft-riikonen-silc-pp-09.txt, +draft-riikonen-silc-spec-08.txt) have the following license (per +Message-ID: , quoted +below): + +: Because the authors of contributions to the IETF standards retain most +: intellectual property rights with respect to such contributions under +: IETF policies in effect during the development of the draft SILC RFCs, +: and because you are an author of said documents, the Debian community +: hereby requests that you kindly agree to release your contributions in +: the draft SILC RFCs under the license below, for inclusion in Debian. +: +: I agree to grant third parties the irrevocable +: right to copy, use and distribute the work, with +: or without modification, in any medium, without royalty, +: provided that, unless separate permission is granted, +: redistributed modified works: +: +: (a) do not contain misleading author, version, name +: of work, or endorsement information, and +: +: (b) do not claim endorsement of the modified work by +: the Contributor, or any organization the +: Contributor belongs to, the Internet Engineering +: Task Force (IETF), Internet Research Task Force +: (IRTF), Internet Engineering Steering Group +: (IESG), Internet Architecture Board (IAB), +: Internet Assigned Numbers Authority (IANA), +: Internet Society (ISOC), Request For Comments +: (RFC) Editor, or any combination or variation of +: such terms (including without limitation the +: IETF "4 diamonds" logo), or any terms that are +: confusingly similar thereto, and +: +: (c) remove any claims of status as an Internet +: Standard, including without limitation removing +: the RFC boilerplate. +: +: The IETF suggests that any citation or excerpt of +: unmodified text reference the RFC or other document from +: which the text is derived. +: +: To indicate that you agree to these terms, please reply to this e-mail +: and quote the license above and indicate that you agree to this. +: +I agree. + + Pekka +________________________________________________________________________ + Pekka Riikonen priikone at silcnet.org + Secure Internet Live Conferencing (SILC) http://silcnet.org/ + diff -ruN silc-toolkit-1.0.2.orig/debian/ctest silc-toolkit-1.0.2/debian/ctest --- silc-toolkit-1.0.2.orig/debian/ctest 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/ctest 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,29 @@ +Source: silc-toolkit FOO +Priority: optional +Maintainer: Tamas SZERB +Section: devel +Build-Depends: debhelper (>= 4.0.0), autotools-dev +Standards-Version: 3.6.0 + +Package: libsilc-dev +Section: libdevel +Architecture: any +Depends: libsilc (= ${Source-Version}) +Description: developer files for SILC library (silc-toolkit) + silc-toolkit developer files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + +Package: libsilc +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: SILC library (silc-toolkit) + silc-toolkit library files + . + SILC Project develops the Secure Internet Live Conferencing protocol (SILC), + which is designed to provide most rich featured conferencing services and + high security. + diff -ruN silc-toolkit-1.0.2.orig/debian/docs silc-toolkit-1.0.2/debian/docs --- silc-toolkit-1.0.2.orig/debian/docs 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/docs 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,4 @@ +README +README.CVS +TODO +CREDITS diff -ruN silc-toolkit-1.0.2.orig/debian/libpackagename silc-toolkit-1.0.2/debian/libpackagename --- silc-toolkit-1.0.2.orig/debian/libpackagename 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/libpackagename 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,27 @@ +#!/bin/sh +libdir=$1/usr/lib + +usage() { + >&2 cat <___ +Usage: $0 pkgdir + +pkgdir is a directory holding the contents of what will +become a debian package. This package directory should +repersent a single shared library -- when this is the +case, $0 will emit a single package name. +___ + exit 1 +} + +if ! [ -d $libdir ]; then + >&2 "Can't find package image directory $1" + usage +fi + +for f in $libdir/*[0-9]; do + objdump -p $f +done | + awk '/SONAME/{print $2}' | + sed -e 's/\([0-9]\)\.so\./\1-/; s/\.so\.//' | + sort -u + diff -ruN silc-toolkit-1.0.2.orig/debian/libsilc-1.0-2-dev.install silc-toolkit-1.0.2/debian/libsilc-1.0-2-dev.install --- silc-toolkit-1.0.2.orig/debian/libsilc-1.0-2-dev.install 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/libsilc-1.0-2-dev.install 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,6 @@ +usr/include/silc/*.h +usr/lib/lib*.so +usr/lib/*.a +usr/lib/*.la +usr/lib/pkgconfig/*.pc +usr/share/doc/libsilc-dev/toolkit diff -ruN silc-toolkit-1.0.2.orig/debian/libsilc-1.0-2.install silc-toolkit-1.0.2/debian/libsilc-1.0-2.install --- silc-toolkit-1.0.2.orig/debian/libsilc-1.0-2.install 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/libsilc-1.0-2.install 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,2 @@ +usr/lib/*.so.* +usr/lib/silc/*.so* diff -ruN silc-toolkit-1.0.2.orig/debian/README.Debian silc-toolkit-1.0.2/debian/README.Debian --- silc-toolkit-1.0.2.orig/debian/README.Debian 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/README.Debian 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,6 @@ +libsilc for Debian +------------------ + +Please check for more at http://silcnet.org/ + + -- Tamas SZERB , Wed, 7 Jan 2004 15:56:35 +0100 diff -ruN silc-toolkit-1.0.2.orig/debian/rules silc-toolkit-1.0.2/debian/rules --- silc-toolkit-1.0.2.orig/debian/rules 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/rules 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,162 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +#name ?= $(shell cat debian/NAME) +#lib_package=libsilc-${name} +#dev_package=libsilc-${name}-dev +#doc_package=libsilc-${name}-dev #FIXME, just testing purpose + +lib_package=libsilc +dev_package=libsilc-dev +doc_package=libsilc-dev #FIXME, just testing purpose + +perl_lib=/usr/lib/perl5 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS =-Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +config.status: configure + #sh debian/substitute.sh + + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure \ + --without-irssi --without-silcd \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + \ + --disable-threads \ + --enable-debug \ + --enable-shared \ + --enable-static \ + --enable-ipv6 \ + --with-perl-lib=${perl_lib} \ + --libdir=\$${prefix}/lib \ + --with-simdir=\$${libdir}/silc/${name} \ + --includedir=\$${prefix}/include/silc/${name} \ + --with-docdir=\$${prefix}/share/doc/${doc_package} \ + --without-libtoolfix + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + # get proper name for shlib package + sh $(CURDIR)/debian/control.sh $(CURDIR)/debian/control $(CURDIR)/lib/.libs + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + dh_clean + + #sh debian/unsubstitute.sh + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # some cleanup, which are not necessary: + rm -Rf $(CURDIR)/debian/tmp/usr/etc \ + $(CURDIR)/debian/tmp/usr/help \ + $(CURDIR)/debian/tmp/usr/logs \ + $(CURDIR)/debian/tmp/usr/share/man \ + $(CURDIR)/debian/tmp/usr/share/doc/${doc_package}/examples \ + $(CURDIR)/debian/tmp/usr/share/doc/${doc_package}/*.conf + + #pkg-config .pc install: + install -d $(CURDIR)/debian/tmp/usr/lib/pkgconfig + install -m 644 debian/*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig + #rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/SUBSTITUTE.* + + #toolkit documentation install: + install -d $(CURDIR)/debian/tmp/usr/share/doc/libsilc-dev/toolkit + install -m 644 doc/toolkit/* $(CURDIR)/debian/tmp/usr/share/doc/libsilc-dev/toolkit + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES + dh_installdocs + dh_installexamples + dh_install --autodest --sourcedir=debian/tmp +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_perl +# dh_python + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff -ruN silc-toolkit-1.0.2.orig/debian/silc.pc silc-toolkit-1.0.2/debian/silc.pc --- silc-toolkit-1.0.2.orig/debian/silc.pc 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/silc.pc 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,14 @@ +#name=NAME + +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib +#includedir=/usr/include/silc/${name} +includedir=/usr/include/silc + +Name: silc +#LIB_BASE_VERSION: +Version: 1.0 +Description: SILC library. +Libs: -L${libdir} -lsilcclient -lsilc +Cflags: -I${includedir} diff -ruN silc-toolkit-1.0.2.orig/debian/unused/control silc-toolkit-1.0.2/debian/unused/control --- silc-toolkit-1.0.2.orig/debian/unused/control 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/unused/control 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,3 @@ +for versioned pkg needs: maybe in the future +Provides: libsilc-dev +Conflicts: libsilc-dev diff -ruN silc-toolkit-1.0.2.orig/debian/unused/NAME silc-toolkit-1.0.2/debian/unused/NAME --- silc-toolkit-1.0.2.orig/debian/unused/NAME 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/unused/NAME 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1 @@ +1.0-2 diff -ruN silc-toolkit-1.0.2.orig/debian/unused/substitute.sh silc-toolkit-1.0.2/debian/unused/substitute.sh --- silc-toolkit-1.0.2.orig/debian/unused/substitute.sh 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/unused/substitute.sh 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1,33 @@ +#!/bin/sh + +EXCLUDE="$0" #itself +SUBSTITUTE="SUBSTITUTE." + +#the real scripts begins here: + +#substitute.sh [dir] +#if dir omitted, then the current one will be used +if [ -z "$1" ]; then + DIR="debian" +else + DIR="$1" +fi + +NAME=`cat $DIR/NAME` +echo "substituting from NAME to $NAME .." +UNSUBSTITUTE="$DIR/unsubstitute.sh" + +echo -n > "$UNSUBSTITUTE" +for i in $(find "$DIR" -name "$SUBSTITUTE*" -type f); do + if ! echo "$i"|grep "$EXCLUDE" >/dev/null; then + j=$(echo "$i" | \ + sed s/NAME/$NAME/g | \ + sed s/$SUBSTITUTE//g ) + echo "$i" - "$j" + cat "$i" | \ + sed s/NAME/$NAME/g \ + > "$j" + echo "rm -f $j" >> "$UNSUBSTITUTE" + fi +done +echo "rm -f $DIR/unsubstitute.sh" >> "$UNSUBSTITUTE" diff -ruN silc-toolkit-1.0.2.orig/debian/unused/unsubstitute.sh silc-toolkit-1.0.2/debian/unused/unsubstitute.sh --- silc-toolkit-1.0.2.orig/debian/unused/unsubstitute.sh 1969-12-31 19:00:00.000000000 -0500 +++ silc-toolkit-1.0.2/debian/unused/unsubstitute.sh 2007-04-08 12:54:57.000000000 -0400 @@ -0,0 +1 @@ +rm -f debian/unsubstitute.sh diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/ciphers.h silc-toolkit-1.0.2/lib/silccrypt/ciphers.h --- silc-toolkit-1.0.2.orig/lib/silccrypt/ciphers.h 2005-12-19 07:05:03.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/ciphers.h 2007-04-08 12:54:57.000000000 -0400 @@ -21,7 +21,6 @@ #define CIPHERS_H #include "none.h" -#include "rc5.h" #include "twofish.h" #include "aes.h" #include "blowfish.h" diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/Makefile.am silc-toolkit-1.0.2/lib/silccrypt/Makefile.am --- silc-toolkit-1.0.2.orig/lib/silccrypt/Makefile.am 2005-12-19 07:05:11.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/Makefile.am 2007-04-08 12:54:57.000000000 -0400 @@ -27,7 +27,7 @@ noinst_LTLIBRARIES = libsilccrypt.la -libsilccrypt_la_SOURCES = none.c rc5.c md5.c aes.c rsa.c sha1.c sha256.c twofish.c blowfish.c cast.c silccipher.c silchash.c silchmac.c silcrng.c silcpkcs.c silcpkcs1.c +libsilccrypt_la_SOURCES = none.c md5.c aes.c rsa.c sha1.c sha256.c twofish.c blowfish.c cast.c silccipher.c silchash.c silchmac.c silcrng.c silcpkcs.c silcpkcs1.c if SILC_LIBTOOLFIX # Tell libtool to compile silccrypt as shared since silcsim will need it. @@ -38,7 +38,7 @@ CFLAGS = $(LTFLAGS) -include_HEADERS = aes.h blowfish.h cast.h ciphers_def.h ciphers.h md5.h none.h rc5.h rsa.h sha1.h sha256.h silccipher.h silcdh.h silchash.h silchmac.h silcpkcs.h silcrng.h silcpkcs1.h twofish.h +include_HEADERS = aes.h blowfish.h cast.h ciphers_def.h ciphers.h md5.h none.h rsa.h sha1.h sha256.h silccipher.h silcdh.h silchash.h silchmac.h silcpkcs.h silcrng.h silcpkcs1.h twofish.h SILC_EXTRA_DIST = tests diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/Makefile.in silc-toolkit-1.0.2/lib/silccrypt/Makefile.in --- silc-toolkit-1.0.2.orig/lib/silccrypt/Makefile.in 2005-12-19 07:05:19.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/Makefile.in 2007-04-08 12:54:57.000000000 -0400 @@ -114,7 +114,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libsilccrypt_la_LIBADD = -am_libsilccrypt_la_OBJECTS = none.lo rc5.lo md5.lo aes.lo rsa.lo \ +am_libsilccrypt_la_OBJECTS = none.lo md5.lo aes.lo rsa.lo \ sha1.lo sha256.lo twofish.lo blowfish.lo cast.lo silccipher.lo \ silchash.lo silchmac.lo silcrng.lo silcpkcs.lo silcpkcs1.lo libsilccrypt_la_OBJECTS = $(am_libsilccrypt_la_OBJECTS) @@ -301,12 +301,12 @@ with_irssi_TRUE = @with_irssi_TRUE@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign noinst_LTLIBRARIES = libsilccrypt.la -libsilccrypt_la_SOURCES = none.c rc5.c md5.c aes.c rsa.c sha1.c sha256.c twofish.c blowfish.c cast.c silccipher.c silchash.c silchmac.c silcrng.c silcpkcs.c silcpkcs1.c +libsilccrypt_la_SOURCES = none.c md5.c aes.c rsa.c sha1.c sha256.c twofish.c blowfish.c cast.c silccipher.c silchash.c silchmac.c silcrng.c silcpkcs.c silcpkcs1.c @SILC_LIBTOOLFIX_FALSE@LTFLAGS = # Tell libtool to compile silccrypt as shared since silcsim will need it. @SILC_LIBTOOLFIX_TRUE@LTFLAGS = --libtool-enable-shared -include_HEADERS = aes.h blowfish.h cast.h ciphers_def.h ciphers.h md5.h none.h rc5.h rsa.h sha1.h sha256.h silccipher.h silcdh.h silchash.h silchmac.h silcpkcs.h silcrng.h silcpkcs1.h twofish.h +include_HEADERS = aes.h blowfish.h cast.h ciphers_def.h ciphers.h md5.h none.h rsa.h sha1.h sha256.h silccipher.h silcdh.h silchash.h silchmac.h silcpkcs.h silcrng.h silcpkcs1.h twofish.h SILC_EXTRA_DIST = tests EXTRA_DIST = *.h $(SILC_EXTRA_DIST) diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/rc5.c silc-toolkit-1.0.2/lib/silccrypt/rc5.c --- silc-toolkit-1.0.2.orig/lib/silccrypt/rc5.c 2005-12-19 07:05:02.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/rc5.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,222 +0,0 @@ -/* - * rc5.c RC5-32/16/b - * - * Copyright (c) 1999 Pekka Riikonen - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, dis- - * tribute, sublicense, and/or sell copies of the Software, and to permit - * persons to whom the Software is furnished to do so, subject to the fol- - * lowing conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- - * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT - * SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- - * ITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the authors shall - * not be used in advertising or otherwise to promote the sale, use or - * other dealings in this Software without prior written authorization from - * the authors. - * - */ - -/* - * Based on RC5 reference code and on description of Bruce Schneier's - * Applied Cryptography. - * - * This implementation has a word size of 32 bits, a rounds of 16 and - * variable key length from 128 and 192 up to 256 bits. - * - */ - -#include "silcincludes.h" -#include "rc5_internal.h" -#include "rc5.h" - -/* - * SILC Crypto API for RC5 - */ - -/* Sets the key for the cipher. */ - -SILC_CIPHER_API_SET_KEY(rc5) -{ - SilcUInt32 k[8]; - - SILC_GET_WORD_KEY(key, k, keylen); - rc5_set_key((RC5Context *)context, k, keylen); - - return TRUE; -} - -/* Sets the string as a new key for the cipher. The string is first - hashed and then used as a new key. */ - -SILC_CIPHER_API_SET_KEY_WITH_STRING(rc5) -{ - return 1; -} - -/* Returns the size of the cipher context. */ - -SILC_CIPHER_API_CONTEXT_LEN(rc5) -{ - return sizeof(RC5Context); -} - -/* Encrypts with the cipher in CBC mode. Source and destination buffers - maybe one and same. */ - -SILC_CIPHER_API_ENCRYPT_CBC(rc5) -{ - SilcUInt32 tiv[4]; - int i; - - SILC_CBC_GET_IV(tiv, iv); - - SILC_CBC_ENC_PRE(tiv, src); - rc5_encrypt((RC5Context *)context, tiv, tiv); - SILC_CBC_ENC_POST(tiv, dst, src); - - for (i = 16; i < len; i += 16) { - SILC_CBC_ENC_PRE(tiv, src); - rc5_encrypt((RC5Context *)context, tiv, tiv); - SILC_CBC_ENC_POST(tiv, dst, src); - } - - SILC_CBC_PUT_IV(tiv, iv); - - return TRUE; -} - -/* Decrypts with the cipher in CBC mode. Source and destination buffers - maybe one and same. */ - -SILC_CIPHER_API_DECRYPT_CBC(rc5) -{ - SilcUInt32 tmp[4], tmp2[4], tiv[4]; - int i; - - SILC_CBC_GET_IV(tiv, iv); - - SILC_CBC_DEC_PRE(tmp, src); - rc5_decrypt((RC5Context *)context, tmp, tmp2); - SILC_CBC_DEC_POST(tmp2, dst, src, tmp, tiv); - - for (i = 16; i < len; i += 16) { - SILC_CBC_DEC_PRE(tmp, src); - rc5_decrypt((RC5Context *)context, tmp, tmp2); - SILC_CBC_DEC_POST(tmp2, dst, src, tmp, tiv); - } - - SILC_CBC_PUT_IV(tiv, iv); - - return TRUE; -} - -/* RC5 encryption */ -#define RC5E(i, A, B) \ - A = A ^ B; \ - A = rotl(A, B) + S[i]; \ - B = B ^ A; \ - B = rotl(B, A) + S[i + 1]; - -/* RC5 decryption */ -#define RC5D(i, A, B) \ - B = B - S[i + 1]; \ - B = rotr(B, A) ^ A; \ - A = A - S[i]; \ - A = rotr(A, B) ^ B; - -/* Sets RC5 key */ - -int rc5_set_key(RC5Context *ctx, const SilcUInt32 in_key[], int key_len) -{ - u32 i, j, k, A, B, L[c]; - u32 *out_key = ctx->out_key; - - if (key_len < b || key_len > (2 * b)) - return -1; - - /* init L */ - for (i = 0; i < key_len / w; i++) - L[i] = in_key[i]; - - /* init key array (S) */ - out_key[0] = 0xb7e15163; - for (i = 1; i < t; i++) - out_key[i] = out_key[i - 1] + 0x9e3779b9; - - /* mix L and key array (S) */ - A = B = 0; - for (k = i = j = 0; k < (3 * t); k++) { - A = rotl(out_key[i] + (A + B), 3); - B += A; - B = rotl(L[j] + B, B); - out_key[i] = A; - L[j] = B; - i = (i + 1) % t; - j = (j + 1) % c; - } - - return 0; -} - -/* Encrypts *one* block at a time. */ - -int rc5_encrypt(RC5Context *ctx, u32 *in, u32 *out) -{ - u32 A, B; - u32 *S = ctx->out_key; - - A = in[0] + S[0]; - B = in[1] + S[1]; - - RC5E(2, A, B); RC5E(4, A, B); - RC5E(6, A, B); RC5E(8, A, B); - RC5E(10, A, B); RC5E(12, A, B); - RC5E(14, A, B); RC5E(16, A, B); - RC5E(18, A, B); RC5E(20, A, B); - RC5E(22, A, B); RC5E(24, A, B); - RC5E(26, A, B); RC5E(28, A, B); - RC5E(30, A, B); RC5E(32, A, B); - - out[0] = A; - out[1] = B; - - return 0; -} - -/* Decrypts *one* block at a time. */ - -int rc5_decrypt(RC5Context *ctx, u32 *in, u32 *out) -{ - u32 A, B; - u32 *S = ctx->out_key; - - A = in[0]; - B = in[1]; - - RC5D(32, A, B); RC5D(30, A, B); - RC5D(28, A, B); RC5D(26, A, B); - RC5D(24, A, B); RC5D(22, A, B); - RC5D(20, A, B); RC5D(18, A, B); - RC5D(16, A, B); RC5D(14, A, B); - RC5D(12, A, B); RC5D(10, A, B); - RC5D(8, A, B); RC5D(6, A, B); - RC5D(4, A, B); RC5D(2, A, B); - - out[0] = A - S[0]; - out[1] = B - S[1]; - - return 0; -} diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/rc5.h silc-toolkit-1.0.2/lib/silccrypt/rc5.h --- silc-toolkit-1.0.2.orig/lib/silccrypt/rc5.h 2005-12-19 07:05:03.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/rc5.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,33 +0,0 @@ -/* - - rc5.h - - Author: Pekka Riikonen - - Copyright (C) 1997 - 2000 Pekka Riikonen - - The contents of this file are subject to one of the Licenses specified - in the COPYING file; You may not use this file except in compliance - with the License. - - The software distributed under the License is distributed on an "AS IS" - basis, in the hope that it will be useful, but WITHOUT WARRANTY OF ANY - KIND, either expressed or implied. See the COPYING file for more - information. - -*/ - -#ifndef RC5_H -#define RC5_H - -/* - * SILC Crypto API for RC5 - */ - -SILC_CIPHER_API_SET_KEY(rc5); -SILC_CIPHER_API_SET_KEY_WITH_STRING(rc5); -SILC_CIPHER_API_CONTEXT_LEN(rc5); -SILC_CIPHER_API_ENCRYPT_CBC(rc5); -SILC_CIPHER_API_DECRYPT_CBC(rc5); - -#endif diff -ruN silc-toolkit-1.0.2.orig/lib/silccrypt/rc5_internal.h silc-toolkit-1.0.2/lib/silccrypt/rc5_internal.h --- silc-toolkit-1.0.2.orig/lib/silccrypt/rc5_internal.h 2005-12-19 07:05:03.000000000 -0500 +++ silc-toolkit-1.0.2/lib/silccrypt/rc5_internal.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,42 +0,0 @@ -/* - - rc5_internal.h - - Author: Pekka Riikonen - - Copyright (C) 1997 - 2000 Pekka Riikonen - - The contents of this file are subject to one of the Licenses specified - in the COPYING file; You may not use this file except in compliance - with the License. - - The software distributed under the License is distributed on an "AS IS" - basis, in the hope that it will be useful, but WITHOUT WARRANTY OF ANY - KIND, either expressed or implied. See the COPYING file for more - information. - -*/ - -#ifndef RC5_INTERNAL_H -#define RC5_INTERNAL_H - -#include "ciphers_def.h" - -/* RC5 definitions */ -#define w 32 /* word size, in bits */ -#define r 16 /* rounds */ -#define b 16 /* minimum key size in bytes */ -#define c 8 /* same for 128, 192 and 256 bits key */ -#define t 34 /* size of table S, t = 2 * (r + 1) */ - -/* Cipher's context */ -typedef struct { - u32 out_key[t]; -} RC5Context; - -/* Prototypes */ -int rc5_set_key(RC5Context *ctx, const SilcUInt32 in_key[], int key_len); -int rc5_encrypt(RC5Context *ctx, u32 *in, u32 *out); -int rc5_decrypt(RC5Context *ctx, u32 *in, u32 *out); - -#endif