Commit ee6f02ce authored by Niels Möller's avatar Niels Möller

Deleted src/nettle subdirectory.

parent 0801f4b1
2013-03-30 Niels Mller <nisse@lysator.liu.se>
* src/nettle: Deleted subdirectory.
From Magnus Holmgren's debian patches.
* configure.ac, */Makefile.am: Don't use the bundled nettle
library. Also updated test cases using the sexp-conv program.
......
#! /bin/sh
autoconf && autoheader
*.d
*.po
*.s
*.tar.gz
*.tar.gz.asc
.lib
Makefile
aesdata
autom4te.cache
config.cache
config.h
config.h.in
config.log
config.m4
config.make
config.status
configure
desdata
keymap.h
nettle-stdint.h
nettle.aux
nettle.cp
nettle.cps
nettle.dvi
nettle.fn
nettle.html
nettle.info*
nettle.ky
nettle.log
nettle.pdf
nettle.pg
nettle.ps
nettle.toc
nettle.tp
nettle.tps
nettle.vr
nettle.vrs
parity.h
rotors.h
shadata
stamp-h
stamp-h.in
/*.d
/*.po
/*.s
/*.tar.gz
/*.tar.gz.asc
/.lib
/Makefile
/aesdata
/autom4te.cache
/config.cache
/config.h
/config.h.in
/config.log
/config.m4
/config.make
/config.status
/configure
/desdata
/keymap.h
/nettle-stdint.h
/nettle.aux
/nettle.cp
/nettle.cps
/nettle.dvi
/nettle.fn
/nettle.html
/nettle.info*
/nettle.ky
/nettle.log
/nettle.pdf
/nettle.pg
/nettle.ps
/nettle.toc
/nettle.tp
/nettle.tps
/nettle.vr
/nettle.vrs
/parity.h
/rotors.h
/shadata
/stamp-h
/stamp-h.in
Please see the Nettle manual.
This diff is collapsed.
# Nettle Makefile
@SET_MAKE@
srcdir = @srcdir@
VPATH = @srcdir@
LIBOBJS = @LIBOBJS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
SUBDIRS = tools testsuite examples
include config.make
PRE_CPPFLAGS = -I.
TARGETS = aesdata$(EXEEXT) desdata$(EXEEXT) shadata$(EXEEXT) \
libnettle.a $(SHLIBTARGET)
DOCTARGETS = nettle.info nettle.html nettle.pdf
all check install uninstall:
$(MAKE) $@-here
set -e; for d in $(SUBDIRS); do \
echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
clean distclean mostlyclean maintainer-clean:
set -e; for d in $(SUBDIRS); do \
echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
$(MAKE) $@-here
check-here:
true
# These targets aren't supported, but they are expected by the
# automake generated Makefiles in the lsh build.
dvi installcheck uninstallcheck:
true
all-here: $(TARGETS) $(DOCTARGETS)
nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
aes-encrypt-internal.c aes-encrypt.c aes-encrypt-table.c \
aes-set-encrypt-key.c aes-set-decrypt-key.c aes-meta.c \
arcfour.c arcfour-crypt.c arcfour-meta.c \
arctwo.c arctwo-meta.c \
base16-encode.c base16-decode.c base16-meta.c \
base64-encode.c base64-decode.c base64-meta.c \
cast128.c cast128-meta.c \
blowfish.c \
cbc.c ctr.c \
des.c \
des3.c des-compat.c \
hmac.c hmac-md5.c hmac-sha1.c hmac-sha256.c \
knuth-lfib.c \
md2.c md2-meta.c md4.c md4-meta.c \
md5.c md5-compress.c md5-compat.c md5-meta.c \
sha1.c sha1-compress.c sha1-meta.c sha256.c sha256-meta.c \
serpent.c serpent-meta.c \
twofish.c twofish-meta.c \
yarrow256.c yarrow_key_event.c \
sexp.c sexp-format.c \
sexp-transport.c sexp-transport-format.c \
bignum.c bignum-random.c sexp2bignum.c \
pkcs1.c pkcs1-rsa-md5.c pkcs1-rsa-sha1.c \
rsa.c rsa-sign.c rsa-verify.c \
rsa-md5-sign.c rsa-md5-verify.c \
rsa-sha1-sign.c rsa-sha1-verify.c \
rsa-encrypt.c rsa-decrypt.c \
rsa-keygen.c rsa-compat.c \
rsa2sexp.c sexp2rsa.c \
dsa.c dsa-sign.c dsa-verify.c dsa-keygen.c \
sexp2dsa.c \
pgp-encode.c rsa2openpgp.c \
der-iterator.c der2rsa.c \
buffer.c buffer-init.c realloc.c \
nettle-internal.c
HEADERS = aes.h arcfour.h arctwo.h asn1.h bignum.h blowfish.h \
base16.h base64.h buffer.h cast128.h \
cbc.h ctr.h \
des.h des-compat.h dsa.h \
hmac.h \
knuth-lfib.h \
macros.h \
md2.h md4.h \
md5.h md5-compat.h \
memxor.h \
nettle-meta.h nettle-types.h \
pgp.h pkcs1.h realloc.h rsa.h rsa-compat.h \
sexp.h \
serpent.h sha.h twofish.h \
yarrow.h
INSTALL_HEADERS = $(HEADERS) nettle-stdint.h
SOURCES = $(nettle_SOURCES) aesdata.c desdata.c shadata.c
DISTFILES = $(SOURCES) $(HEADERS) .bootstrap aclocal.m4 configure.ac \
configure stamp-h.in \
config.guess config.sub install-sh texinfo.tex \
config.h.in config.m4.in config.make.in Makefile.in \
README AUTHORS COPYING INSTALL NEWS TODO ChangeLog \
memxor.c $(des_headers) descore.README \
aes-internal.h cast128_sboxes.h desinfo.h desCode.h \
serpent_sboxes.h nettle-internal.h \
asm.m4 \
nettle.texinfo nettle.info nettle.html nettle.pdf sha-example.c
# Rules building libnettle.a
# FIXME: Do we really need to delete the archive first?
nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJEXT)) $(LIBOBJS)
nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJEXT)=.p$(OBJEXT))
libnettle.a: $(nettle_OBJS)
-rm -f $@
$(AR) $(ARFLAGS) $@ $(nettle_OBJS)
$(RANLIB) $@
.c.$(OBJEXT):
$(COMPILE) $(CCPIC_MAYBE) -c $< \
&& $(DEP_PROCESS)
# Rules building libnettle.so
$(SHLIBFORLINK): $(nettle_PURE_OBJS)
$(SHLIBLINK) $(nettle_PURE_OBJS) -o $@ $(SHLIBLIBS)
-mkdir .lib 2>/dev/null
[ -z "$(SHLIBSONAME)" ] || (cd .lib \
&& ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME))
.c.p$(OBJEXT):
$(COMPILE) $(SHLIBCFLAGS) -c $< -o $@ \
&& $(DEP_PROCESS)
# For Solaris and BSD make, we have to use an explicit rule for each executable
aesdata$(EXEEXT): aesdata.$(OBJEXT)
$(LINK) aesdata.$(OBJEXT) $(LIBS) -o aesdata$(EXEEXT)
desdata$(EXEEXT): desdata.$(OBJEXT)
$(LINK) desdata.$(OBJEXT) $(LIBS) -o desdata$(EXEEXT)
shadata$(EXEEXT): shadata.$(OBJEXT)
$(LINK) shadata.$(OBJEXT) $(LIBS) -lm -o shadata$(EXEEXT)
# .$(OBJEXT)$(EXEEXT):
# $(LINK) $< $(LIBS) -o $@
# desCore rules
# It seems using $(srcdir)/ doesn't work with GNU make 3.79.1
# des_headers = $(srcdir)/parity.h $(srcdir)/rotors.h $(srcdir)/keymap.h
des_headers = parity.h rotors.h keymap.h
# Generate DES headers.
$(des_headers): desdata.c
$(MAKE) desdata$(EXEEXT)
./desdata$(EXEEXT) $(@F) > $@T
test -s $@T && mv -f $@T $@
des.$(OBJEXT): des.c des.h $(des_headers)
.asm.$(OBJEXT):
$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
$< >$*.s
$(COMPILE) $(CCPIC_MAYBE) -c $*.s
echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
.asm.p$(OBJEXT):
$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
$< >$*.s
$(COMPILE) $(SHLIBCFLAGS) -c $*.s -o $@
echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d
# Texinfo rules
.texinfo.info:
cd $(srcdir) && $(MAKEINFO) --output $@T `basename $<` \
&& test -s $@T && mv -f $@T $@
.texinfo.html:
cd $(srcdir) && $(MAKEINFO) --html --no-split \
--output $@T `basename "$<"` \
&& test -s $@T && mv -f $@T $@
.texinfo.dvi:
cd $(srcdir) && texi2dvi `basename "$<"`
.dvi.ps:
cd $(srcdir) && dvips -Ppdf -G0 -o `basename $< .dvi`.ps `basename $<`
# Avoid rebuilding .dvi and .ps files when the .texinfo source is unchanged.
PS2PDFFLAGS=-dCompatibilityLevel=1.3 -dMAxSubsetPct=100 -dSubsetFonts=true -dEmbedAllFonts=true
.texinfo.pdf:
$(MAKE) `basename "$<" .texinfo`.ps
cd $(srcdir) && ps2pdf $(PS2PDFFLAGS) `basename "$<" .texinfo`.ps
# Configure-related rules, mostly copied from the autoconf manual. No
# $(srcdir) prefixes on the targets, though.
configure: configure.ac aclocal.m4
cd $(srcdir) && $(AUTOCONF)
# autoheader might not change config.h.in, so touch a stamp file.
config.h.in: stamp-h.in
stamp-h.in: configure.ac aclocal.m4
cd $(srcdir) && autoheader
echo timestamp > $(srcdir)/stamp-h.in
config.status: configure
./config.status --recheck
config.h: stamp-h
stamp-h: config.h.in config.status
./config.status config.h
echo timestamp > stamp-h
Makefile: Makefile.in config.status
./config.status $@
config.make: config.make.in config.status
./config.status $@
config.m4: config.m4.in config.status
./config.status $@
# Installation
install-here: install-info install-headers libnettle.a $(SHLIBINSTALL)
[ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL_DATA) libnettle.a $(DESTDIR)$(libdir)
install-shared: $(SHLIBFORLINK)
[ -d $(DESTDIR)$(libdir) ] || $(INSTALL) -d $(DESTDIR)$(libdir)
$(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
[ -z "$(SHLIBSONAME)" ] \
|| (cd $(DESTDIR)$(libdir) \
&& ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
&& ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
# I'd like to use makes VPATH search to locate the files to be
# installed. But it seems most make programs don't set $<, $^, $? and
# friends for ordinary explicit rules.
install-info: nettle.info
[ -d $(DESTDIR)$(infodir) ] || $(INSTALL) -d $(DESTDIR)$(infodir)
f=nettle.info ; \
[ -f $$f ] || f="$(srcdir)/$$f" ; \
$(INSTALL_DATA) "$$f" $(DESTDIR)$(infodir) ; \
if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
install-info --info-dir="$(DESTDIR)$(infodir)" "$$f" ; \
else : ; fi
# NOTE: I'd like to use $^, but that's a GNU extension. $? should be
# more portable, and equivalent for phony targets.
install-headers: $(INSTALL_HEADERS)
[ -d $(DESTDIR)$(includedir) ] || $(INSTALL) -d $(DESTDIR)$(includedir)
[ -d $(DESTDIR)$(includedir)/nettle ] || $(INSTALL) -d $(DESTDIR)$(includedir)/nettle
for f in $(INSTALL_HEADERS) ; do \
if [ -f "$$f" ] ; then \
$(INSTALL_DATA) "$$f" $(DESTDIR)$(includedir)/nettle ; \
else \
$(INSTALL_DATA) "$(srcdir)/$$f" $(DESTDIR)$(includedir)/nettle ; \
fi ; done
# Uninstall
uninstall-here: uninstall-info uninstall-headers uninstall-shared
rm -f $(DESTDIR)$(libdir)/libnettle.a
uninstall-headers:
for f in $(INSTALL_HEADERS) ; do \
rm -f $(DESTDIR)$(includedir)/nettle/$$f ; \
done
uninstall-info:
if (install-info --version && \
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)"/nettle.info ; \
else : ; fi
-rm -f $(DESTDIR)$(infodir)/nettle.info
# FIXME: Leaves the links around
uninstall-shared:
test -z "$(SHLIBINSTALL)" || rm -f $(DESTDIR)$(libdir)/$(SHLIBFILE)
# Distribution
distdir = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
top_distdir = $(distdir)
# NOTE: Depending on the automake version in the parent dir,
# we must handle both absolute and relative $destdir.
distdir: $(DISTFILES)
rm -rf "$(distdir)"
mkdir "$(distdir)"
set -e; for f in $(DISTFILES) ; do \
if [ -f "$$f" ] ; then cp "$$f" "$(distdir)" ; \
else cp "$(srcdir)/$$f" "$(distdir)" ; \
fi ; \
done
set -e; for d in sparc x86 ; do \
mkdir "$(distdir)/$$d" ; \
cp $(srcdir)/$$d/*.asm $(srcdir)/$$d/*.m4 "$(distdir)/$$d" ; \
done
set -e; for d in $(SUBDIRS); do \
sd="$(distdir)/$$d" ; \
mkdir "$$sd" && $(MAKE) -C $$d distdir="`cd $$sd && pwd`" $@ ; \
done
dist: distdir
tar cf - $(distdir) | gzip -c >$(distdir).tar.gz
rm -rf $(distdir)
rm_distcheck = test ! -d distcheck-tmp \
|| { find distcheck-tmp -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr distcheck-tmp; };
distcheck: dist
$(rm_distcheck)
mkdir distcheck-tmp
gzip -d < $(distdir).tar.gz \
| { cd distcheck-tmp && tar xf - && chmod -R a-w $(distdir) ; }
mkdir distcheck-tmp/build
mkdir distcheck-tmp/install
cd distcheck-tmp/build && ../$(distdir)/configure --prefix="`cd ../install && pwd`"
cd distcheck-tmp/build && $(MAKE)
cd distcheck-tmp/build && $(MAKE) check
cd distcheck-tmp/build && $(MAKE) install
cd distcheck-tmp/build && $(MAKE) uninstall
cd distcheck-tmp && find install -type f -print > leftover-install-files
@test `cat distcheck-tmp/leftover-install-files | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
cat distcheck-tmp/leftover-install-files ; \
exit 1; }
chmod -R a-w distcheck-tmp/install
mkdir distcheck-tmp/destdir
destdir="`cd distcheck-tmp/destdir && pwd`" \
&& cd distcheck-tmp/build \
&& $(MAKE) install DESTDIR="$$destdir" \
&& $(MAKE) uninstall DESTDIR="$$destdir"
cd distcheck-tmp && find destdir -type f -print > leftover-destdir-files
@test `cat distcheck-tmp/leftover-destdir-files | wc -l` -le 1 \
|| { echo "ERROR: destdir files left after uninstall:" ; \
cat distcheck-tmp/leftover-destdir-files ; \
exit 1; }
cd distcheck-tmp/build && $(MAKE) dist
cd distcheck-tmp/build && rm *.gz
cd distcheck-tmp/build && $(MAKE) distclean
cd distcheck-tmp && find build -type f -print > leftover-build-files
@test `cat distcheck-tmp/leftover-build-files | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
cat distcheck-tmp/leftover-build-files ; \
exit 1; }
$(rm_distcheck)
clean-here:
-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s
distclean-here: clean-here
-rm -f config.h stamp-h config.log config.status \
config.make config.m4 Makefile nettle-stdint.h *.asm *.d
maintainer-clean-here:
-rm -f $(DOCTARGETS) *.dvi *.ps
DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d)
@DEP_INCLUDE@ $(DEP_FILES)
NEWS for the 1.14 release
Experimental support for reading keys in PKCS#1 ASN1/DER
format, and a new command line tool pkcs1-conv.
Improved MD5 performance on x86.
Fixed support for sparc64.
Reorganized AES code. Better performance for all three
implementations (C, x86 assembler, sparc assembler).
New sparc assembler for arcfour. Compared to the code
generated by gcc, the new code is about 25% faster on old
sparcs, and 6 times faster on ultrasparc.
Replaced the internal function nettle_mpz_from_octets with a
call to mpz_import, if available in the installed GMP library.
More Makefile fixes; it now seems to work to build with
the the make programs on Solaris and FreeBSD (although
--disable-dependency-tracking is required for the latter).
The library is intended to be binary compatible with earlier
versions. The library name is libnettle.so.2.5, soname is
still libnettle.so.2.
NEWS for the 1.13 release
Fixed problem with broken m4 on bsd, which resulted in
corrupted x86 assembler for sha1.
Nettle probably works on windows: I've been able to cross
compile it with ./configure --host=i586-mingw32msvc (without
public-key support), and the testsuite binaries seem to run
fine in Wine.
Implemented CTR mode.
Improved sha1 performance on x86.
Configure check to figure out if symbols in assembler files
need a leading underscore.
Improved benchmark program. Displays cycles per byte and block,
and compares with openssl (if openssl is installed).
Terminating newline in output from sexp-conv --hash.
The library is intended to be binary compatible with earlier
versions. The library name is libnettle.so.2.4. However, the
interface for the internal function _nettle_sha1_compress has
changed; any program that calls this function directly will
break.
NEWS for the 1.12 release
Fixed a bug in the configure script.
Updated the description of aes_set_encrypt_key and
aes_set_decrypt_key in the manual.
NEWS for the 1.11 release
Nettle no longer uses automake. Side effects:
* Dependency tracking is enabled only for gcc-3 (help with
supporting dependency tracking with other compilers is
appreciated).
* Makefile compatibility with make programs other than GNU
make is mostly unknown, please report any problems.
Support for arctwo.
Fixes to the libdes compatibility code. Declarations should
now match openssl/libdes better. des_cbc_cksum pads
input with NUL's, if it's not an integral number of blocks (in
general, such unreversible padding is a bad idea).
By default, also the static library is compiled as position
independent code. This is needed on some systems to make it
possible to link nettle into a dynamically loaded module. Use
the configure flag --disable-pic if this is not desired.