CVS commit: pkgsrc/security/nettle

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 22 08:01:51 UTC 2020

Modified Files:
        pkgsrc/security/nettle: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/security/nettle/patches: patch-Makefile.in
            patch-testsuite_Makefile.in

Log Message:
nettle: updated to 3.6

Nettle 3.6:

This release adds a couple of new features, most notable being
support for ED448 signatures.

It is not binary compatible with earlier releases. The shared
library names are libnettle.so.8.0 and libhogweed.so.6.0, with
sonames nibnettle.so.8 and libhogweed.so.6. The changed
sonames are mainly to avoid upgrade problems with recent
GnuTLS versions, that depend on Nettle internals outside of
the advertised ABI. But also because of the removal of
internal poly1305 functions which were undocumented but
declared in an installed header file, see Interface changes
below.

New features:

* Support for Curve448 and ED448 signatures. Contributed by
  Daiki Ueno.

* Support for SHAKE256 (SHA3 variant with arbitrary output
  size). Contributed by Daiki Ueno.

* Support for SIV-CMAC (Synthetic Initialization Vector) mode,
  contributed by Nikos Mavrogiannopoulos.

* Support for CMAC64, contributed by Dmitry Baryshkov.

* Support for the "CryptoPro" variant of the GOST hash
  function, as gosthash94cp. Contributed by Dmitry Baryshkov.

* Support for GOST DSA signatures, including GOST curves
  gc256b and gc512a. Contributed by Dmitry Baryshkov.

* Support for Intel CET in x86 and x86_64 assembly files, if
  enabled via CFLAGS (gcc --fcf-protection=full). Contributed
  by H.J. Lu and Simo Sorce.

* A few new functions to improve support for the Chacha
  variant with 96-bit nonce and 32-bit block counter (the
  existing functions use nonce and counter of 64-bit each),
  and functions to set the counter. Contributed by Daiki Ueno.

* New interface, struct nettle_mac, for MAC (message
  authentication code) algorithms. This abstraction is only
  for MACs that don't require a per-message nonce. For HMAC,
  the key size is fixed, and equal the digest size of the
  underlying hash function.

Bug fixes:

* Fix bug in cfb8_decrypt. Previously, the IV was not updated
  correctly in the case of input data shorter than the block
  size. Reported by Stephan Mueller, fixed by Daiki Ueno.

* Fix configure check for __builtin_bswap64, the incorrect
  check would result in link errors on platforms missing this
  function. Patch contributed by George Koehler.

* All use of old-fashioned suffix rules in the Makefiles have
  been replaced with %-pattern rules. Nettle's use of suffix
  rules in earlier versions depended on undocumented GNU make
  behavior, which is being deprecated in GNU make 4.3.

  Building with other make programs than GNU make is untested
  and unsupported. (Building with BSD make or Solaris make
  used to work years ago, but has not been tested recently).

Interface changes:

* Declarations of internal poly1305.h functions have been
  removed from the header file poly1305.h, to make it clear
  that they are not part of the advertised API or ABI.

Miscellaneous:

* Building the public key support of nettle now requires GMP
  version 6.1.0 or later (unless --enable-mini-gmp is used).

* A fair amount of changes to ECC internals, with a few
  deleted and a few new fields in the internal struct
  ecc_curve. Files and functions have been renamed to more
  consistently match the curve name, e.g., ecc-256.c has been
  renamed to ecc-secp256r1.c.

* Documentation for chacha-poly1305 updated. It is no longer
  experimental. The implementation was updated to follow RFC
  8439 in Nettle-3.1, but that was not documented or announced
  at the time.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/nettle/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/nettle/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/nettle/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/security/nettle/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/nettle/patches/patch-Makefile.in
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/nettle/Makefile
diff -u pkgsrc/security/nettle/Makefile:1.23 pkgsrc/security/nettle/Makefile:1.24
--- pkgsrc/security/nettle/Makefile:1.23        Sun Jan 26 17:32:05 2020
+++ pkgsrc/security/nettle/Makefile     Fri May 22 08:01:51 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2020/01/26 17:32:05 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2020/05/22 08:01:51 adam Exp $
 
-DISTNAME=      nettle-3.5.1
+DISTNAME=      nettle-3.6
 CATEGORIES=    devel security
 MASTER_SITES=  http://www.lysator.liu.se/~nisse/archive/
 MASTER_SITES+= ftp://ftp.lysator.liu.se/pub/security/lsh/
@@ -15,7 +15,8 @@ USE_LIBTOOL=          yes
 USE_TOOLS+=            gm4 gmake
 GNU_CONFIGURE=         yes
 SET_LIBDIR=            yes
-CONFIGURE_ARGS+=       --disable-openssl --disable-shared
+CONFIGURE_ARGS+=       --disable-openssl
+CONFIGURE_ARGS+=       --disable-shared
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/security/nettle/PLIST
diff -u pkgsrc/security/nettle/PLIST:1.9 pkgsrc/security/nettle/PLIST:1.10
--- pkgsrc/security/nettle/PLIST:1.9    Sat Jul 20 22:01:57 2019
+++ pkgsrc/security/nettle/PLIST        Fri May 22 08:01:51 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/07/20 22:01:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/05/22 08:01:51 adam Exp $
 bin/nettle-hash
 bin/nettle-lfib-stream
 bin/nettle-pbkdf2
@@ -23,6 +23,7 @@ include/nettle/chacha.h
 include/nettle/cmac.h
 include/nettle/ctr.h
 include/nettle/curve25519.h
+include/nettle/curve448.h
 include/nettle/des.h
 include/nettle/dsa-compat.h
 include/nettle/dsa.h
@@ -32,6 +33,7 @@ include/nettle/ecc.h
 include/nettle/ecdsa.h
 include/nettle/eddsa.h
 include/nettle/gcm.h
+include/nettle/gostdsa.h
 include/nettle/gosthash94.h
 include/nettle/hkdf.h
 include/nettle/hmac.h
@@ -61,6 +63,7 @@ include/nettle/sha.h
 include/nettle/sha1.h
 include/nettle/sha2.h
 include/nettle/sha3.h
+include/nettle/siv-cmac.h
 include/nettle/twofish.h
 include/nettle/umac.h
 include/nettle/version.h

Index: pkgsrc/security/nettle/buildlink3.mk
diff -u pkgsrc/security/nettle/buildlink3.mk:1.8 pkgsrc/security/nettle/buildlink3.mk:1.9
--- pkgsrc/security/nettle/buildlink3.mk:1.8    Sat Jul 20 22:03:16 2019
+++ pkgsrc/security/nettle/buildlink3.mk        Fri May 22 08:01:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2019/07/20 22:03:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2020/05/22 08:01:51 adam Exp $
 
 BUILDLINK_TREE+=       nettle
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        nettle
 NETTLE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.nettle+= nettle>=2.4
-BUILDLINK_ABI_DEPENDS.nettle+= nettle>=3.5.1
+BUILDLINK_ABI_DEPENDS.nettle+= nettle>=3.6
 BUILDLINK_PKGSRCDIR.nettle?=   ../../security/nettle
 
 BUILDLINK_API_DEPENDS.gmp+=    gmp>=6.0

Index: pkgsrc/security/nettle/distinfo
diff -u pkgsrc/security/nettle/distinfo:1.18 pkgsrc/security/nettle/distinfo:1.19
--- pkgsrc/security/nettle/distinfo:1.18        Sat Jul 20 22:01:57 2019
+++ pkgsrc/security/nettle/distinfo     Fri May 22 08:01:51 2020
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.18 2019/07/20 22:01:57 wiz Exp $
+$NetBSD: distinfo,v 1.19 2020/05/22 08:01:51 adam Exp $
 
-SHA1 (nettle-3.5.1.tar.gz) = 077a71eef4a62acc4480ff7e2051f806b1724ea2
-RMD160 (nettle-3.5.1.tar.gz) = 01beaf91c0eb97a2b4def7a2733e030c0aaddec1
-SHA512 (nettle-3.5.1.tar.gz) = f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
-Size (nettle-3.5.1.tar.gz) = 1989593 bytes
-SHA1 (patch-Makefile.in) = 5509ddde8b3ab98f07ffb7ec4d21e65ade28b42c
+SHA1 (nettle-3.6.tar.gz) = 22e48a4d232ccd26ba8303709f2222b422a8827d
+RMD160 (nettle-3.6.tar.gz) = 26dd0cda467edff59ba98f0b9ce377a879f0a3dd
+SHA512 (nettle-3.6.tar.gz) = 2471af875e51327af61af8bda53cd9c3adc27b6e32592a4b5b10b3ec60999ebf771ab9c54c747b0bade4b3b5a717e77fdbdb53699dd9e8a9ed4eee07f46aed51
+Size (nettle-3.6.tar.gz) = 2288173 bytes
+SHA1 (patch-Makefile.in) = 737dda72892ee1732adef5b71d52f1ffc5fee20b
 SHA1 (patch-aa) = 2332668b077a6e3a1add603c87f60167755554ec
 SHA1 (patch-config.make.in) = 708fb3cac9c44825e0d231541cbecade2239c850
-SHA1 (patch-testsuite_Makefile.in) = 98db291808e0db7c7ec1e64facf56a956b226bc1
+SHA1 (patch-testsuite_Makefile.in) = 6e530041b753336b3eff745e0b05b3b382baec0c
 SHA1 (patch-tools_Makefile.in) = 743d09935526cb783fe93ffc417c4153e13dcfac

Index: pkgsrc/security/nettle/patches/patch-Makefile.in
diff -u pkgsrc/security/nettle/patches/patch-Makefile.in:1.7 pkgsrc/security/nettle/patches/patch-Makefile.in:1.8
--- pkgsrc/security/nettle/patches/patch-Makefile.in:1.7        Sat Jul 20 22:01:57 2019
+++ pkgsrc/security/nettle/patches/patch-Makefile.in    Fri May 22 08:01:51 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.7 2019/07/20 22:01:57 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.8 2020/05/22 08:01:51 adam Exp $
 
 Use LIBTOOL.
 
---- Makefile.in.orig   2015-04-24 17:22:03.000000000 +0000
+--- Makefile.in.orig   2020-04-29 18:11:44.000000000 +0000
 +++ Makefile.in
 @@ -25,7 +25,7 @@ PRE_CPPFLAGS = -I.
  EXTRA_CFLAGS = $(CCPIC)
@@ -13,7 +13,7 @@ Use LIBTOOL.
  SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK)
  
  getopt_SOURCES = getopt.c getopt1.c
-@@ -234,20 +234,20 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ
+@@ -264,24 +264,24 @@ nettle_OBJS = $(nettle_SOURCES:.c=.$(OBJ
  hogweed_OBJS = $(hogweed_SOURCES:.c=.$(OBJEXT)) \
               $(OPT_HOGWEED_OBJS) @IF_MINI_GMP@ mini-gmp.$(OBJEXT)
  
@@ -37,22 +37,18 @@ Use LIBTOOL.
 +              -version-info ${LIBHOGWEED_MAJOR}:${LIBHOGWEED_MINOR}
        echo hogweed > libhogweed.stamp
  
- .c.$(OBJEXT):
--      $(COMPILE) -c $< \
-+      ${LIBTOOL} --mode=compile --tag=CC $(COMPILE) $(CCPIC_MAYBE) -c $< \
-       && $(DEP_PROCESS)
- 
- # Rules building shared libraries.
-@@ -372,7 +372,7 @@ ecc-25519.$(OBJEXT): ecc-25519.h
- 
- .asm.$(OBJEXT): $(srcdir)/asm.m4 machine.m4 config.m4
+ %.$(OBJEXT): %.asm $(srcdir)/asm.m4 machine.m4 config.m4
        $(M4) $(srcdir)/asm.m4 machine.m4 config.m4 $< >$*.s
 -      $(COMPILE) -c $*.s
 +      ${LIBTOOL} --mode=compile $(COMPILE) -c $*.s
-       @echo "$@ : $< $(srcdir)/asm.m4 machine.m4 config.m4" >$@.d 
  
- # Texinfo rules
-@@ -442,7 +442,7 @@ install-here: install-doc install-header
+ %.$(OBJEXT): %.c
+-      $(COMPILE) -c $< \
++      ${LIBTOOL} --mode=compile $(COMPILE) -c $< \
+       && $(DEP_PROCESS)
+ 
+ # Rules building shared libraries.
+@@ -481,7 +481,7 @@ install-here: install-doc install-header
  install-static: $(LIBTARGETS)
        $(MKDIR_P) $(DESTDIR)$(libdir)
        for f in $(LIBTARGETS); do \

Index: pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in
diff -u pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in:1.5 pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in:1.6
--- pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in:1.5      Sun Aug 23 14:22:10 2015
+++ pkgsrc/security/nettle/patches/patch-testsuite_Makefile.in  Fri May 22 08:01:51 2020
@@ -1,18 +1,17 @@
-$NetBSD: patch-testsuite_Makefile.in,v 1.5 2015/08/23 14:22:10 wiz Exp $
+$NetBSD: patch-testsuite_Makefile.in,v 1.6 2020/05/22 08:01:51 adam Exp $
 
 Use LIBTOOL.
 
---- testsuite/Makefile.in.orig 2014-06-07 06:15:01.000000000 +0000
+--- testsuite/Makefile.in.orig 2020-04-29 18:11:44.000000000 +0000
 +++ testsuite/Makefile.in
-@@ -76,9 +76,9 @@ all: $(EXTRA_TARGETS)
- # to use suffix rules to build the test executables. So we use an
+@@ -93,8 +93,8 @@ all: $(EXTRA_TARGETS)
  # explicit rule for each and every executable.
  
+ TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT)
 -LIB_HOGWEED = @IF_HOGWEED@ -lhogweed
+-TEST_LIBS = $(LIB_HOGWEED) -lnettle $(LIBS)
 +LIB_HOGWEED = @IF_HOGWEED@ ../libhogweed.la
- TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
--          $(LIB_HOGWEED) -lnettle $(LIBS)
-+          $(LIB_HOGWEED) ../libnettle.la $(LIBS)
++TEST_LIBS = $(LIB_HOGWEED) ../libnettle.la $(LIBS)
  
  ../nettle-internal.$(OBJEXT):
        ( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )