diff options
| author | joerg <joerg@pkgsrc.org> | 2016-05-19 22:10:24 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-05-19 22:10:24 +0000 |
| commit | 1abbcf8fc70048057f30207a36b262c9fd86bf45 (patch) | |
| tree | 5ba3ee17b2b73267203199f3a1c322b64372c050 | |
| parent | 68daa6f66685d7081205a093fc182160c4a37128 (diff) | |
| download | pkgsrc-1abbcf8fc70048057f30207a36b262c9fd86bf45.tar.gz | |
Update Botan to 1.10.12, the latest pre-C++11 version.
Includes various security fixes.
35 files changed, 356 insertions, 978 deletions
diff --git a/security/botan/Makefile b/security/botan/Makefile index 51e6fe50947..73874c54ed8 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.34 2015/12/05 21:25:56 adam Exp $ +# $NetBSD: Makefile,v 1.35 2016/05/19 22:10:24 joerg Exp $ -DISTNAME= Botan-1.8.14 +DISTNAME= Botan-1.10.12 PKGNAME= ${DISTNAME:tl} CATEGORIES= security -MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/ +MASTER_SITES= http://files.randombit.net/botan/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -25,7 +25,7 @@ MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} .include "../../mk/bsd.prefs.mk" -PLIST_VARS+= i386 x86 x86_64 ppc arm +PLIST_VARS+= x86 x86_64 .if ${MACHINE_ARCH} == "x86_64" CONFIGURE_ARGS+= --cpu=amd64 @@ -37,13 +37,10 @@ PLIST.i386= yes PLIST.x86= yes .elif ${MACHINE_ARCH} == "powerpc" CONFIGURE_ARGS+= --cpu=ppc -PLIST.ppc= yes .elif ${MACHINE_ARCH} == "powerpc64" CONFIGURE_ARGS+= --cpu=ppc64 -PLIST.ppc= yes .elif ${MACHINE_ARCH} == "arm" CONFIGURE_ARGS+= --cpu=arm -PLIST.arm= yes .endif .include "../../lang/python/application.mk" diff --git a/security/botan/PLIST b/security/botan/PLIST new file mode 100644 index 00000000000..b2a62f55712 --- /dev/null +++ b/security/botan/PLIST @@ -0,0 +1,262 @@ +@comment $NetBSD: PLIST,v 1.1 2016/05/19 22:10:24 joerg Exp $ +bin/botan-config-1.10 +include/botan-1.10/botan/adler32.h +include/botan-1.10/botan/aes.h +include/botan-1.10/botan/alg_id.h +include/botan-1.10/botan/algo_base.h +include/botan-1.10/botan/algo_factory.h +include/botan-1.10/botan/allocate.h +include/botan-1.10/botan/arc4.h +include/botan-1.10/botan/asn1_int.h +include/botan-1.10/botan/asn1_obj.h +include/botan-1.10/botan/asn1_oid.h +include/botan-1.10/botan/asn1_str.h +include/botan-1.10/botan/auto_rng.h +include/botan-1.10/botan/b64_filt.h +include/botan-1.10/botan/base64.h +include/botan-1.10/botan/basefilt.h +include/botan-1.10/botan/bcrypt.h +include/botan-1.10/botan/benchmark.h +include/botan-1.10/botan/ber_dec.h +include/botan-1.10/botan/bigint.h +include/botan-1.10/botan/blinding.h +include/botan-1.10/botan/block_cipher.h +include/botan-1.10/botan/blowfish.h +include/botan-1.10/botan/bmw_512.h +include/botan-1.10/botan/botan.h +include/botan-1.10/botan/bswap.h +include/botan-1.10/botan/buf_comp.h +include/botan-1.10/botan/buf_filt.h +include/botan-1.10/botan/build.h +include/botan-1.10/botan/camellia.h +include/botan-1.10/botan/cascade.h +include/botan-1.10/botan/cast128.h +include/botan-1.10/botan/cast256.h +include/botan-1.10/botan/cbc.h +include/botan-1.10/botan/cbc_mac.h +include/botan-1.10/botan/certstor.h +include/botan-1.10/botan/cfb.h +include/botan-1.10/botan/charset.h +include/botan-1.10/botan/cmac.h +include/botan-1.10/botan/comb4p.h +include/botan-1.10/botan/cpuid.h +include/botan-1.10/botan/crc24.h +include/botan-1.10/botan/crc32.h +include/botan-1.10/botan/crl_ent.h +include/botan-1.10/botan/cryptobox.h +include/botan-1.10/botan/ctr.h +include/botan-1.10/botan/cts.h +include/botan-1.10/botan/curve_gfp.h +include/botan-1.10/botan/data_snk.h +include/botan-1.10/botan/data_src.h +include/botan-1.10/botan/datastor.h +include/botan-1.10/botan/der_enc.h +include/botan-1.10/botan/des.h +include/botan-1.10/botan/desx.h +include/botan-1.10/botan/dh.h +include/botan-1.10/botan/divide.h +include/botan-1.10/botan/dl_algo.h +include/botan-1.10/botan/dl_group.h +include/botan-1.10/botan/dlies.h +include/botan-1.10/botan/dsa.h +include/botan-1.10/botan/dyn_engine.h +include/botan-1.10/botan/eax.h +include/botan-1.10/botan/ecb.h +include/botan-1.10/botan/ecc_key.h +include/botan-1.10/botan/ecdh.h +include/botan-1.10/botan/ecdsa.h +include/botan-1.10/botan/ec_group.h +include/botan-1.10/botan/elgamal.h +include/botan-1.10/botan/eme1.h +include/botan-1.10/botan/eme.h +include/botan-1.10/botan/eme_pkcs.h +include/botan-1.10/botan/emsa1_bsi.h +include/botan-1.10/botan/emsa1.h +include/botan-1.10/botan/emsa2.h +include/botan-1.10/botan/emsa3.h +include/botan-1.10/botan/emsa4.h +include/botan-1.10/botan/emsa.h +include/botan-1.10/botan/emsa_raw.h +include/botan-1.10/botan/engine.h +include/botan-1.10/botan/entropy_src.h +include/botan-1.10/botan/exceptn.h +include/botan-1.10/botan/fd_unix.h +include/botan-1.10/botan/filter.h +include/botan-1.10/botan/filters.h +include/botan-1.10/botan/fpe_fe1.h +include/botan-1.10/botan/get_byte.h +include/botan-1.10/botan/get_pbe.h +include/botan-1.10/botan/global_state.h +include/botan-1.10/botan/gost_28147.h +include/botan-1.10/botan/gost_3410.h +include/botan-1.10/botan/gost_3411.h +include/botan-1.10/botan/has160.h +include/botan-1.10/botan/hash.h +include/botan-1.10/botan/hash_id.h +include/botan-1.10/botan/hex_filt.h +include/botan-1.10/botan/hex.h +include/botan-1.10/botan/hmac.h +include/botan-1.10/botan/hmac_rng.h +include/botan-1.10/botan/idea.h +${PLIST.x86}include/botan-1.10/botan/idea_sse2.h +include/botan-1.10/botan/if_algo.h +include/botan-1.10/botan/init.h +include/botan-1.10/botan/kasumi.h +include/botan-1.10/botan/kdf1.h +include/botan-1.10/botan/kdf2.h +include/botan-1.10/botan/kdf.h +include/botan-1.10/botan/keccak.h +include/botan-1.10/botan/key_filt.h +include/botan-1.10/botan/keypair.h +include/botan-1.10/botan/key_spec.h +include/botan-1.10/botan/libstate.h +include/botan-1.10/botan/lion.h +include/botan-1.10/botan/loadstor.h +include/botan-1.10/botan/look_pk.h +include/botan-1.10/botan/lookup.h +include/botan-1.10/botan/lubyrack.h +include/botan-1.10/botan/mac.h +include/botan-1.10/botan/mars.h +include/botan-1.10/botan/md2.h +include/botan-1.10/botan/md4.h +include/botan-1.10/botan/md5.h +include/botan-1.10/botan/mdx_hash.h +include/botan-1.10/botan/mem_ops.h +include/botan-1.10/botan/mgf1.h +include/botan-1.10/botan/misty1.h +include/botan-1.10/botan/mode_pad.h +include/botan-1.10/botan/mp_types.h +include/botan-1.10/botan/noekeon.h +include/botan-1.10/botan/noekeon_simd.h +include/botan-1.10/botan/nr.h +include/botan-1.10/botan/numthry.h +include/botan-1.10/botan/ofb.h +include/botan-1.10/botan/oids.h +include/botan-1.10/botan/openpgp.h +include/botan-1.10/botan/package.h +include/botan-1.10/botan/par_hash.h +include/botan-1.10/botan/parsing.h +include/botan-1.10/botan/passhash9.h +include/botan-1.10/botan/pbe.h +include/botan-1.10/botan/pbes1.h +include/botan-1.10/botan/pbes2.h +include/botan-1.10/botan/pbkdf1.h +include/botan-1.10/botan/pbkdf2.h +include/botan-1.10/botan/pbkdf.h +include/botan-1.10/botan/pem.h +include/botan-1.10/botan/pgp_s2k.h +include/botan-1.10/botan/pipe.h +include/botan-1.10/botan/pkcs10.h +include/botan-1.10/botan/pkcs8.h +include/botan-1.10/botan/pk_filts.h +include/botan-1.10/botan/pk_keys.h +include/botan-1.10/botan/pk_ops.h +include/botan-1.10/botan/point_gfp.h +include/botan-1.10/botan/pow_mod.h +include/botan-1.10/botan/prf_ssl3.h +include/botan-1.10/botan/prf_tls.h +include/botan-1.10/botan/prf_x942.h +include/botan-1.10/botan/pubkey_enums.h +include/botan-1.10/botan/pubkey.h +include/botan-1.10/botan/randpool.h +include/botan-1.10/botan/rc2.h +include/botan-1.10/botan/rc5.h +include/botan-1.10/botan/rc6.h +include/botan-1.10/botan/reducer.h +include/botan-1.10/botan/rfc3394.h +include/botan-1.10/botan/rmd128.h +include/botan-1.10/botan/rmd160.h +include/botan-1.10/botan/rng.h +include/botan-1.10/botan/rotate.h +include/botan-1.10/botan/rsa.h +include/botan-1.10/botan/rw.h +include/botan-1.10/botan/safer_sk.h +include/botan-1.10/botan/salsa20.h +include/botan-1.10/botan/scan_name.h +include/botan-1.10/botan/secmem.h +include/botan-1.10/botan/secqueue.h +include/botan-1.10/botan/seed.h +include/botan-1.10/botan/selftest.h +include/botan-1.10/botan/serpent.h +include/botan-1.10/botan/serp_simd.h +include/botan-1.10/botan/sha160.h +${PLIST.x86}include/botan-1.10/botan/sha1_sse2.h +${PLIST.x86_64}include/botan-1.10/botan/sha1_x86_64.h +include/botan-1.10/botan/sha2_32.h +include/botan-1.10/botan/sha2_64.h +include/botan-1.10/botan/skein_512.h +include/botan-1.10/botan/skipjack.h +include/botan-1.10/botan/square.h +include/botan-1.10/botan/srp6.h +include/botan-1.10/botan/ssl3_mac.h +include/botan-1.10/botan/stream_cipher.h +include/botan-1.10/botan/sym_algo.h +include/botan-1.10/botan/symkey.h +include/botan-1.10/botan/tea.h +include/botan-1.10/botan/tiger.h +include/botan-1.10/botan/time.h +include/botan-1.10/botan/tls_client.h +include/botan-1.10/botan/tls_connection.h +include/botan-1.10/botan/tls_exceptn.h +include/botan-1.10/botan/tls_magic.h +include/botan-1.10/botan/tls_policy.h +include/botan-1.10/botan/tls_record.h +include/botan-1.10/botan/tls_server.h +include/botan-1.10/botan/tls_session_key.h +include/botan-1.10/botan/tls_suites.h +include/botan-1.10/botan/tss.h +include/botan-1.10/botan/turing.h +include/botan-1.10/botan/twofish.h +include/botan-1.10/botan/types.h +include/botan-1.10/botan/ui.h +include/botan-1.10/botan/version.h +include/botan-1.10/botan/whrlpool.h +include/botan-1.10/botan/wid_wake.h +include/botan-1.10/botan/x509_ca.h +include/botan-1.10/botan/x509cert.h +include/botan-1.10/botan/x509_crl.h +include/botan-1.10/botan/x509_dn.h +include/botan-1.10/botan/x509_ext.h +include/botan-1.10/botan/x509_key.h +include/botan-1.10/botan/x509_obj.h +include/botan-1.10/botan/x509self.h +include/botan-1.10/botan/x509stor.h +include/botan-1.10/botan/x919_mac.h +include/botan-1.10/botan/x931_rng.h +include/botan-1.10/botan/xtea.h +include/botan-1.10/botan/xtea_simd.h +include/botan-1.10/botan/xts.h +lib/libbotan-1.10.a +lib/libbotan-1.10.so +lib/libbotan-1.10.so.1 +lib/libbotan-1.10.so.1.12 +lib/pkgconfig/botan-1.10.pc +share/doc/${PKGNAME}/manual/algos.txt +share/doc/${PKGNAME}/manual/bigint.txt +share/doc/${PKGNAME}/manual/building.txt +share/doc/${PKGNAME}/manual/build_log.txt +share/doc/${PKGNAME}/manual/contents.txt +share/doc/${PKGNAME}/manual/credits.txt +share/doc/${PKGNAME}/manual/download.txt +share/doc/${PKGNAME}/manual/faq.txt +share/doc/${PKGNAME}/manual/filters.txt +share/doc/${PKGNAME}/manual/firststep.txt +share/doc/${PKGNAME}/manual/fpe.txt +share/doc/${PKGNAME}/manual/index.txt +share/doc/${PKGNAME}/manual/kdf.txt +share/doc/${PKGNAME}/manual/license.txt +share/doc/${PKGNAME}/manual/log.txt +share/doc/${PKGNAME}/manual/lowlevel.txt +share/doc/${PKGNAME}/manual/passhash.txt +share/doc/${PKGNAME}/manual/pbkdf.txt +share/doc/${PKGNAME}/manual/pgpkey.txt +share/doc/${PKGNAME}/manual/pubkey.txt +share/doc/${PKGNAME}/manual/python.txt +share/doc/${PKGNAME}/manual/reading.txt +share/doc/${PKGNAME}/manual/rng.txt +share/doc/${PKGNAME}/manual/secmem.txt +share/doc/${PKGNAME}/manual/ssl.txt +share/doc/${PKGNAME}/manual/support.txt +share/doc/${PKGNAME}/manual/users.txt +share/doc/${PKGNAME}/manual/x509.txt +share/doc/${PKGNAME}/readme.txt diff --git a/security/botan/PLIST.Darwin b/security/botan/PLIST.Darwin deleted file mode 100644 index 79e950574d4..00000000000 --- a/security/botan/PLIST.Darwin +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.Darwin,v 1.2 2011/12/08 03:01:03 jmmv Exp $ -${PLIST.x86_64}include/botan/eng_sse2.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_sse2.h diff --git a/security/botan/PLIST.DragonFly b/security/botan/PLIST.DragonFly deleted file mode 100644 index 88a7d17a1ba..00000000000 --- a/security/botan/PLIST.DragonFly +++ /dev/null @@ -1,8 +0,0 @@ -@comment $NetBSD: PLIST.DragonFly,v 1.4 2012/05/20 11:43:33 marino Exp $ -include/botan/asm_macr.h -${PLIST.x86_64}include/botan/eng_amd64.h -${PLIST.x86_64}include/botan/eng_sse2.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h -${PLIST.x86_64}include/botan/sha1_sse2.h -include/botan/tm_posix.h diff --git a/security/botan/PLIST.FreeBSD b/security/botan/PLIST.FreeBSD deleted file mode 100644 index 117c74f24eb..00000000000 --- a/security/botan/PLIST.FreeBSD +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.FreeBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $ -${PLIST.x86_64}include/botan/eng_amd64.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h diff --git a/security/botan/PLIST.Linux b/security/botan/PLIST.Linux deleted file mode 100644 index 27897e05228..00000000000 --- a/security/botan/PLIST.Linux +++ /dev/null @@ -1,8 +0,0 @@ -@comment $NetBSD: PLIST.Linux,v 1.3 2011/12/08 03:01:03 jmmv Exp $ -include/botan/asm_macr.h -${PLIST.x86_64}include/botan/eng_amd64.h -include/botan/eng_sse2.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h -include/botan/sha1_sse2.h -include/botan/tm_posix.h diff --git a/security/botan/PLIST.NetBSD b/security/botan/PLIST.NetBSD deleted file mode 100644 index 6aeeb9965c7..00000000000 --- a/security/botan/PLIST.NetBSD +++ /dev/null @@ -1,7 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.6 2011/12/08 03:01:03 jmmv Exp $ -${PLIST.x86}include/botan/asm_macr.h -${PLIST.x86_64}include/botan/eng_amd64.h -${PLIST.x86_64}include/botan/eng_sse2.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h -${PLIST.x86_64}include/botan/sha1_sse2.h diff --git a/security/botan/PLIST.OpenBSD b/security/botan/PLIST.OpenBSD deleted file mode 100644 index b5c86630a0e..00000000000 --- a/security/botan/PLIST.OpenBSD +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.OpenBSD,v 1.2 2011/12/08 03:01:03 jmmv Exp $ -${PLIST.x86_64}include/botan/eng_amd64.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h diff --git a/security/botan/PLIST.SunOS b/security/botan/PLIST.SunOS deleted file mode 100644 index eabf6bf75dc..00000000000 --- a/security/botan/PLIST.SunOS +++ /dev/null @@ -1,7 +0,0 @@ -@comment $NetBSD: PLIST.SunOS,v 1.2 2014/09/16 08:47:11 jperkin Exp $ -include/botan/asm_macr.h -${PLIST.x86_64}include/botan/eng_amd64.h -${PLIST.x86_64}include/botan/eng_sse2.h -include/botan/es_ftw.h -${PLIST.x86_64}include/botan/sha1_amd64.h -${PLIST.x86_64}include/botan/sha1_sse2.h diff --git a/security/botan/PLIST.common b/security/botan/PLIST.common deleted file mode 100644 index 4a381e2ea00..00000000000 --- a/security/botan/PLIST.common +++ /dev/null @@ -1,260 +0,0 @@ -@comment $NetBSD: PLIST.common,v 1.8 2013/01/23 16:45:27 riz Exp $ -bin/botan-config -include/botan/adler32.h -include/botan/aes.h -include/botan/alg_id.h -include/botan/algo_cache.h -include/botan/algo_factory.h -include/botan/allocate.h -include/botan/arc4.h -include/botan/asn1_int.h -include/botan/asn1_obj.h -include/botan/asn1_oid.h -include/botan/auto_rng.h -include/botan/base64.h -include/botan/basefilt.h -include/botan/benchmark.h -include/botan/ber_dec.h -include/botan/bigint.h -include/botan/bit_ops.h -include/botan/blinding.h -include/botan/block_cipher.h -include/botan/blowfish.h -include/botan/botan.h -include/botan/bswap.h -include/botan/buf_comp.h -include/botan/buf_filt.h -include/botan/build.h -include/botan/cast128.h -include/botan/cast256.h -include/botan/cbc.h -include/botan/cbc_mac.h -include/botan/certstor.h -include/botan/cfb.h -include/botan/charset.h -include/botan/cmac.h -include/botan/cms_dec.h -include/botan/cms_enc.h -include/botan/crc24.h -include/botan/crc32.h -include/botan/crl_ent.h -include/botan/cryptobox.h -include/botan/ctr.h -include/botan/cts.h -include/botan/curve_gfp.h -include/botan/cvc_ado.h -include/botan/cvc_ca.h -include/botan/cvc_cert.h -include/botan/cvc_gen_cert.h -include/botan/cvc_key.h -include/botan/cvc_req.h -include/botan/cvc_self.h -include/botan/data_snk.h -include/botan/data_src.h -include/botan/datastor.h -include/botan/def_eng.h -include/botan/def_powm.h -include/botan/defalloc.h -include/botan/der_enc.h -include/botan/des.h -include/botan/desx.h -include/botan/dh.h -include/botan/dh_core.h -include/botan/dh_op.h -include/botan/divide.h -include/botan/dl_algo.h -include/botan/dl_group.h -include/botan/dlies.h -include/botan/dsa.h -include/botan/dsa_core.h -include/botan/dsa_op.h -include/botan/eac_asn_obj.h -include/botan/eac_obj.h -include/botan/eax.h -include/botan/ec_dompar.h -include/botan/ecb.h -include/botan/ecc_key.h -include/botan/ecdsa.h -include/botan/ecdsa_core.h -include/botan/ecdsa_op.h -include/botan/ecdsa_sig.h -include/botan/eckaeg.h -include/botan/eckaeg_core.h -include/botan/eckaeg_op.h -include/botan/elg_core.h -include/botan/elg_op.h -include/botan/elgamal.h -include/botan/eme.h -include/botan/eme1.h -include/botan/eme_pkcs.h -include/botan/emsa.h -include/botan/emsa1.h -include/botan/emsa1_bsi.h -include/botan/emsa2.h -include/botan/emsa3.h -include/botan/emsa4.h -include/botan/emsa_raw.h -include/botan/engine.h -include/botan/entropy_src.h -include/botan/es_dev.h -include/botan/es_egd.h -include/botan/es_unix.h -include/botan/exceptn.h -include/botan/fd_unix.h -include/botan/filter.h -include/botan/filters.h -include/botan/fork256.h -include/botan/freestore.h -include/botan/get_pbe.h -include/botan/gfp_element.h -include/botan/gfp_modulus.h -include/botan/gost_28147.h -include/botan/gost_3411.h -include/botan/has160.h -include/botan/hash.h -include/botan/hash_id.h -include/botan/hex.h -include/botan/hmac.h -include/botan/hmac_rng.h -include/botan/idea.h -include/botan/if_algo.h -include/botan/if_core.h -include/botan/if_op.h -include/botan/init.h -include/botan/kasumi.h -include/botan/kdf.h -include/botan/kdf1.h -include/botan/kdf2.h -include/botan/keypair.h -include/botan/libstate.h -include/botan/lion.h -include/botan/loadstor.h -include/botan/look_pk.h -include/botan/lookup.h -include/botan/lubyrack.h -include/botan/mac.h -include/botan/mars.h -include/botan/md2.h -include/botan/md4.h -include/botan/md5.h -include/botan/mdx_hash.h -include/botan/mem_ops.h -include/botan/mem_pool.h -include/botan/mgf1.h -include/botan/misty1.h -include/botan/mmap_mem.h -include/botan/mode_pad.h -include/botan/modebase.h -include/botan/mp_asm.h -include/botan/mp_asmi.h -include/botan/mp_core.h -include/botan/mp_types.h -include/botan/mutex.h -include/botan/mux_noop.h -include/botan/mux_pthr.h -include/botan/noekeon.h -include/botan/nr.h -include/botan/nr_core.h -include/botan/nr_op.h -include/botan/numthry.h -include/botan/ofb.h -include/botan/oids.h -include/botan/openpgp.h -include/botan/out_buf.h -include/botan/par_hash.h -include/botan/parsing.h -include/botan/pbe.h -include/botan/pbes1.h -include/botan/pbes2.h -include/botan/pbkdf1.h -include/botan/pbkdf2.h -include/botan/pem.h -include/botan/pgp_s2k.h -include/botan/pipe.h -include/botan/pk_algs.h -include/botan/pk_engine.h -include/botan/pk_filts.h -include/botan/pk_keys.h -include/botan/pkcs10.h -include/botan/pkcs8.h -include/botan/point_gfp.h -include/botan/pow_mod.h -include/botan/prf_ssl3.h -include/botan/prf_tls.h -include/botan/prf_x942.h -include/botan/pubkey.h -include/botan/pubkey_enums.h -include/botan/randpool.h -include/botan/rc2.h -include/botan/rc5.h -include/botan/rc6.h -include/botan/reducer.h -include/botan/rmd128.h -include/botan/rmd160.h -include/botan/rng.h -include/botan/rotate.h -include/botan/rsa.h -include/botan/rw.h -include/botan/s2k.h -include/botan/safer_sk.h -include/botan/salsa20.h -include/botan/scan_name.h -include/botan/secmem.h -include/botan/secqueue.h -include/botan/seed.h -include/botan/selftest.h -include/botan/serpent.h -include/botan/sha160.h -include/botan/sha2_32.h -include/botan/sha2_64.h -include/botan/signed_obj.h -include/botan/skein_512.h -include/botan/skipjack.h -include/botan/square.h -include/botan/ssl3_mac.h -include/botan/stl_util.h -include/botan/stream_cipher.h -include/botan/sym_algo.h -include/botan/symkey.h -include/botan/tea.h -include/botan/tiger.h -include/botan/timer.h -${PLIST.x86}include/botan/tm_hard.h -${PLIST.ppc}include/botan/tm_hard.h -include/botan/tm_unix.h -include/botan/turing.h -include/botan/twofish.h -include/botan/types.h -include/botan/ui.h -include/botan/unix_cmd.h -include/botan/util.h -include/botan/version.h -include/botan/whrlpool.h -include/botan/wid_wake.h -include/botan/x509_ca.h -include/botan/x509_crl.h -include/botan/x509_ext.h -include/botan/x509_key.h -include/botan/x509_obj.h -include/botan/x509cert.h -include/botan/x509find.h -include/botan/x509self.h -include/botan/x509stor.h -include/botan/x919_mac.h -include/botan/x931_rng.h -include/botan/xor_buf.h -include/botan/xtea.h -include/botan/xts.h -lib/libbotan-1.8.13.so -lib/libbotan.a -lib/libbotan.so -lib/pkgconfig/botan-1.8.pc -share/doc/Botan-${PKGVERSION}/api.tex -share/doc/Botan-${PKGVERSION}/credits.txt -share/doc/Botan-${PKGVERSION}/fips140.tex -share/doc/Botan-${PKGVERSION}/license.txt -share/doc/Botan-${PKGVERSION}/log.txt -share/doc/Botan-${PKGVERSION}/pgpkeys.asc -share/doc/Botan-${PKGVERSION}/readme.txt -share/doc/Botan-${PKGVERSION}/thanks.txt -share/doc/Botan-${PKGVERSION}/tutorial.tex diff --git a/security/botan/buildlink3.mk b/security/botan/buildlink3.mk index 171bce4daaf..2f50967d975 100644 --- a/security/botan/buildlink3.mk +++ b/security/botan/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2014/02/25 11:51:32 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2016/05/19 22:10:24 joerg Exp $ BUILDLINK_TREE+= botan .if !defined(BOTAN_BUILDLINK3_MK) BOTAN_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.botan+= botan>=1.8.13<1.9 +BUILDLINK_API_DEPENDS.botan+= botan>=1.10.12<1.11 BUILDLINK_PKGSRCDIR.botan?= ../../security/botan .endif # BOTAN_BUILDLINK3_MK diff --git a/security/botan/distinfo b/security/botan/distinfo index 2054020454c..a01f5b1d4b3 100644 --- a/security/botan/distinfo +++ b/security/botan/distinfo @@ -1,27 +1,10 @@ -$NetBSD: distinfo,v 1.15 2015/11/04 01:17:42 agc Exp $ +$NetBSD: distinfo,v 1.16 2016/05/19 22:10:24 joerg Exp $ -SHA1 (Botan-1.8.14.tgz) = a845a5e6d0386e0bdbd7a8cfc646d5a4cdec8649 -RMD160 (Botan-1.8.14.tgz) = 6125937c13860b67a18dbbee71c477b4d06ad5b2 -SHA512 (Botan-1.8.14.tgz) = b0b72906e24b6e518ace8446cf5f3f898fb2619bdf8fb9d39b47f17b3c91b26732ae4f504c3573e5a7bf2718f645599cf8f3ba4d3f4dfd329e1eb7d70d5a658d -Size (Botan-1.8.14.tgz) = 2632909 bytes -SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0 -SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970 -SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70 -SHA1 (patch-src_build-data_arch_arm.txt) = 3355b258ac731968400008558795d6caaaf8a728 -SHA1 (patch-src_cert_cvc_cvc__ado.cpp) = 94c632fcdf6d8df903135c7abe9bb26ab194f803 -SHA1 (patch-src_cert_cvc_cvc__ado.h) = b10593175baf2787b5522a05369773877c135a8a -SHA1 (patch-src_cert_cvc_cvc__ca.cpp) = 2bd37cbd9432d605b1306d43612e35a37565d490 -SHA1 (patch-src_cert_cvc_cvc__cert.cpp) = 4cac9f415e1e60b04b97ba8fbb29d891f08cbab9 -SHA1 (patch-src_cert_cvc_cvc__cert.h) = de72a3c9a4f1d6eb107ff07f209516e9ffca8e1c -SHA1 (patch-src_cert_cvc_cvc__req.cpp) = 576d874e570a271ffb3ac81e57890401d900583a -SHA1 (patch-src_cert_cvc_cvc__req.h) = 419916c1b2089e27d5e9f2a2f714793e6fcc1809 -SHA1 (patch-src_cert_cvc_cvc__self.cpp) = 251a097a699633e3537cc87c28aeed41e885344f -SHA1 (patch-src_cert_cvc_freestore.h) = 620892af8b6caf688c1c1789acd2a2f712f5d441 -SHA1 (patch-src_entropy_unix_procs_info.txt) = c2685db5fbd16a67b008b738730518858265ebc0 -SHA1 (patch-src_hash_sha1_amd64_info.txt) = d83a7b88b5860a596607e529b29090afa16dcda7 -SHA1 (patch-src_math_gfpmath_curve__gfp.cpp) = 4a24c751bc5a8ae049b633b0ac2fcb48a6f606ff -SHA1 (patch-src_math_gfpmath_curve__gfp.h) = f0338064ba2dda12c36af9ad18d3a036f99fea50 -SHA1 (patch-src_math_gfpmath_gfp__element.cpp) = 6b787da2e8d9d3e6d00c3a4d3de907d0466dbfbc -SHA1 (patch-src_math_gfpmath_gfp__element.h) = 59bf2a7d1ccde428e5c42977f1185e4b15c2d02f -SHA1 (patch-src_math_gfpmath_point__gfp.cpp) = e9727610d64b103991f2b5ce82de26627e8e02f6 -SHA1 (patch-src_math_gfpmath_point__gfp.h) = 3b2b93e11cb0b49bfb983147d36259060daff782 +SHA1 (Botan-1.10.12.tgz) = 45ad77e59dadc8498dc62dbcaf7c8cec46e2b073 +RMD160 (Botan-1.10.12.tgz) = ebe525ff8bc35d2363bb934b045c83a29ea4f358 +SHA512 (Botan-1.10.12.tgz) = 074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5 +Size (Botan-1.10.12.tgz) = 2707397 bytes +SHA1 (patch-src_build-data_arch_arm.txt) = 23e40eb4bf43ca8c96f809b7f7a33de4a5149f47 +SHA1 (patch-src_build-data_makefile_unix.in) = 1ab76671c1acfe955d3e01d27e91687c0c382239 +SHA1 (patch-src_build-data_makefile_unix__shr.in) = ecd64f1ee80cb791d58052a75c6f33c5d4360a96 +SHA1 (patch-src_entropy_unix_procs_info.txt) = 0d94e14b48f049112c8913ac244c358318974c6f diff --git a/security/botan/patches/patch-ab b/security/botan/patches/patch-ab deleted file mode 100644 index f304744f326..00000000000 --- a/security/botan/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/09/23 16:03:25 jmmv Exp $ - ---- src/build-data/makefile/unix_shr.in.orig 2009-09-10 00:29:34.000000000 +0000 -+++ src/build-data/makefile/unix_shr.in -@@ -20,12 +20,12 @@ SO_VERSION = %{so_version} - ################################################## - # Installation Settings # - ################################################## --DESTDIR = %{prefix} -+PREFIX = $(DESTDIR)%{prefix} - --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan --DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/lib -+HEADERDIR = $(PREFIX)/include/botan -+DOCDIR = $(PREFIX)/share/doc/Botan-$(VERSION) - PKGCONF_DIR = $(LIBDIR)/pkgconfig - - CONFIG_SCRIPT = %{botan_config} -@@ -118,7 +118,7 @@ distclean: clean - $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG) - - install: $(LIBRARIES) -- $(ECHO) "Installing Botan into $(DESTDIR)... " -+ $(ECHO) "Installing Botan into $(PREFIX)... " - $(MKDIR_INSTALL) $(DOCDIR) - $(MKDIR_INSTALL) $(HEADERDIR) - $(MKDIR_INSTALL) $(LIBDIR) diff --git a/security/botan/patches/patch-ac b/security/botan/patches/patch-ac deleted file mode 100644 index 57c6802b105..00000000000 --- a/security/botan/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2009/09/23 16:03:25 jmmv Exp $ - ---- src/build-data/makefile/unix.in.orig 2009-09-10 00:29:34.000000000 +0000 -+++ src/build-data/makefile/unix.in -@@ -17,12 +17,12 @@ VERSION = %{version} - ################################################## - # Installation Settings # - ################################################## --DESTDIR = %{prefix} -+PREFIX = $(DESTDIR)%{prefix} - --BINDIR = $(DESTDIR)/bin --LIBDIR = $(DESTDIR)/%{libdir} --HEADERDIR = $(DESTDIR)/%{includedir}/botan --DOCDIR = $(DESTDIR)/%{docdir}/Botan-$(VERSION) -+BINDIR = $(PREFIX)/bin -+LIBDIR = $(PREFIX)/lib -+HEADERDIR = $(PREFIX)/include/botan -+DOCDIR = $(PREFIX)/share/doc/Botan-$(VERSION) - PKGCONF_DIR = $(LIBDIR)/pkgconfig - - CONFIG_SCRIPT = %{botan_config} -@@ -104,7 +104,7 @@ distclean: clean - $(RM) Makefile $(CONFIG_SCRIPT) $(PKGCONFIG) - - install: $(LIBRARIES) -- $(ECHO) "Installing Botan into $(DESTDIR)... " -+ $(ECHO) "Installing Botan into $(PREFIX)... " - $(MKDIR_INSTALL) $(DOCDIR) - $(MKDIR_INSTALL) $(HEADERDIR) - $(MKDIR_INSTALL) $(LIBDIR) diff --git a/security/botan/patches/patch-ak b/security/botan/patches/patch-ak deleted file mode 100644 index a3e6ddfe67f..00000000000 --- a/security/botan/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2009/09/23 16:03:26 jmmv Exp $ - ---- src/timer/cpu_counter/info.txt.orig 2009-09-10 00:29:35.000000000 +0000 -+++ src/timer/cpu_counter/info.txt -@@ -15,6 +15,7 @@ gcc - - <arch> - # RDTSC: Pentium and up -+i386 - i586 - i686 - athlon diff --git a/security/botan/patches/patch-src_build-data_arch_arm.txt b/security/botan/patches/patch-src_build-data_arch_arm.txt index 2d4dd9f90be..12e72898123 100644 --- a/security/botan/patches/patch-src_build-data_arch_arm.txt +++ b/security/botan/patches/patch-src_build-data_arch_arm.txt @@ -1,15 +1,12 @@ -$NetBSD: patch-src_build-data_arch_arm.txt,v 1.1 2015/02/19 14:25:12 joerg Exp $ +$NetBSD: patch-src_build-data_arch_arm.txt,v 1.2 2016/05/19 22:10:24 joerg Exp $ ---- src/build-data/arch/arm.txt.orig 2012-07-18 19:59:04.000000000 +0000 +--- src/build-data/arch/arm.txt.orig 2016-02-03 07:57:06.000000000 +0000 +++ src/build-data/arch/arm.txt -@@ -2,6 +2,10 @@ realname "ARM" - - default_submodel arm2 - -+<aliases> +@@ -5,6 +5,7 @@ family arm + <aliases> + armel # For Debian + armhf # For Debian +evbarm # NetBSD -+</aliases> -+ + </aliases> + <submodels> - arm2 - arm3 diff --git a/security/botan/patches/patch-src_build-data_makefile_unix.in b/security/botan/patches/patch-src_build-data_makefile_unix.in new file mode 100644 index 00000000000..aa6356f7380 --- /dev/null +++ b/security/botan/patches/patch-src_build-data_makefile_unix.in @@ -0,0 +1,31 @@ +$NetBSD: patch-src_build-data_makefile_unix.in,v 1.1 2016/05/19 22:10:24 joerg Exp $ + +--- src/build-data/makefile/unix.in.orig 2016-02-03 07:57:06.000000000 +0000 ++++ src/build-data/makefile/unix.in +@@ -12,12 +12,12 @@ VERSION = %{version} + SERIES = %{version_major}.%{version_minor} + + # Installation Settings +-DESTDIR = %{prefix} ++PREFIX = ${DESTDIR}%{prefix} + +-BINDIR = $(DESTDIR)/bin +-LIBDIR = $(DESTDIR)/%{libdir} +-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan +-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) ++BINDIR = $(PREFIX)/bin ++LIBDIR = $(PREFIX)/%{libdir} ++HEADERDIR = $(PREFIX)/%{includedir}/botan-$(SERIES)/botan ++DOCDIR = $(PREFIX)/%{docdir}/botan-$(VERSION) + PKGCONF_DIR = $(LIBDIR)/pkgconfig + + CONFIG_SCRIPT = %{botan_config} +@@ -89,7 +89,7 @@ distclean: clean + $(RM) botan_all.cpp botan_all.h + + install: $(LIBRARIES) docs +- $(ECHO) "Installing Botan into $(DESTDIR)... " ++ $(ECHO) "Installing Botan into $(PREFIX)... " + $(MKDIR_INSTALL) $(DOCDIR) + $(COPY_R) %{doc_output_dir}/* $(DOCDIR) + diff --git a/security/botan/patches/patch-src_build-data_makefile_unix__shr.in b/security/botan/patches/patch-src_build-data_makefile_unix__shr.in new file mode 100644 index 00000000000..525e849c572 --- /dev/null +++ b/security/botan/patches/patch-src_build-data_makefile_unix__shr.in @@ -0,0 +1,31 @@ +$NetBSD: patch-src_build-data_makefile_unix__shr.in,v 1.1 2016/05/19 22:10:24 joerg Exp $ + +--- src/build-data/makefile/unix_shr.in.orig 2016-02-03 07:57:06.000000000 +0000 ++++ src/build-data/makefile/unix_shr.in +@@ -14,12 +14,12 @@ VERSION = %{version} + SERIES = %{version_major}.%{version_minor} + + # Installation Settings +-DESTDIR = %{prefix} ++PREFIX = ${DESTDIR}%{prefix} + +-BINDIR = $(DESTDIR)/bin +-LIBDIR = $(DESTDIR)/%{libdir} +-HEADERDIR = $(DESTDIR)/%{includedir}/botan-$(SERIES)/botan +-DOCDIR = $(DESTDIR)/%{docdir}/botan-$(VERSION) ++BINDIR = $(PREFIX)/bin ++LIBDIR = $(PREFIX)/%{libdir} ++HEADERDIR = $(PREFIX)/%{includedir}/botan-$(SERIES)/botan ++DOCDIR = $(PREFIX)/%{docdir}/botan-$(VERSION) + PKGCONF_DIR = $(LIBDIR)/pkgconfig + + CONFIG_SCRIPT = %{botan_config} +@@ -103,7 +103,7 @@ distclean: clean + $(RM) botan_all.cpp botan_all.h + + install: $(LIBRARIES) docs +- $(ECHO) "Installing Botan into $(DESTDIR)... " ++ $(ECHO) "Installing Botan into $(PREFIX)... " + $(MKDIR_INSTALL) $(DOCDIR) + $(COPY_R) %{doc_output_dir}/* $(DOCDIR) + diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp deleted file mode 100644 index a2749aab8bd..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__ado.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_ado.cpp.orig 2013-04-30 23:02:37.000000000 +0000 -+++ src/cert/cvc/cvc_ado.cpp -@@ -12,7 +12,7 @@ - - namespace Botan { - --EAC1_1_ADO::EAC1_1_ADO(std::tr1::shared_ptr<DataSource> in) -+EAC1_1_ADO::EAC1_1_ADO(shared_ptr<DataSource> in) - { - init(in); - do_decode(); -@@ -20,7 +20,7 @@ EAC1_1_ADO::EAC1_1_ADO(std::tr1::shared_ - - EAC1_1_ADO::EAC1_1_ADO(const std::string& in) - { -- std::tr1::shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); -+ shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); - init(stream); - do_decode(); - } -@@ -41,7 +41,7 @@ void EAC1_1_ADO::force_decode() - .end_cons() - .get_contents(); - -- std::tr1::shared_ptr<DataSource> req_source(new DataSource_Memory(req_bits)); -+ shared_ptr<DataSource> req_source(new DataSource_Memory(req_bits)); - m_req = EAC1_1_Req(req_source); - sig_algo = m_req.sig_algo; - } diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ado.h b/security/botan/patches/patch-src_cert_cvc_cvc__ado.h deleted file mode 100644 index 0ec02785eb2..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__ado.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__ado.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_ado.h.orig 2013-04-30 23:02:27.000000000 +0000 -+++ src/cert/cvc/cvc_ado.h -@@ -39,7 +39,7 @@ class BOTAN_DLL EAC1_1_ADO : public EAC1 - * Construct a CVC ADO request from a data source - * @param source the data source - */ -- EAC1_1_ADO(std::tr1::shared_ptr<DataSource> source); -+ EAC1_1_ADO(shared_ptr<DataSource> source); - - /** - * Create a signed CVC ADO request from to be signed (TBS) data diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp deleted file mode 100644 index 162fa3050bb..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__ca.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_ca.cpp.orig 2013-04-30 23:02:49.000000000 +0000 -+++ src/cert/cvc/cvc_ca.cpp -@@ -38,7 +38,7 @@ EAC1_1_CVC EAC1_1_CVC_CA::make_cert(std: - EAC1_1_CVC::build_cert_body(tbs), - rng); - -- std::tr1::shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); -+ shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); - - return EAC1_1_CVC(source); - } diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp deleted file mode 100644 index 135c5802eeb..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__cert.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_cert.cpp.orig 2013-04-30 23:03:08.000000000 +0000 -+++ src/cert/cvc/cvc_cert.cpp -@@ -78,7 +78,7 @@ void EAC1_1_CVC::force_decode() - /* - * CVC Certificate Constructor - */ --EAC1_1_CVC::EAC1_1_CVC(std::tr1::shared_ptr<DataSource>& in) -+EAC1_1_CVC::EAC1_1_CVC(shared_ptr<DataSource>& in) - { - init(in); - self_signed = false; -@@ -87,7 +87,7 @@ EAC1_1_CVC::EAC1_1_CVC(std::tr1::shared_ - - EAC1_1_CVC::EAC1_1_CVC(const std::string& in) - { -- std::tr1::shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); -+ shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); - init(stream); - self_signed = false; - do_decode(); diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__cert.h b/security/botan/patches/patch-src_cert_cvc_cvc__cert.h deleted file mode 100644 index b0208fdcd1e..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__cert.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__cert.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_cert.h.orig 2013-04-30 23:03:11.000000000 +0000 -+++ src/cert/cvc/cvc_cert.h -@@ -59,7 +59,7 @@ class BOTAN_DLL EAC1_1_CVC : public EAC1 - * Construct a CVC from a data source - * @param source the data source - */ -- EAC1_1_CVC(std::tr1::shared_ptr<DataSource>& source); -+ EAC1_1_CVC(shared_ptr<DataSource>& source); - - /** - * Construct a CVC from a file diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp deleted file mode 100644 index 3c17e6572f8..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__req.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_req.cpp.orig 2013-04-30 23:48:36.000000000 +0000 -+++ src/cert/cvc/cvc_req.cpp -@@ -50,7 +50,7 @@ void EAC1_1_Req::force_decode() - #endif - } - --EAC1_1_Req::EAC1_1_Req(std::tr1::shared_ptr<DataSource> in) -+EAC1_1_Req::EAC1_1_Req(shared_ptr<DataSource> in) - { - init(in); - self_signed = true; -@@ -59,7 +59,7 @@ EAC1_1_Req::EAC1_1_Req(std::tr1::shared_ - - EAC1_1_Req::EAC1_1_Req(const std::string& in) - { -- std::tr1::shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); -+ shared_ptr<DataSource> stream(new DataSource_Stream(in, true)); - init(stream); - self_signed = true; - do_decode(); diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__req.h b/security/botan/patches/patch-src_cert_cvc_cvc__req.h deleted file mode 100644 index 825b51c1087..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__req.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__req.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_req.h.orig 2013-04-30 23:01:50.000000000 +0000 -+++ src/cert/cvc/cvc_req.h -@@ -36,7 +36,7 @@ class BOTAN_DLL EAC1_1_Req : public EAC1 - * Construct a CVC request from a data source. - * @param source the data source - */ -- EAC1_1_Req(std::tr1::shared_ptr<DataSource> source); -+ EAC1_1_Req(shared_ptr<DataSource> source); - - /** - * Construct a CVC request from a DER encoded CVC reqeust file. diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp deleted file mode 100644 index ca7548564f0..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_cert_cvc_cvc__self.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/cvc_self.cpp.orig 2013-04-30 23:02:54.000000000 +0000 -+++ src/cert/cvc/cvc_self.cpp -@@ -131,7 +131,7 @@ EAC1_1_Req create_cvc_req(Private_Key co - .get_contents(); - - MemoryVector<byte> signed_cert = EAC1_1_gen_CVC<EAC1_1_Req>::make_signed(signer, EAC1_1_gen_CVC<EAC1_1_Req>::build_cert_body(tbs), rng); -- std::tr1::shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); -+ shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); - return EAC1_1_Req(source); - } - -@@ -151,7 +151,7 @@ EAC1_1_ADO create_ado_req(Private_Key co - SecureVector<byte> tbs_bits = req.BER_encode(); - tbs_bits.append(DER_Encoder().encode(car).get_contents()); - MemoryVector<byte> signed_cert = EAC1_1_ADO::make_signed(signer, tbs_bits, rng); -- std::tr1::shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); -+ shared_ptr<DataSource> source(new DataSource_Memory(signed_cert)); - return EAC1_1_ADO(source); - } - diff --git a/security/botan/patches/patch-src_cert_cvc_freestore.h b/security/botan/patches/patch-src_cert_cvc_freestore.h deleted file mode 100644 index 7127456390f..00000000000 --- a/security/botan/patches/patch-src_cert_cvc_freestore.h +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-src_cert_cvc_freestore.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/cert/cvc/freestore.h.orig 2013-04-30 22:56:51.000000000 +0000 -+++ src/cert/cvc/freestore.h -@@ -8,7 +8,9 @@ - - #include <botan/build.h> - --#if defined(BOTAN_USE_STD_TR1) -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+ #include <memory> -+#elif defined(BOTAN_USE_STD_TR1) - #include <tr1/memory> - #elif defined(BOTAN_USE_BOOST_TR1) - #include <boost/tr1/memory.hpp> -@@ -17,6 +19,14 @@ - #endif - - namespace Botan { -+#ifndef BOTAN_SHARED_PTR -+#define BOTAN_SHARED_PTR -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+ using std::shared_ptr; -+#else -+ using std::tr1::shared_ptr; -+#endif -+#endif - - /** - * This class is intended as an function call parameter type and -@@ -30,7 +40,7 @@ template<typename T> - class BOTAN_DLL SharedPtrConverter - { - public: -- typedef std::tr1::shared_ptr<T> SharedPtr; -+ typedef shared_ptr<T> SharedPtr; - - /** - * Construct a null pointer equivalent object. diff --git a/security/botan/patches/patch-src_entropy_unix_procs_info.txt b/security/botan/patches/patch-src_entropy_unix_procs_info.txt index d1491ae889e..f6f05011f69 100644 --- a/security/botan/patches/patch-src_entropy_unix_procs_info.txt +++ b/security/botan/patches/patch-src_entropy_unix_procs_info.txt @@ -1,12 +1,12 @@ -$NetBSD: patch-src_entropy_unix_procs_info.txt,v 1.1 2011/12/17 16:09:46 marino Exp $ +$NetBSD: patch-src_entropy_unix_procs_info.txt,v 1.2 2016/05/19 22:10:24 joerg Exp $ ---- src/entropy/unix_procs/info.txt.orig 2011-07-08 19:47:40.000000000 +0000 +--- src/entropy/unix_procs/info.txt.orig 2016-02-03 07:57:06.000000000 +0000 +++ src/entropy/unix_procs/info.txt -@@ -18,6 +18,7 @@ aix - beos - cygwin - darwin +@@ -24,6 +24,7 @@ netbsd + qnx + solaris + tru64 +dragonfly - #freebsd - hpux - irix + </os> + + <requires> diff --git a/security/botan/patches/patch-src_hash_sha1_amd64_info.txt b/security/botan/patches/patch-src_hash_sha1_amd64_info.txt deleted file mode 100644 index 239e56c000b..00000000000 --- a/security/botan/patches/patch-src_hash_sha1_amd64_info.txt +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_hash_sha1_amd64_info.txt,v 1.1 2011/12/17 16:09:46 marino Exp $ - ---- src/hash/sha1_amd64/info.txt.orig 2011-07-08 19:47:40.000000000 +0000 -+++ src/hash/sha1_amd64/info.txt -@@ -22,6 +22,7 @@ icc - # ELF systems - <os> - linux -+dragonfly - netbsd - openbsd - solaris diff --git a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp deleted file mode 100644 index 219cda385d2..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_curve__gfp.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/curve_gfp.cpp.orig 2013-04-30 23:08:27.000000000 +0000 -+++ src/math/gfpmath/curve_gfp.cpp -@@ -14,7 +14,7 @@ - - namespace Botan { - --void CurveGFp::set_shrd_mod(const std::tr1::shared_ptr<GFpModulus> mod) -+void CurveGFp::set_shrd_mod(const shared_ptr<GFpModulus> mod) - { - mp_mod = mod; - mA.turn_off_sp_red_mul();// m.m. is not needed, must be trf. back -@@ -34,7 +34,7 @@ CurveGFp::CurveGFp(const GFpElement& a, - { - throw Invalid_Argument("could not construct curve: moduli of arguments differ"); - } -- std::tr1::shared_ptr<GFpModulus> p_mod = std::tr1::shared_ptr<GFpModulus>(new GFpModulus(p)); -+ shared_ptr<GFpModulus> p_mod = shared_ptr<GFpModulus>(new GFpModulus(p)); - // the above is the creation of the GFpModuls object which will be shared point-wide - // (in the context of a point of course) - set_shrd_mod(p_mod); -@@ -44,21 +44,21 @@ CurveGFp::CurveGFp(const CurveGFp& other - : mA(other.get_a()), - mB(other.get_b()) - { -- mp_mod = std::tr1::shared_ptr<GFpModulus>(new GFpModulus(*other.mp_mod)); -+ mp_mod = shared_ptr<GFpModulus>(new GFpModulus(*other.mp_mod)); - assert(mp_mod->p_equal_to(mA.get_p())); - assert(mp_mod->p_equal_to(mB.get_p())); - set_shrd_mod(mp_mod); - if(other.mp_mres_a.get()) - { -- mp_mres_a = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_a)); -+ mp_mres_a = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_a)); - } - if(other.mp_mres_b.get()) - { -- mp_mres_b = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_b)); -+ mp_mres_b = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_b)); - } - if(other.mp_mres_one.get()) - { -- mp_mres_one = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_one)); -+ mp_mres_one = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_one)); - } - - } -@@ -72,21 +72,21 @@ const CurveGFp& CurveGFp::operator=(cons - mA.swap(a_tmp); - mB.swap(b_tmp); - -- std::tr1::shared_ptr<GFpModulus> p_mod = std::tr1::shared_ptr<GFpModulus>(new GFpModulus(*other.mp_mod)); -+ shared_ptr<GFpModulus> p_mod = shared_ptr<GFpModulus>(new GFpModulus(*other.mp_mod)); - set_shrd_mod(p_mod); - - // exception safety note: no problem if we have a throw from here on... - if(other.mp_mres_a.get()) - { -- mp_mres_a = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_a)); -+ mp_mres_a = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_a)); - } - if(other.mp_mres_b.get()) - { -- mp_mres_b = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_b)); -+ mp_mres_b = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_b)); - } - if(other.mp_mres_one.get()) - { -- mp_mres_one = std::tr1::shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_one)); -+ mp_mres_one = shared_ptr<GFpElement>(new GFpElement(*other.mp_mres_one)); - } - return *this; - } -@@ -123,7 +123,7 @@ GFpElement const CurveGFp::get_mres_a() - { - if(mp_mres_a.get() == 0) - { -- mp_mres_a = std::tr1::shared_ptr<GFpElement>(new GFpElement(mA)); -+ mp_mres_a = shared_ptr<GFpElement>(new GFpElement(mA)); - mp_mres_a->turn_on_sp_red_mul(); - mp_mres_a->get_mres(); - } -@@ -134,18 +134,18 @@ GFpElement const CurveGFp::get_mres_b() - { - if(mp_mres_b.get() == 0) - { -- mp_mres_b = std::tr1::shared_ptr<GFpElement>(new GFpElement(mB)); -+ mp_mres_b = shared_ptr<GFpElement>(new GFpElement(mB)); - mp_mres_b->turn_on_sp_red_mul(); - mp_mres_b->get_mres(); - } - return GFpElement(*mp_mres_b); - } - --std::tr1::shared_ptr<GFpElement const> const CurveGFp::get_mres_one() const -+shared_ptr<GFpElement const> const CurveGFp::get_mres_one() const - { - if(mp_mres_one.get() == 0) - { -- mp_mres_one = std::tr1::shared_ptr<GFpElement>(new GFpElement(mp_mod->get_p(), 1)); -+ mp_mres_one = shared_ptr<GFpElement>(new GFpElement(mp_mod->get_p(), 1)); - mp_mres_one->turn_on_sp_red_mul(); - mp_mres_one->get_mres(); - } diff --git a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h deleted file mode 100644 index 88589ed526b..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_curve__gfp.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/curve_gfp.h.orig 2013-04-30 22:53:40.000000000 +0000 -+++ src/math/gfpmath/curve_gfp.h -@@ -57,7 +57,7 @@ class BOTAN_DLL CurveGFp - * @param mod a shared pointer to a GFpModulus object suitable for - * *this. - */ -- void set_shrd_mod(const std::tr1::shared_ptr<GFpModulus> mod); -+ void set_shrd_mod(const shared_ptr<GFpModulus> mod); - - // getters - -@@ -99,14 +99,14 @@ class BOTAN_DLL CurveGFp - * function. - * @result the GFpElement 1, transformed to its m-residue - */ -- std::tr1::shared_ptr<GFpElement const> const get_mres_one() const; -+ shared_ptr<GFpElement const> const get_mres_one() const; - - /** - * Get prime modulus of the field of the curve - * @result prime modulus of the field of the curve - */ - BigInt const get_p() const; -- /*inline std::tr1::shared_ptr<BigInt> const get_ptr_p() const -+ /*inline shared_ptr<BigInt> const get_ptr_p() const - { - return mp_p; - }*/ -@@ -119,7 +119,7 @@ class BOTAN_DLL CurveGFp - * Do NOT spread pointers to a GFpModulus over different threads! - * @result a shared pointer to a GFpModulus object - */ -- inline std::tr1::shared_ptr<GFpModulus> const get_ptr_mod() const -+ inline shared_ptr<GFpModulus> const get_ptr_mod() const - { - return mp_mod; - } -@@ -131,12 +131,12 @@ class BOTAN_DLL CurveGFp - void swap(CurveGFp& other); - - private: -- std::tr1::shared_ptr<GFpModulus> mp_mod; -+ shared_ptr<GFpModulus> mp_mod; - GFpElement mA; - GFpElement mB; -- mutable std::tr1::shared_ptr<GFpElement> mp_mres_a; -- mutable std::tr1::shared_ptr<GFpElement> mp_mres_b; -- mutable std::tr1::shared_ptr<GFpElement> mp_mres_one; -+ mutable shared_ptr<GFpElement> mp_mres_a; -+ mutable shared_ptr<GFpElement> mp_mres_b; -+ mutable shared_ptr<GFpElement> mp_mres_one; - }; - - // relational operators diff --git a/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp b/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp deleted file mode 100644 index 7af3aa0baad..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_gfp__element.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/gfp_element.cpp.orig 2013-04-30 23:08:30.000000000 +0000 -+++ src/math/gfpmath/gfp_element.cpp -@@ -174,13 +174,13 @@ GFpElement::GFpElement(const BigInt& p, - m_is_trf(false) - { - assert(mp_mod.get() == 0); -- mp_mod = std::tr1::shared_ptr<GFpModulus>(new GFpModulus(p)); -+ mp_mod = shared_ptr<GFpModulus>(new GFpModulus(p)); - assert(mp_mod->m_p_dash == 0); - if(m_use_montgm) - ensure_montgm_precomp(); - } - --GFpElement::GFpElement(std::tr1::shared_ptr<GFpModulus> const mod, const BigInt& value, bool use_montgm) -+GFpElement::GFpElement(shared_ptr<GFpModulus> const mod, const BigInt& value, bool use_montgm) - : mp_mod(), - m_value(value % mod->m_p), - m_use_montgm(use_montgm), -@@ -247,7 +247,7 @@ void GFpElement::ensure_montgm_precomp() - - } - --void GFpElement::set_shrd_mod(std::tr1::shared_ptr<GFpModulus> const p_mod) -+void GFpElement::set_shrd_mod(shared_ptr<GFpModulus> const p_mod) - { - mp_mod = p_mod; - } diff --git a/security/botan/patches/patch-src_math_gfpmath_gfp__element.h b/security/botan/patches/patch-src_math_gfpmath_gfp__element.h deleted file mode 100644 index a193ae15211..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_gfp__element.h +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_gfp__element.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/gfp_element.h.orig 2013-04-30 22:49:33.000000000 +0000 -+++ src/math/gfpmath/gfp_element.h -@@ -14,9 +14,12 @@ - - #include <botan/bigint.h> - #include <botan/gfp_modulus.h> -+#include <ciso646> - #include <iosfwd> - --#if defined(BOTAN_USE_STD_TR1) -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+ #include <memory> -+#elif defined(BOTAN_USE_STD_TR1) - #include <tr1/memory> - #elif defined(BOTAN_USE_BOOST_TR1) - #include <boost/tr1/memory.hpp> -@@ -25,6 +28,14 @@ - #endif - - namespace Botan { -+#ifndef BOTAN_SHARED_PTR -+#define BOTAN_SHARED_PTR -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+ using std::shared_ptr; -+#else -+ using std::tr1::shared_ptr; -+#endif -+#endif - - struct Illegal_Transformation : public Exception - { -@@ -40,7 +51,7 @@ struct Illegal_Transformation : public E - class BOTAN_DLL GFpElement - { - private: -- std::tr1::shared_ptr<GFpModulus> mp_mod; -+ shared_ptr<GFpModulus> mp_mod; - mutable BigInt m_value; // ordinary residue or m-residue respectively - mutable BigInt workspace; - -@@ -79,7 +90,7 @@ class BOTAN_DLL GFpElement - * @param value the element value - * @param use_montgm whether this object will use Montgomery multiplication - */ -- explicit GFpElement(std::tr1::shared_ptr<GFpModulus> const mod, -+ explicit GFpElement(shared_ptr<GFpModulus> const mod, - const BigInt& value, bool use_mongm = false); - - /** -@@ -190,7 +201,7 @@ class BOTAN_DLL GFpElement - * the shared GFpModulus objects! - * @result the shared pointer to the GFpModulus of *this - */ -- inline std::tr1::shared_ptr<GFpModulus> const get_ptr_mod() const -+ inline shared_ptr<GFpModulus> const get_ptr_mod() const - { - return mp_mod; - } -@@ -203,7 +214,7 @@ class BOTAN_DLL GFpElement - * the shared GFpModulus objects! - * @param mod a shared pointer to a GFpModulus that will be held in *this - */ -- void set_shrd_mod(std::tr1::shared_ptr<GFpModulus> const mod); -+ void set_shrd_mod(shared_ptr<GFpModulus> const mod); - - /** - * Tells whether this GFpElement is currently transformed to it´ m-residue, diff --git a/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp b/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp deleted file mode 100644 index de4d5c8d113..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_point__gfp.cpp,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/point_gfp.cpp.orig 2013-04-30 23:08:32.000000000 +0000 -+++ src/math/gfpmath/point_gfp.cpp -@@ -109,7 +109,7 @@ const PointGFp& PointGFp::assign_within_ - return *this; - } - --void PointGFp::set_shrd_mod(std::tr1::shared_ptr<GFpModulus> p_mod) -+void PointGFp::set_shrd_mod(shared_ptr<GFpModulus> p_mod) - { - mX.set_shrd_mod(p_mod); - mY.set_shrd_mod(p_mod); -@@ -133,7 +133,7 @@ void PointGFp::ensure_worksp() const - } - } - -- mp_worksp_gfp_el = std::tr1::shared_ptr<std::vector<GFpElement> >(new std::vector<GFpElement>); -+ mp_worksp_gfp_el = shared_ptr<std::vector<GFpElement> >(new std::vector<GFpElement>); - mp_worksp_gfp_el->reserve(9); - for (u32bit i=0; i<GFPEL_WKSP_SIZE; i++) - { -@@ -337,8 +337,8 @@ PointGFp& PointGFp::mult_this_secure(con - // use montgomery mult. in this operation - this->turn_on_sp_red_mul(); - -- std::tr1::shared_ptr<PointGFp> H(new PointGFp(this->mC)); -- std::tr1::shared_ptr<PointGFp> tmp; // used for AADA -+ shared_ptr<PointGFp> H(new PointGFp(this->mC)); -+ shared_ptr<PointGFp> tmp; // used for AADA - - PointGFp P(*this); - BigInt m(scalar); -@@ -477,15 +477,15 @@ PointGFp& PointGFp::operator*=(const Big - return *this; - } - --inline std::tr1::shared_ptr<PointGFp> PointGFp::mult_loop(int l, -+inline shared_ptr<PointGFp> PointGFp::mult_loop(int l, - const BigInt& m, -- std::tr1::shared_ptr<PointGFp> H, -- std::tr1::shared_ptr<PointGFp> tmp, -+ shared_ptr<PointGFp> H, -+ shared_ptr<PointGFp> tmp, - const PointGFp& P) - { - //assert(l >= (int)m.bits()- 1); - tmp = H; -- std::tr1::shared_ptr<PointGFp> to_add(new PointGFp(P)); // we just need some point -+ shared_ptr<PointGFp> to_add(new PointGFp(P)); // we just need some point - // so that we can use op= - // inside the loop - for (int i=l; i >=0; i--) diff --git a/security/botan/patches/patch-src_math_gfpmath_point__gfp.h b/security/botan/patches/patch-src_math_gfpmath_point__gfp.h deleted file mode 100644 index 362cac684b2..00000000000 --- a/security/botan/patches/patch-src_math_gfpmath_point__gfp.h +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-src_math_gfpmath_point__gfp.h,v 1.1 2013/05/06 14:58:20 joerg Exp $ - ---- src/math/gfpmath/point_gfp.h.orig 2013-04-30 22:54:19.000000000 +0000 -+++ src/math/gfpmath/point_gfp.h -@@ -234,7 +234,7 @@ class BOTAN_DLL PointGFp - * @param mod a shared pointer to a GFpModulus that will - * be held in the members *this - */ -- void set_shrd_mod(std::tr1::shared_ptr<GFpModulus> p_mod); -+ void set_shrd_mod(shared_ptr<GFpModulus> p_mod); - - static GFpElement decompress(bool yMod2, GFpElement const& x, const CurveGFp& curve); - -@@ -242,9 +242,9 @@ class BOTAN_DLL PointGFp - static const u32bit GFPEL_WKSP_SIZE = 9; - void ensure_worksp() const; - -- inline std::tr1::shared_ptr<PointGFp> mult_loop(int l, const BigInt& m, -- std::tr1::shared_ptr<PointGFp> H, -- std::tr1::shared_ptr<PointGFp> tmp, -+ inline shared_ptr<PointGFp> mult_loop(int l, const BigInt& m, -+ shared_ptr<PointGFp> H, -+ shared_ptr<PointGFp> tmp, - const PointGFp& P); - - CurveGFp mC; -@@ -257,7 +257,7 @@ class BOTAN_DLL PointGFp - mutable bool mZpow2_set; - mutable bool mZpow3_set; - mutable bool mAZpow4_set; -- mutable std::tr1::shared_ptr<std::vector<GFpElement> > mp_worksp_gfp_el; -+ mutable shared_ptr<std::vector<GFpElement> > mp_worksp_gfp_el; - - }; - |