NEWS for the 2.7 release

        This release includes an implementation of elliptic curve
        cryptography (ECC) and optimizations for the ARM architecture.
        This work was done at the offices of South Pole AB, and
        generously funded by the .SE Internet Fund.

        Bug fixes:

        * Fixed a bug in the buffer handling for incremental SHA3
          hashing, with a possible buffer overflow. Patch by Edgar
          E. Iglesias.

        New features:

        * Support for ECDSA signatures. Elliptic curve operations over
          the following curves: secp192r1, secp224r1, secp256r1,
          secp384r1 and secp521r1, including x86_64 and ARM assembly
          for the most important primitives.

        * Support for UMAC, including x86_64 and ARM assembly.

        * Support for 12-round salsa20, "salsa20r12", as specified by
          eSTREAM. Contributed by Nikos Mavrogiannopoulos.

        Optimizations:

        * ARM assembly code for several additional algorithms,
          including AES, Salsa20, and the SHA family of hash
          functions.

        * x86_64 assembly for SHA256, SHA512, and SHA3. (SHA3 assembly
          was included in the 2.6 release, but disabled due to poor
          performance on some AMD processors. Hopefully, that
          performance problem is fixed now).

        The ARM code was tested and benchmarked on Cortex-A9. Some of
        the functions use "neon" instructions. The configure script
        decides if neon instructions can be used, and the command line
        options --enable-arm-neon and --disable-arm-neon can be used
        to override its choice. Feedback appreciated.

        The libraries are intended to be binary compatible with
        nettle-2.2 and later. The shared library names are
        libnettle.so.4.6 and libhogweed.so.2.4, with sonames still
        libnettle.so.4 and libhogweed.so.2.

7 files changed, 39 insertions, 35 deletions

diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index ed12ffd5224..59854258f50 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/03/15 18:22:03 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2013/04/29 16:42:24 adam Exp $
 
-DISTNAME=	nettle-2.6
+DISTNAME=	nettle-2.7
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.lysator.liu.se/~nisse/archive/ \
 		ftp://ftp.lysator.liu.se/pub/security/lsh/
diff --git a/security/nettle/PLIST b/security/nettle/PLIST
index cbf3e7f0b09..18d6c84e5c8 100644
--- a/security/nettle/PLIST
+++ b/security/nettle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/03/15 18:22:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/04/29 16:42:24 adam Exp $
 bin/nettle-hash
 bin/nettle-lfib-stream
 bin/pkcs1-conv
@@ -19,6 +19,9 @@ include/nettle/ctr.h
 include/nettle/des-compat.h
 include/nettle/des.h
 include/nettle/dsa.h
+include/nettle/ecc-curve.h
+include/nettle/ecc.h
+include/nettle/ecdsa.h
 include/nettle/gcm.h
 include/nettle/gosthash94.h
 include/nettle/hmac.h
@@ -47,6 +50,7 @@ include/nettle/sha1.h
 include/nettle/sha2.h
 include/nettle/sha3.h
 include/nettle/twofish.h
+include/nettle/umac.h
 include/nettle/yarrow.h
 info/nettle.info
 lib/libhogweed.la
diff --git a/security/nettle/distinfo b/security/nettle/distinfo
index 1dbba7ea8e9..88f6d569616 100644
--- a/security/nettle/distinfo
+++ b/security/nettle/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: distinfo,v 1.8 2013/04/29 16:42:24 adam Exp $
 
-SHA1 (nettle-2.6.tar.gz) = 401f982a0b365e04c8c38c4da42afdd7d2d51d80
-RMD160 (nettle-2.6.tar.gz) = 898483350285468fe66b3fad4e7891583b08e15e
-Size (nettle-2.6.tar.gz) = 1385695 bytes
-SHA1 (patch-Makefile.in) = 39e4eba0a984cd2cd3037b1c46b65785deb3feb6
-SHA1 (patch-aa) = 509b333e80d88c9fab75c0bc3e4edde862595d0d
-SHA1 (patch-config.make.in) = 0bf3d2729b97883b41374a1ea3d5286fd2554e98
-SHA1 (patch-testsuite_Makefile.in) = a1363d21af5371d36629797a413129850af9ee87
+SHA1 (nettle-2.7.tar.gz) = e17de3678b987841e88a724b7d2f6856d97ab139
+RMD160 (nettle-2.7.tar.gz) = 5ac49e0eb171b67bc461f9226f59c28221aa3491
+Size (nettle-2.7.tar.gz) = 1557615 bytes
+SHA1 (patch-Makefile.in) = af3ca13235c4b11ca3238b19802332d33c5c54e0
+SHA1 (patch-aa) = 9990adb5651103d5128abc48f6b053f2bf83b076
+SHA1 (patch-config.make.in) = 27baf63fb161be3224f448c52200cef057bf64ed
+SHA1 (patch-testsuite_Makefile.in) = ade95c10fcad37c461c06e0731550d65d4b20509
 SHA1 (patch-tools_Makefile.in) = f074fc1bf0e2b7ded88fd65ec303e2be407f0217
diff --git a/security/nettle/patches/patch-Makefile.in b/security/nettle/patches/patch-Makefile.in
index 050e3824cce..781a7eb4aaf 100644
--- a/security/nettle/patches/patch-Makefile.in
+++ b/security/nettle/patches/patch-Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-Makefile.in,v 1.4 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-Makefile.in,v 1.5 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
---- Makefile.in.orig	2013-01-14 21:44:12.000000000 +0000
+--- Makefile.in.orig	2013-04-24 13:26:53.000000000 +0000
 +++ Makefile.in
-@@ -14,13 +14,13 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = $(INSTALL_PROGRAM) -s
- MKDIR_P = @MKDIR_P@
+@@ -16,13 +16,13 @@ MKDIR_P = @MKDIR_P@
+ 
+ OPT_ASM_SOURCES = @OPT_ASM_SOURCES@
  
 -SUBDIRS = tools testsuite examples
 +SUBDIRS = tools testsuite
@@ -20,8 +20,8 @@ Use LIBTOOL.
  SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
  
  getopt_SOURCES = getopt.c getopt1.c
-@@ -169,18 +169,18 @@ nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJE
- hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT))
+@@ -186,18 +186,18 @@ nettle_PURE_OBJS = $(nettle_OBJS:.$(OBJE
+ hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) $(OPT_ASM_SOURCES:.asm=.$(OBJEXT))
  hogweed_PURE_OBJS = $(hogweed_OBJS:.$(OBJEXT)=.p$(OBJEXT))
  
 -libnettle.a: $(nettle_OBJS)
@@ -49,16 +49,16 @@ Use LIBTOOL.
  	&& $(DEP_PROCESS)
  
  # Rules building shared libraries.
-@@ -244,7 +244,7 @@ des.$(OBJEXT): des.c des.h $(des_headers
- .asm.$(OBJEXT):
- 	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
- 		$< >$*.s
--	$(COMPILE) $(CCPIC_MAYBE) -c $*.s
-+	${LIBTOOL} --mode=compile --tag=CC $(COMPILE) $(CCPIC_MAYBE) -c $*.s
- 	echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
+@@ -329,7 +329,7 @@ ecc-521.p$(OBJEXT): ecc-521.h
+ 	&& test -s $@T && mv -f $@T $@
+ 
+ .s.$(OBJEXT):
+-	$(COMPILE) $(CCPIC_MAYBE) -c $<
++	${LIBTOOL} --mode=compile $(COMPILE) $(CCPIC_MAYBE) -c $<
  
- .asm.p$(OBJEXT):
-@@ -317,7 +317,7 @@ install-here: install-doc install-header
+ .s.p$(OBJEXT):
+ 	$(COMPILE) $(SHLIBCFLAGS) -c $< -o $@
+@@ -398,7 +398,7 @@ install-here: install-doc install-header
  install-static: $(LIBTARGETS)
  	$(MKDIR_P) $(DESTDIR)$(libdir)
  	for f in $(LIBTARGETS); do \
diff --git a/security/nettle/patches/patch-aa b/security/nettle/patches/patch-aa
index 405ff05585b..17f18a8d97d 100644
--- a/security/nettle/patches/patch-aa
+++ b/security/nettle/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2013/04/29 16:42:25 adam Exp $
 
---- configure.orig	2013-01-14 21:44:12.000000000 +0000
+--- configure.orig	2013-04-24 13:26:53.000000000 +0000
 +++ configure
-@@ -6886,7 +6886,7 @@ fi
+@@ -7183,7 +7183,7 @@ fi
      enable_documentation=yes
  
    else
diff --git a/security/nettle/patches/patch-config.make.in b/security/nettle/patches/patch-config.make.in
index 725e5ccbb6c..25b72c2a5e4 100644
--- a/security/nettle/patches/patch-config.make.in
+++ b/security/nettle/patches/patch-config.make.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-config.make.in,v 1.1.1.1 2011/04/26 08:59:33 adam Exp $
+$NetBSD: patch-config.make.in,v 1.2 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
 --- config.make.in.orig	2011-04-26 08:41:17.000000000 +0000
 +++ config.make.in
-@@ -63,8 +63,8 @@ infodir =	@infodir@
+@@ -73,8 +73,8 @@ infodir =	@infodir@
  
  COMPILE = $(CC) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(CCPIC) $(DEP_FLAGS)
  COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(CCPIC) $(DEP_FLAGS)
diff --git a/security/nettle/patches/patch-testsuite_Makefile.in b/security/nettle/patches/patch-testsuite_Makefile.in
index 7e63ebb7784..e5ec9d99533 100644
--- a/security/nettle/patches/patch-testsuite_Makefile.in
+++ b/security/nettle/patches/patch-testsuite_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-testsuite_Makefile.in,v 1.3 2013/03/15 18:22:03 drochner Exp $
+$NetBSD: patch-testsuite_Makefile.in,v 1.4 2013/04/29 16:42:25 adam Exp $
 
 Use LIBTOOL.
 
 --- testsuite/Makefile.in.orig	2013-01-14 21:44:13.000000000 +0000
 +++ testsuite/Makefile.in
-@@ -70,9 +70,9 @@ all: $(TARGETS) $(EXTRA_TARGETS)
+@@ -73,9 +73,9 @@ all: $(TARGETS) $(EXTRA_TARGETS)
  # to use suffix rules to build the test executables. So we use an
  # explicit rule for each and every executable.
  
@@ -16,7 +16,7 @@ Use LIBTOOL.
  
  ../nettle-internal.$(OBJEXT):
  	( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
-@@ -93,7 +93,7 @@ test-rules:
+@@ -96,7 +96,7 @@ test-rules:
  include $(srcdir)/.test-rules.make
  
  $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \