Update to Botan-1.11.33:

- avoid side channel with OAEP (CVE-2016-8871)
- avoid Lucky13 timing attack against CBC-based TLS cipher
- added X25519-based key exchange for TLS
- add support for the TLS Supported Point Formats Extension from
  RFC 4492
- add support for the NewHope Ring-LWE key encapsulation algorithm
  for estimated ~200 bit security level against a quantum attacker.
- add support for TLS Encrypt-then-MAC extension
- Fix undefined behavior in Curve25519 for 32bit platforms
- bugfix for GCM when 32-bit counters overflowed
- added ChaCha20Poly1305 TLS cipher

5 files changed, 45 insertions, 77 deletions

diff --git a/security/botan-devel/Makefile b/security/botan-devel/Makefile
index 5d5f113acd9..f389399278e 100644
--- a/security/botan-devel/Makefile
+++ b/security/botan-devel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/10/07 18:25:33 adam Exp $
+# $NetBSD: Makefile,v 1.16 2016/11/11 19:41:44 joerg Exp $
 
-DISTNAME=	Botan-1.11.29
+DISTNAME=	Botan-1.11.33
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://botan.randombit.net/releases/
 EXTRACT_SUFX=	.tgz
@@ -34,16 +33,6 @@ USE_TOOLS+=	gmake
 
 PY_PATCHPLIST=	yes
 
-PLIST_VARS+=	x86 x86_64
-
-.if ${MACHINE_ARCH} == "x86_64"
-PLIST.x86_64=	yes
-PLIST.x86=	yes
-CONFIGURE_ARGS+=	--cpu=x86_64
-.elif ${MACHINE_ARCH} == "i386"
-PLIST.x86=	yes
-.endif
-
 MAKE_FLAGS.SunOS+=	USER_APP_LINKS_TO=-lnsl
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/security/botan-devel/PLIST b/security/botan-devel/PLIST
index 49c29dc2056..316f676f7ea 100644
--- a/security/botan-devel/PLIST
+++ b/security/botan-devel/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2016/07/02 14:42:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/11/11 19:41:44 joerg Exp $
 bin/botan
 include/botan-1.11/botan/adler32.h
 include/botan-1.11/botan/aead.h
 include/botan-1.11/botan/aes.h
-${PLIST.x86}include/botan-1.11/botan/aes_ni.h
-${PLIST.x86}include/botan-1.11/botan/aes_ssse3.h
 include/botan-1.11/botan/alg_id.h
 include/botan-1.11/botan/asn1_alt_name.h
 include/botan-1.11/botan/asn1_attribute.h
@@ -39,10 +37,12 @@ include/botan-1.11/botan/cbc_mac.h
 include/botan-1.11/botan/ccm.h
 include/botan-1.11/botan/cert_status.h
 include/botan-1.11/botan/certstor.h
+include/botan-1.11/botan/certstor_sql.h
 include/botan-1.11/botan/cfb.h
-include/botan-1.11/botan/chacha20poly1305.h
 include/botan-1.11/botan/chacha.h
+include/botan-1.11/botan/chacha20poly1305.h
 include/botan-1.11/botan/charset.h
+include/botan-1.11/botan/cipher_filter.h
 include/botan-1.11/botan/cipher_mode.h
 include/botan-1.11/botan/cmac.h
 include/botan-1.11/botan/comb4p.h
@@ -58,9 +58,9 @@ include/botan-1.11/botan/ctr.h
 include/botan-1.11/botan/curve25519.h
 include/botan-1.11/botan/curve_gfp.h
 include/botan-1.11/botan/curve_nistp.h
-include/botan-1.11/botan/database.h
 include/botan-1.11/botan/data_snk.h
 include/botan-1.11/botan/data_src.h
+include/botan-1.11/botan/database.h
 include/botan-1.11/botan/datastor.h
 include/botan-1.11/botan/der_enc.h
 include/botan-1.11/botan/des.h
@@ -72,18 +72,20 @@ include/botan-1.11/botan/dl_group.h
 include/botan-1.11/botan/dlies.h
 include/botan-1.11/botan/dsa.h
 include/botan-1.11/botan/eax.h
+include/botan-1.11/botan/ec_group.h
 include/botan-1.11/botan/ecb.h
 include/botan-1.11/botan/ecc_key.h
 include/botan-1.11/botan/ecdh.h
 include/botan-1.11/botan/ecdsa.h
-include/botan-1.11/botan/ec_group.h
+include/botan-1.11/botan/ecgdsa.h
+include/botan-1.11/botan/ecies.h
+include/botan-1.11/botan/eckcdsa.h
 include/botan-1.11/botan/elgamal.h
 include/botan-1.11/botan/eme.h
 include/botan-1.11/botan/eme_pkcs.h
 include/botan-1.11/botan/eme_raw.h
-include/botan-1.11/botan/emsa1_bsi.h
-include/botan-1.11/botan/emsa1.h
 include/botan-1.11/botan/emsa.h
+include/botan-1.11/botan/emsa1.h
 include/botan-1.11/botan/emsa_pkcs1.h
 include/botan-1.11/botan/emsa_raw.h
 include/botan-1.11/botan/emsa_x931.h
@@ -99,38 +101,34 @@ include/botan-1.11/botan/gf2m_small_m.h
 include/botan-1.11/botan/gost_28147.h
 include/botan-1.11/botan/gost_3410.h
 include/botan-1.11/botan/gost_3411.h
-include/botan-1.11/botan/has160.h
 include/botan-1.11/botan/hash.h
 include/botan-1.11/botan/hash_id.h
-include/botan-1.11/botan/hex_filt.h
 include/botan-1.11/botan/hex.h
+include/botan-1.11/botan/hex_filt.h
 include/botan-1.11/botan/hkdf.h
-include/botan-1.11/botan/hmac_drbg.h
 include/botan-1.11/botan/hmac.h
+include/botan-1.11/botan/hmac_drbg.h
 include/botan-1.11/botan/hmac_rng.h
 include/botan-1.11/botan/http_util.h
 include/botan-1.11/botan/idea.h
-${PLIST.x86}include/botan-1.11/botan/idea_sse2.h
-include/botan-1.11/botan/if_algo.h
 include/botan-1.11/botan/init.h
 include/botan-1.11/botan/kasumi.h
+include/botan-1.11/botan/kdf.h
 include/botan-1.11/botan/kdf1.h
+include/botan-1.11/botan/kdf1_iso18033.h
 include/botan-1.11/botan/kdf2.h
-include/botan-1.11/botan/kdf.h
 include/botan-1.11/botan/keccak.h
 include/botan-1.11/botan/key_constraint.h
 include/botan-1.11/botan/key_filt.h
-include/botan-1.11/botan/keypair.h
 include/botan-1.11/botan/key_spec.h
+include/botan-1.11/botan/keypair.h
 include/botan-1.11/botan/lion.h
 include/botan-1.11/botan/loadstor.h
 include/botan-1.11/botan/locking_allocator.h
 include/botan-1.11/botan/lookup.h
 include/botan-1.11/botan/mac.h
-include/botan-1.11/botan/mars.h
 include/botan-1.11/botan/mceies.h
 include/botan-1.11/botan/mceliece.h
-include/botan-1.11/botan/md2.h
 include/botan-1.11/botan/md4.h
 include/botan-1.11/botan/md5.h
 include/botan-1.11/botan/mdx_hash.h
@@ -140,10 +138,10 @@ include/botan-1.11/botan/misty1.h
 include/botan-1.11/botan/mode_pad.h
 include/botan-1.11/botan/mp_types.h
 include/botan-1.11/botan/mul128.h
+include/botan-1.11/botan/mutex.h
 include/botan-1.11/botan/name_constraint.h
+include/botan-1.11/botan/newhope.h
 include/botan-1.11/botan/noekeon.h
-include/botan-1.11/botan/noekeon_simd.h
-include/botan-1.11/botan/nr.h
 include/botan-1.11/botan/numthry.h
 include/botan-1.11/botan/oaep.h
 include/botan-1.11/botan/ocb.h
@@ -157,15 +155,16 @@ include/botan-1.11/botan/par_hash.h
 include/botan-1.11/botan/parsing.h
 include/botan-1.11/botan/passhash9.h
 include/botan-1.11/botan/pbes2.h
+include/botan-1.11/botan/pbkdf.h
 include/botan-1.11/botan/pbkdf1.h
 include/botan-1.11/botan/pbkdf2.h
-include/botan-1.11/botan/pbkdf.h
 include/botan-1.11/botan/pem.h
 include/botan-1.11/botan/pipe.h
+include/botan-1.11/botan/pk_algs.h
+include/botan-1.11/botan/pk_keys.h
+include/botan-1.11/botan/pk_ops_fwd.h
 include/botan-1.11/botan/pkcs10.h
 include/botan-1.11/botan/pkcs8.h
-include/botan-1.11/botan/pk_keys.h
-include/botan-1.11/botan/pk_ops.h
 include/botan-1.11/botan/point_gfp.h
 include/botan-1.11/botan/poly1305.h
 include/botan-1.11/botan/polyn_gf2m.h
@@ -174,47 +173,44 @@ include/botan-1.11/botan/prf_tls.h
 include/botan-1.11/botan/prf_x942.h
 include/botan-1.11/botan/pssr.h
 include/botan-1.11/botan/pubkey.h
-include/botan-1.11/botan/rc2.h
 include/botan-1.11/botan/rc4.h
-include/botan-1.11/botan/rc5.h
-include/botan-1.11/botan/rc6.h
+include/botan-1.11/botan/rdrand_rng.h
 include/botan-1.11/botan/reducer.h
 include/botan-1.11/botan/rfc3394.h
 include/botan-1.11/botan/rfc6979.h
-include/botan-1.11/botan/rmd128.h
 include/botan-1.11/botan/rmd160.h
 include/botan-1.11/botan/rng.h
 include/botan-1.11/botan/rotate.h
 include/botan-1.11/botan/rsa.h
-include/botan-1.11/botan/rw.h
-include/botan-1.11/botan/safer_sk.h
 include/botan-1.11/botan/salsa20.h
 include/botan-1.11/botan/scan_name.h
 include/botan-1.11/botan/secmem.h
 include/botan-1.11/botan/secqueue.h
 include/botan-1.11/botan/seed.h
 include/botan-1.11/botan/serpent.h
-include/botan-1.11/botan/serp_simd.h
 include/botan-1.11/botan/sha160.h
-${PLIST.x86}include/botan-1.11/botan/sha1_sse2.h
 include/botan-1.11/botan/sha2_32.h
 include/botan-1.11/botan/sha2_64.h
+include/botan-1.11/botan/sha3.h
+include/botan-1.11/botan/shake_cipher.h
 include/botan-1.11/botan/siphash.h
 include/botan-1.11/botan/siv.h
 include/botan-1.11/botan/skein_512.h
-include/botan-1.11/botan/srp6_files.h
+include/botan-1.11/botan/sp800_108.h
+include/botan-1.11/botan/sp800_56c.h
 include/botan-1.11/botan/srp6.h
+include/botan-1.11/botan/srp6_files.h
+include/botan-1.11/botan/stateful_rng.h
 include/botan-1.11/botan/stream_cipher.h
 include/botan-1.11/botan/stream_mode.h
 include/botan-1.11/botan/sym_algo.h
 include/botan-1.11/botan/symkey.h
 include/botan-1.11/botan/system_rng.h
-include/botan-1.11/botan/tea.h
-${PLIST.x86}include/botan-1.11/botan/threefish_avx2.h
 include/botan-1.11/botan/threefish.h
 include/botan-1.11/botan/tiger.h
 include/botan-1.11/botan/tls_alert.h
 include/botan-1.11/botan/tls_blocking.h
+include/botan-1.11/botan/tls_callbacks.h
 include/botan-1.11/botan/tls_channel.h
 include/botan-1.11/botan/tls_ciphersuite.h
 include/botan-1.11/botan/tls_client.h
@@ -228,8 +224,6 @@ include/botan-1.11/botan/tls_session.h
 include/botan-1.11/botan/tls_session_manager.h
 include/botan-1.11/botan/tls_session_manager_sql.h
 include/botan-1.11/botan/tls_version.h
-include/botan-1.11/botan/transform_filter.h
-include/botan-1.11/botan/transform.h
 include/botan-1.11/botan/tss.h
 include/botan-1.11/botan/twofish.h
 include/botan-1.11/botan/types.h
@@ -237,26 +231,26 @@ include/botan-1.11/botan/version.h
 include/botan-1.11/botan/whrlpool.h
 include/botan-1.11/botan/workfactor.h
 include/botan-1.11/botan/x509_ca.h
-include/botan-1.11/botan/x509cert.h
 include/botan-1.11/botan/x509_crl.h
 include/botan-1.11/botan/x509_dn.h
 include/botan-1.11/botan/x509_ext.h
 include/botan-1.11/botan/x509_key.h
 include/botan-1.11/botan/x509_obj.h
+include/botan-1.11/botan/x509cert.h
 include/botan-1.11/botan/x509path.h
 include/botan-1.11/botan/x509self.h
 include/botan-1.11/botan/x919_mac.h
 include/botan-1.11/botan/x931_rng.h
 include/botan-1.11/botan/xtea.h
-include/botan-1.11/botan/xtea_simd.h
 include/botan-1.11/botan/xts.h
 include/botan-1.11/botan/zlib.h
 lib/libbotan-1.11.a
 lib/libbotan-1.11.so
-lib/libbotan-1.11.so.29
-lib/libbotan-1.11.so.29.29
+lib/libbotan-1.11.so.33
+lib/libbotan-1.11.so.33.33
 lib/pkgconfig/botan-1.11.pc
 ${PYSITELIB}/botan.py
+share/doc/${PKGNAME}/deprecated.txt
 share/doc/${PKGNAME}/license.txt
 share/doc/${PKGNAME}/manual/aead.rst
 share/doc/${PKGNAME}/manual/bigint.rst
diff --git a/security/botan-devel/distinfo b/security/botan-devel/distinfo
index 22b9c3615f8..28a71b8ad95 100644
--- a/security/botan-devel/distinfo
+++ b/security/botan-devel/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.9 2016/05/31 21:37:12 joerg Exp $
+$NetBSD: distinfo,v 1.10 2016/11/11 19:41:44 joerg Exp $
 
-SHA1 (Botan-1.11.29.tgz) = cf1673ff6bb50d4417cafd01c9aa196c77cc81db
-RMD160 (Botan-1.11.29.tgz) = e4f982659f9b2470fdfcec6823c07d8114740abc
-SHA512 (Botan-1.11.29.tgz) = c6ad6cf3d68c3524b9532e9f52e74d89cc2abfd093f1a46a44efa94a87b0fa50278f11dc5953225160d090cf8ae1c372f54c23b5dffd1f3dae79e210195cfd72
-Size (Botan-1.11.29.tgz) = 3137027 bytes
+SHA1 (Botan-1.11.33.tgz) = 71f2f4c81af48197e7c6db86bab393396ecf6541
+RMD160 (Botan-1.11.33.tgz) = f0de0fea65fd501747cf1949e47ec2faeb6acaa0
+SHA512 (Botan-1.11.33.tgz) = 49bb4485663897dd07bb7982771befacc50bfabef5806dc802cbd4d39f5d641b08a264824b5b1b96421e810811353deea15e728c5d08ce2932cf0e4602ae099d
+Size (Botan-1.11.33.tgz) = 4329671 bytes
 SHA1 (patch-src_build-data_os_dragonfly.txt) = 2aef3f0c514f6d1e84aae43052d82b3536a1b1c5
-SHA1 (patch-src_build-data_os_freebsd.txt) = 43d02f914de0c14a848deac2f1165b2ce324fc5c
 SHA1 (patch-src_build-data_os_netbsd.txt) = e3acd79c182f338542c4c65b20f2443e42a1a488
 SHA1 (patch-src_build-data_os_openbsd.txt) = 2388e859c855409f6ec23e2b149b3eb56c5a0aea
-SHA1 (patch-src_lib_utils_os__utils.cpp) = f7bfadeb1eb614bc10ee8caad4fdddbaf4b43f1e
+SHA1 (patch-src_lib_utils_os__utils.cpp) = feb47c688461fd7665dba99d83c8ab561c4791de
diff --git a/security/botan-devel/patches/patch-src_build-data_os_freebsd.txt b/security/botan-devel/patches/patch-src_build-data_os_freebsd.txt
deleted file mode 100644
index 0b53498cd8c..00000000000
--- a/security/botan-devel/patches/patch-src_build-data_os_freebsd.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_build-data_os_freebsd.txt,v 1.1 2016/05/31 21:37:12 joerg Exp $
-
---- src/build-data/os/freebsd.txt.orig	2016-05-25 21:22:53.135096812 +0000
-+++ src/build-data/os/freebsd.txt
-@@ -1,5 +1,9 @@
- os_type unix
- 
-+soname_pattern_base  "libbotan-{version_major}.{version_minor}.so"
-+soname_pattern_abi   "libbotan-{version_major}.{version_minor}.so.{abi_rev}"
-+soname_pattern_patch "libbotan-{version_major}.{version_minor}.so.{abi_rev}.{version_patch}"
-+
- <target_features>
- clock_gettime
- gettimeofday
diff --git a/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp b/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp
index 66a55c650c6..7c3e2f5826c 100644
--- a/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp
+++ b/security/botan-devel/patches/patch-src_lib_utils_os__utils.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.1 2016/05/19 21:58:43 joerg Exp $
+$NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.2 2016/11/11 19:41:44 joerg Exp $
 
---- src/lib/utils/os_utils.cpp.orig	2016-03-21 01:26:12.000000000 +0000
+--- src/lib/utils/os_utils.cpp.orig	2016-10-26 13:39:08.000000000 +0000
 +++ src/lib/utils/os_utils.cpp
 @@ -19,6 +19,10 @@
    #include <unistd.h>
@@ -10,10 +10,10 @@ $NetBSD: patch-src_lib_utils_os__utils.cpp,v 1.1 2016/05/19 21:58:43 joerg Exp $
 +#include <priv.h>
 +#endif
 +
- #if defined(BOTAN_TARGET_OS_TYPE_IS_WINDOWS)
+ #if defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW)
    #include <windows.h>
  #endif
-@@ -171,6 +175,19 @@ size_t get_memory_locking_limit()
+@@ -216,6 +220,19 @@ size_t get_memory_locking_limit()
           return BOTAN_MLOCK_ALLOCATOR_MAX_LOCKED_KB * 1024ULL;
           }
        }