Changes 1.5.0:

* New function gcry_kdf_derive implementing OpenPGP S2K algorithms
  and PBKDF2.
* Support for WindowsCE.
* Support for ECDH.
* Support for OAEP and PSS methods as described by RFC-3447.
* Fixed PKCS v1.5 code to always return the leading zero.
* New format specifiers "%M" and "%u" for gcry_sexp_build.
* Support opaque MPIs with "%m" and "%M" in gcry_sexp_build.
* New functions gcry_pk_get_curve and gcry_pk_get_param to map ECC
  parameters to a curve name and to retrieve parameter values.
* gcry_mpi_cmp applied to opaque values has a defined semantic now.
* Uses the Intel AES-NI instructions if available.
* The use of the deprecated Alternative Public Key Interface
  (gcry_ac_*) will now print compile time warnings.
* The module register subsystem has been deprecated.  This subsystem
  is not flexible enough and would always require ABI changes to
  extend the internal interfaces.  It will eventually be removed.
  Please contact us on the gcrypt-devel mailing list to discuss
  whether you really need this feature or how it can be replaced by
  an internal plugin mechanism.
* CTR mode may now be used with data chunks of arbitrary length.

12 files changed, 88 insertions, 53 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index dc8a0270bc3..5143682444a 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2011/04/22 13:42:47 obache Exp $
+# $NetBSD: Makefile,v 1.51 2011/07/13 21:21:52 adam Exp $
 
-DISTNAME=	libgcrypt-1.4.6
-PKGREVISION=	2
+DISTNAME=	libgcrypt-1.5.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/libgcrypt/
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 3f58bf70778..c3ec92d123d 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.32 2010/07/27 04:45:41 taca Exp $
+$NetBSD: distinfo,v 1.33 2011/07/13 21:21:52 adam Exp $
 
-SHA1 (libgcrypt-1.4.6/gcrypt.tar.bz2) = 5d402e4e4e6831f74b738f1a022cf024bcb24ecd
-RMD160 (libgcrypt-1.4.6/gcrypt.tar.bz2) = d1032e66bd4b6f51e437993a7178d14b09a2955a
-Size (libgcrypt-1.4.6/gcrypt.tar.bz2) = 4231 bytes
-SHA1 (libgcrypt-1.4.6/libgcrypt-1.4.6.tar.bz2) = 445b9e158aaf91e24eae3d1040c6213e9d9f5ba6
-RMD160 (libgcrypt-1.4.6/libgcrypt-1.4.6.tar.bz2) = d4d720c4bfe80f0799b2cbdbbb49d304e3195049
-Size (libgcrypt-1.4.6/libgcrypt-1.4.6.tar.bz2) = 1151877 bytes
-SHA1 (patch-aa) = 27db0d01f6a95566ccf0471a12f9a16dd7f994eb
-SHA1 (patch-ab) = eb6d759e98acdce7aebc9ca28fff84e07a06e11c
-SHA1 (patch-ac) = b8333a4c7a4a6d34c2e6840a5dd3af070280b42a
-SHA1 (patch-ad) = f32281612b51c5bb3788cf03c6f5615bdfc0d3e8
-SHA1 (patch-ae) = 7199ed8fe571b8c892d6eafb868820d625c2b7fa
+SHA1 (libgcrypt-1.5.0/libgcrypt-1.5.0.tar.bz2) = 3e776d44375dc1a710560b98ae8437d5da6e32cf
+RMD160 (libgcrypt-1.5.0/libgcrypt-1.5.0.tar.bz2) = f01e8198dcc379ff2fa5e8d3ac39e7b32fc41dad
+Size (libgcrypt-1.5.0/libgcrypt-1.5.0.tar.bz2) = 1433506 bytes
+SHA1 (patch-aa) = 7c46612f912d45dfd4ce4f4b510e72c00bd38585
+SHA1 (patch-ab) = 18fa39f87103959955ab1c0a36e3063e085403bc
+SHA1 (patch-ac) = c59d7bb73fa0e79522b287054633e276ffbb069d
+SHA1 (patch-ad) = 19345b7d164521d526a44eb3f1a465ff09d8266c
+SHA1 (patch-ae) = 50eeea5a193e14012e0d127a0618dfc03727d96c
 SHA1 (patch-af) = e6d33b3e9c25a560c1df11843c6be3c9319bd018
-SHA1 (patch-ba) = f20a6c954339151cde8e0ada1c833491eeb2f2c8
-SHA1 (patch-bb) = 76ac3399ac26ee4c631bc608225b708273beb2af
-SHA1 (patch-bc) = 837eefee38382eb47068a965d378c1dfb2c7b82b
+SHA1 (patch-ba) = a39a6972d197193ea7831d23cfa66f14ca55105e
+SHA1 (patch-bb) = b75a2cb6d526976bb4d3a0948ce4c15eead4e2ae
+SHA1 (patch-bc) = 86b594ac2ee25d8a68809765a13942e8fd3be051
+SHA1 (patch-mpi_mpi-inline.h) = 0cec82342605ea5ebe7ef1da90bceecd2816e2bf
+SHA1 (patch-mpi_mpi-internal.h) = 431485228bdacd043e159f4f84de3871dc82f0d2
diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa
index 6893ad423b0..fbcd89eba04 100644
--- a/security/libgcrypt/patches/patch-aa
+++ b/security/libgcrypt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2008/10/14 11:33:13 adam Exp $
+$NetBSD: patch-aa,v 1.7 2011/07/13 21:21:52 adam Exp $
 
 --- src/libgcrypt-config.in.orig	2008-08-19 17:20:04.000000000 +0200
 +++ src/libgcrypt-config.in
-@@ -147,7 +147,7 @@ if test "$echo_libs" = "yes"; then
+@@ -155,7 +155,7 @@ if test "$echo_libs" = "yes"; then
  
      # Set up `libdirs'.
      if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
diff --git a/security/libgcrypt/patches/patch-ab b/security/libgcrypt/patches/patch-ab
index a61fd67cb5d..4d7d4e3a653 100644
--- a/security/libgcrypt/patches/patch-ab
+++ b/security/libgcrypt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/10/14 11:33:13 adam Exp $
+$NetBSD: patch-ab,v 1.3 2011/07/13 21:21:52 adam Exp $
 
---- random/rndunix.c.orig	2008-09-03 12:04:43.000000000 +0200
+--- random/rndunix.c.orig	2011-02-04 19:16:03.000000000 +0000
 +++ random/rndunix.c
-@@ -710,6 +710,15 @@ start_gatherer( int pipefd )
+@@ -737,6 +737,15 @@ start_gatherer( int pipefd )
  	    if( i != n1 && i != n2 && i != pipefd )
  		close(i);
  	}
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2008/10/14 11:33:13 adam Exp $
  	errno = 0;
      }
  
-@@ -737,6 +746,10 @@ start_gatherer( int pipefd )
+@@ -764,6 +773,10 @@ start_gatherer( int pipefd )
  #endif
  
      fclose(stderr);		/* Arrghh!!  It's Stuart code!! */
diff --git a/security/libgcrypt/patches/patch-ac b/security/libgcrypt/patches/patch-ac
index b3d1dbdb405..06142d0c695 100644
--- a/security/libgcrypt/patches/patch-ac
+++ b/security/libgcrypt/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2008/10/14 11:33:13 adam Exp $
+$NetBSD: patch-ac,v 1.8 2011/07/13 21:21:52 adam Exp $
 
 --- src/gcrypt.h.orig	2008-09-18 17:11:53.000000000 +0200
 +++ src/gcrypt.h
-@@ -173,6 +173,11 @@ gcry_err_code_t gcry_error_from_errno (i
+@@ -177,6 +177,11 @@ gcry_err_code_t gcry_error_from_errno (i
  /* This enum is deprecated; it is only declared for the sake of
     complete API compatibility.  */
  enum gcry_thread_option
diff --git a/security/libgcrypt/patches/patch-ad b/security/libgcrypt/patches/patch-ad
index b07958048e3..6e5f53ea717 100644
--- a/security/libgcrypt/patches/patch-ad
+++ b/security/libgcrypt/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/10/25 13:03:53 gavan Exp $
+$NetBSD: patch-ad,v 1.2 2011/07/13 21:21:52 adam Exp $
 
 --- mpi/longlong.h.orig	2004-03-03 08:21:49.000000000 +0000
 +++ mpi/longlong.h
-@@ -1133,7 +1133,7 @@ extern USItype __udiv_qrnnd ();
+@@ -1150,7 +1150,7 @@ extern USItype __udiv_qrnnd ();
  	     "rJ" ((USItype)(al)),                                      \
  	     "rI" ((USItype)(bl))                                       \
  	   __CLOBBER_CC)
diff --git a/security/libgcrypt/patches/patch-ae b/security/libgcrypt/patches/patch-ae
index 32281bf7a70..be8473c9f0a 100644
--- a/security/libgcrypt/patches/patch-ae
+++ b/security/libgcrypt/patches/patch-ae
@@ -1,21 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2008/10/14 11:33:13 adam Exp $
+$NetBSD: patch-ae,v 1.6 2011/07/13 21:21:52 adam Exp $
 
---- src/ath.h.orig	2008-08-19 17:20:04.000000000 +0200
+--- src/ath.h.orig	2011-02-04 19:17:33.000000000 +0000
 +++ src/ath.h
-@@ -31,6 +31,12 @@
- 
- #include <config.h>
- 
-+#ifdef HAVE_SYS_SELECT_H
-+# include <sys/select.h>
-+#else
-+# include <sys/time.h>
-+#endif
-+
- 
- /* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols
-    a prefix.  */
-@@ -89,6 +95,14 @@ struct ath_ops
+@@ -98,6 +104,14 @@ struct ath_ops
    int (*connect) (int s, void *addr, int length);
    int (*sendmsg) (int s, const void *msg, int flags);
    int (*recvmsg) (int s, void *msg, int flags);
@@ -30,7 +17,7 @@ $NetBSD: patch-ae,v 1.5 2008/10/14 11:33:13 adam Exp $
  #else
    ssize_t (*select) (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
  		     struct timeval *timeout);
-@@ -125,6 +139,14 @@ int ath_accept (int s, void *addr, int *
+@@ -134,6 +148,14 @@ int ath_accept (int s, void *addr, int *
  int ath_connect (int s, void *addr, int length);
  int ath_sendmsg (int s, const void *msg, int flags);
  int ath_recvmsg (int s, void *msg, int flags);
diff --git a/security/libgcrypt/patches/patch-ba b/security/libgcrypt/patches/patch-ba
index d72062cfd2a..aa36203f7a9 100644
--- a/security/libgcrypt/patches/patch-ba
+++ b/security/libgcrypt/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2009/12/18 18:54:24 drochner Exp $
+$NetBSD: patch-ba,v 1.2 2011/07/13 21:21:52 adam Exp $
 
 --- cipher/cipher.c.orig	2009-04-02 09:25:34.000000000 +0000
 +++ cipher/cipher.c
-@@ -109,6 +109,10 @@ static struct cipher_table_entry
+@@ -112,6 +112,10 @@ static struct cipher_table_entry
      { &_gcry_cipher_spec_camellia256,
        &dummy_extra_spec,                  GCRY_CIPHER_CAMELLIA256 },
  #endif
diff --git a/security/libgcrypt/patches/patch-bb b/security/libgcrypt/patches/patch-bb
index 27e4c8d505f..3c38dd8aa14 100644
--- a/security/libgcrypt/patches/patch-bb
+++ b/security/libgcrypt/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2009/12/18 18:54:24 drochner Exp $
+$NetBSD: patch-bb,v 1.2 2011/07/13 21:21:52 adam Exp $
 
 --- src/cipher.h.orig	2009-04-02 09:25:32.000000000 +0000
 +++ src/cipher.h
-@@ -94,6 +94,7 @@ extern gcry_cipher_spec_t _gcry_cipher_s
+@@ -135,6 +135,7 @@ extern gcry_cipher_spec_t _gcry_cipher_s
  extern gcry_cipher_spec_t _gcry_cipher_spec_camellia128;
  extern gcry_cipher_spec_t _gcry_cipher_spec_camellia192;
  extern gcry_cipher_spec_t _gcry_cipher_spec_camellia256;
diff --git a/security/libgcrypt/patches/patch-bc b/security/libgcrypt/patches/patch-bc
index b1140dec374..d0f3c8f3b7e 100644
--- a/security/libgcrypt/patches/patch-bc
+++ b/security/libgcrypt/patches/patch-bc
@@ -1,9 +1,9 @@
-$NetBSD: patch-bc,v 1.1 2009/12/18 18:54:24 drochner Exp $
+$NetBSD: patch-bc,v 1.2 2011/07/13 21:21:52 adam Exp $
 
---- cipher/Makefile.in.orig	2009-12-11 15:43:29.000000000 +0000
+--- cipher/Makefile.in.orig	2011-06-29 08:58:00.000000000 +0000
 +++ cipher/Makefile.in
-@@ -237,7 +237,7 @@ EXTRA_DIST = Manifest
- AM_CPPFLAGS = -I../src -I$(top_srcdir)/src 
+@@ -252,7 +252,7 @@ EXTRA_DIST = Manifest
+ AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
  AM_CFLAGS = $(GPG_ERROR_CFLAGS)
  noinst_LTLIBRARIES = libcipher.la
 -GCRYPT_MODULES = @GCRYPT_CIPHERS@ @GCRYPT_PUBKEY_CIPHERS@ @GCRYPT_DIGESTS@
diff --git a/security/libgcrypt/patches/patch-mpi_mpi-inline.h b/security/libgcrypt/patches/patch-mpi_mpi-inline.h
new file mode 100644
index 00000000000..6c9ca20cba2
--- /dev/null
+++ b/security/libgcrypt/patches/patch-mpi_mpi-inline.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-mpi_mpi-inline.h,v 1.1 2011/07/13 21:21:52 adam Exp $
+
+Change inline functions to static, which fixes building with Clang.
+
+--- mpi/mpi-inline.h.orig	2011-07-13 21:09:51.000000000 +0000
++++ mpi/mpi-inline.h
+@@ -29,7 +29,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern __inline__
++#define G10_MPI_INLINE_DECL  static __inline__
+ #endif
+ 
+ G10_MPI_INLINE_DECL  mpi_limb_t
diff --git a/security/libgcrypt/patches/patch-mpi_mpi-internal.h b/security/libgcrypt/patches/patch-mpi_mpi-internal.h
new file mode 100644
index 00000000000..2bc79103100
--- /dev/null
+++ b/security/libgcrypt/patches/patch-mpi_mpi-internal.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-mpi_mpi-internal.h,v 1.1 2011/07/13 21:21:52 adam Exp $
+
+Change inline functions to static, which fixes building with Clang.
+
+--- mpi/mpi-internal.h.orig	2011-07-13 21:13:23.000000000 +0000
++++ mpi/mpi-internal.h
+@@ -183,23 +183,23 @@ void _gcry_mpi_lshift_limbs( gcry_mpi_t 
+ 
+ 
+ /*-- mpih-add.c --*/
+-mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
++static mpi_limb_t _gcry_mpih_add_1(mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+ 			 mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_add_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			  mpi_ptr_t s2_ptr,  mpi_size_t size);
+-mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++static mpi_limb_t _gcry_mpih_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpih-sub.c --*/
+-mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
++static mpi_limb_t _gcry_mpih_sub_1( mpi_ptr_t res_ptr,  mpi_ptr_t s1_ptr,
+ 			  mpi_size_t s1_size, mpi_limb_t s2_limb );
+ mpi_limb_t _gcry_mpih_sub_n( mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+ 			  mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++static mpi_limb_t _gcry_mpih_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+ 		       mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpih-cmp.c --*/
+-int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
++static int _gcry_mpih_cmp( mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size );
+ 
+ /*-- mpih-mul.c --*/
+