Update to botan2 2.14.0.

ok bluhm@ (MAINTAINER) tb@
This commit is contained in:
landry 2020-05-18 13:17:42 +00:00
parent d003618219
commit 0f14e68bb9
5 changed files with 121 additions and 63 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.23 2019/07/12 20:49:00 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2020/05/18 13:17:42 landry Exp $
COMMENT = crypto and TLS for C++11
VERSION = 2.10.0
VERSION = 2.14.0
DISTNAME = Botan-${VERSION}
PKGNAME = botan2-${VERSION}
SHARED_LIBS = botan-2 10.0
SHARED_LIBS = botan-2 11.0
CATEGORIES = security
@ -22,10 +22,11 @@ WANTLIB = ${COMPILER_LIBCXX} bz2 c crypto lzma m z
MASTER_SITES = ${HOMEPAGE}releases/
SUPDISTFILES = ${DISTFILES}.asc
EXTRACT_SUFX = .tgz
EXTRACT_SUFX = .tar.xz
MODULES = lang/python
MODPY_RUNDEP = No
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
# C++11
COMPILER = base-clang ports-gcc

View File

@ -1,4 +1,4 @@
SHA256 (Botan-2.10.0.tgz) = iEgZl1eMJ5JHJP6nZhDUPZ9ZyZ7f5WHUGAO7yYhxrTE=
SHA256 (Botan-2.10.0.tgz.asc) = Qtc+N2kc+uhO4WPmUDcB4ra5z6yIbVG6J5ijZhxsLUg=
SIZE (Botan-2.10.0.tgz) = 7240021
SIZE (Botan-2.10.0.tgz.asc) = 488
SHA256 (Botan-2.14.0.tar.xz) = DBDxK0JKQO4ZveACkgmOIB10mFNcBi2NW1htB4YaVLU=
SHA256 (Botan-2.14.0.tar.xz.asc) = 2OY8WMlCnVOoi2JhNdeMFSY341HObxDxgmzQGxEFqE4=
SIZE (Botan-2.14.0.tar.xz) = 5958948
SIZE (Botan-2.14.0.tar.xz.asc) = 488

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_cli_sandbox_cpp,v 1.1 2019/07/04 18:16:52 bluhm Exp $
$OpenBSD: patch-src_cli_sandbox_cpp,v 1.2 2020/05/18 13:17:43 landry Exp $
Index: src/cli/sandbox.cpp
--- src/cli/sandbox.cpp.orig
+++ src/cli/sandbox.cpp
@@ -29,8 +29,8 @@ Sandbox::Sandbox()
@@ -30,8 +30,8 @@ Sandbox::Sandbox()
bool Sandbox::init()
{
#if defined(BOTAN_TARGET_OS_HAS_PLEDGE)
@ -12,5 +12,5 @@ Index: src/cli/sandbox.cpp
+ // Cannot use pledge(2) as Botan library calls mlock(2) and munlock(2).
+ return true;
#elif defined(BOTAN_TARGET_OS_HAS_CAP_ENTER)
return (::cap_enter() == 0);
#else
cap_rights_t wt, rd;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-src_tests_main_cpp,v 1.7 2019/07/04 18:16:52 bluhm Exp $
$OpenBSD: patch-src_tests_main_cpp,v 1.8 2020/05/18 13:17:43 landry Exp $
Index: src/tests/main.cpp
--- src/tests/main.cpp.orig
+++ src/tests/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char* argv[])
@@ -88,7 +88,7 @@ int main(int argc, char* argv[])
const Botan_Tests::Test_Options opts(
parser.get_arg_list("suites"),
parser.get_arg_list("skip-tests"),

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2019/07/04 18:16:52 bluhm Exp $
@comment $OpenBSD: PLIST,v 1.14 2020/05/18 13:17:43 landry Exp $
@bin bin/botan
@bin bin/botan-test
include/botan-2/
@ -7,6 +7,7 @@ include/botan-2/botan/adler32.h
include/botan-2/botan/aead.h
include/botan-2/botan/aes.h
include/botan-2/botan/alg_id.h
include/botan-2/botan/argon2.h
include/botan-2/botan/aria.h
include/botan-2/botan/asn1_alt_name.h
include/botan-2/botan/asn1_attribute.h
@ -24,6 +25,7 @@ include/botan-2/botan/base58.h
include/botan-2/botan/base64.h
include/botan-2/botan/basefilt.h
include/botan-2/botan/bcrypt.h
include/botan-2/botan/bcrypt_pbkdf.h
include/botan-2/botan/ber_dec.h
include/botan-2/botan/bigint.h
include/botan-2/botan/blake2b.h
@ -47,7 +49,9 @@ include/botan-2/botan/ccm.h
include/botan-2/botan/cecpq1.h
include/botan-2/botan/cert_status.h
include/botan-2/botan/certstor.h
include/botan-2/botan/certstor_flatfile.h
include/botan-2/botan/certstor_sql.h
include/botan-2/botan/certstor_system.h
include/botan-2/botan/cfb.h
include/botan-2/botan/chacha.h
include/botan-2/botan/chacha20poly1305.h
@ -216,6 +220,7 @@ include/botan-2/botan/rfc6979.h
include/botan-2/botan/rmd160.h
include/botan-2/botan/rng.h
include/botan-2/botan/rotate.h
include/botan-2/botan/roughtime.h
include/botan-2/botan/rsa.h
include/botan-2/botan/salsa20.h
include/botan-2/botan/scan_name.h
@ -238,6 +243,7 @@ include/botan-2/botan/sm2.h
include/botan-2/botan/sm2_enc.h
include/botan-2/botan/sm3.h
include/botan-2/botan/sm4.h
include/botan-2/botan/sodium.h
include/botan-2/botan/sp800_108.h
include/botan-2/botan/sp800_56a.h
include/botan-2/botan/sp800_56c.h
@ -306,14 +312,15 @@ include/botan-2/botan/xmss_wots_publickey.h
include/botan-2/botan/xtea.h
include/botan-2/botan/xts.h
include/botan-2/botan/zlib.h
lib/libbotan-2.a
@static-lib lib/libbotan-2.a
@lib lib/libbotan-2.so.${LIBbotan-2_VERSION}
lib/pkgconfig/botan-2.pc
%%x86%%
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}botan2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/botan2.py
lib/python${MODPY_VERSION}/site-packages/botan2.pyc
@man man/man1/botan.1
share/botan-2/
share/botan-2/data/
@ -324,6 +331,7 @@ share/botan-2/data/aead/eax.vec
share/botan-2/data/aead/gcm.vec
share/botan-2/data/aead/ocb.vec
share/botan-2/data/aead/siv.vec
share/botan-2/data/argon2.vec
share/botan-2/data/asn1_print/
share/botan-2/data/asn1_print/input1.der
share/botan-2/data/asn1_print/input2.der
@ -343,6 +351,7 @@ share/botan-2/data/base32.vec
share/botan-2/data/base58.vec
share/botan-2/data/base58c.vec
share/botan-2/data/base64.vec
share/botan-2/data/bcrypt_pbkdf.vec
share/botan-2/data/block/
share/botan-2/data/block/aes.vec
share/botan-2/data/block/aria.vec
@ -372,6 +381,7 @@ share/botan-2/data/bn/dsa_gen.vec
share/botan-2/data/bn/gcd.vec
share/botan-2/data/bn/invmod.vec
share/botan-2/data/bn/isprime.vec
share/botan-2/data/bn/jacobi.vec
share/botan-2/data/bn/lshift.vec
share/botan-2/data/bn/mod.vec
share/botan-2/data/bn/mul.vec
@ -408,6 +418,8 @@ share/botan-2/data/hash/sm3.vec
share/botan-2/data/hash/streebog.vec
share/botan-2/data/hash/tiger.vec
share/botan-2/data/hash/whirlpool.vec
share/botan-2/data/hash_mc.vec
share/botan-2/data/hash_rep.vec
share/botan-2/data/hkdf_label.vec
share/botan-2/data/hostnames.vec
share/botan-2/data/kdf/
@ -434,6 +446,10 @@ share/botan-2/data/mac/hmac.vec
share/botan-2/data/mac/poly1305.vec
share/botan-2/data/mac/siphash.vec
share/botan-2/data/mac/x919_mac.vec
share/botan-2/data/misc/
share/botan-2/data/misc/roughtime_nonce_from_blind.vec
share/botan-2/data/misc/roughtime_request.vec
share/botan-2/data/misc/roughtime_response.vec
share/botan-2/data/modes/
share/botan-2/data/modes/cbc.vec
share/botan-2/data/modes/cfb.vec
@ -448,6 +464,7 @@ share/botan-2/data/otp/hotp.vec
share/botan-2/data/otp/totp.vec
share/botan-2/data/pad.vec
share/botan-2/data/passhash/
share/botan-2/data/passhash/argon2.vec
share/botan-2/data/passhash/bcrypt.vec
share/botan-2/data/passhash/passhash9.vec
share/botan-2/data/pbkdf/
@ -465,8 +482,9 @@ share/botan-2/data/pubkey/dlies.vec
share/botan-2/data/pubkey/dsa_prob.vec
share/botan-2/data/pubkey/dsa_rfc6979.vec
share/botan-2/data/pubkey/dsa_verify.vec
share/botan-2/data/pubkey/ecc.vec
share/botan-2/data/pubkey/ecc_base_point_mul.vec
share/botan-2/data/pubkey/ecc_invalid.vec
share/botan-2/data/pubkey/ecc_var_point_mul.vec
share/botan-2/data/pubkey/ecdh.vec
share/botan-2/data/pubkey/ecdsa_invalid.vec
share/botan-2/data/pubkey/ecdsa_key_recovery.vec
@ -507,6 +525,7 @@ share/botan-2/data/rng/hmac_drbg.vec
share/botan-2/data/salted_blowfish.vec
share/botan-2/data/scrypt.vec
share/botan-2/data/siv_ad.vec
share/botan-2/data/srp6a.vec
share/botan-2/data/stream/
share/botan-2/data/stream/chacha.vec
share/botan-2/data/stream/ctr.vec
@ -1076,10 +1095,16 @@ share/botan-2/data/x509/extended/03/end.crt
share/botan-2/data/x509/extended/03/int1.crt
share/botan-2/data/x509/extended/03/root.crt
share/botan-2/data/x509/extended/expected.txt
share/botan-2/data/x509/gost/
share/botan-2/data/x509/gost/gost_int.pem
share/botan-2/data/x509/gost/gost_root.pem
share/botan-2/data/x509/misc/
share/botan-2/data/x509/misc/bundledcertdir/
share/botan-2/data/x509/misc/bundledcertdir/ValidCert.pem
share/botan-2/data/x509/misc/cert_seq.der
share/botan-2/data/x509/misc/certstor/
share/botan-2/data/x509/misc/certstor/ca_bundle_containing_non_ca.pem
share/botan-2/data/x509/misc/certstor/valid_ca_bundle.pem
share/botan-2/data/x509/misc/contains_authority_info_access.pem
share/botan-2/data/x509/misc/contains_authority_info_access_with_two_ca_issuers.pem
share/botan-2/data/x509/misc/contains_bmpstring.pem
@ -1087,6 +1112,11 @@ share/botan-2/data/x509/misc/contains_utf8string.pem
share/botan-2/data/x509/misc/opcuactt_ca.der
share/botan-2/data/x509/misc/opcuactt_ca.pem
share/botan-2/data/x509/misc/rsa_key.pem
share/botan-2/data/x509/misc/rsa_oaep.pem
share/botan-2/data/x509/misc/v1ca/
share/botan-2/data/x509/misc/v1ca/ee.pem
share/botan-2/data/x509/misc/v1ca/int.pem
share/botan-2/data/x509/misc/v1ca/root.pem
share/botan-2/data/x509/name_constraint/
share/botan-2/data/x509/name_constraint/Invalid_DN_Name_Constraint.crt
share/botan-2/data/x509/name_constraint/Invalid_Email_Name_Constraint.crt
@ -1502,11 +1532,16 @@ share/botan-2/data/x509/nist/test76/end.crt
share/botan-2/data/x509/nist/test76/int.crl
share/botan-2/data/x509/nist/test76/int.crt
share/botan-2/data/x509/ocsp/
share/botan-2/data/x509/ocsp/bdrive_encryption.pem
share/botan-2/data/x509/ocsp/bdrive_root.pem
share/botan-2/data/x509/ocsp/geotrust.pem
share/botan-2/data/x509/ocsp/gmail.pem
share/botan-2/data/x509/ocsp/google_g2.pem
share/botan-2/data/x509/ocsp/identrust.pem
share/botan-2/data/x509/ocsp/letsencrypt.pem
share/botan-2/data/x509/ocsp/patrickschmidt.pem
share/botan-2/data/x509/ocsp/patrickschmidt_ocsp.der
share/botan-2/data/x509/ocsp/patrickschmidt_ocsp_try_later_wrong_sig.der
share/botan-2/data/x509/ocsp/randombit.pem
share/botan-2/data/x509/ocsp/randombit_ocsp.der
share/botan-2/data/x509/ocsp/resp1.der
@ -1903,54 +1938,76 @@ share/botan-2/data/x509/x509test/ValidNameConstraint.pem
share/botan-2/data/x509/x509test/ValidWildcard.pem
share/botan-2/data/x509/x509test/expected.txt
share/botan-2/data/x509/x509test/root.pem
share/botan-2/data/x509/xmss/
share/botan-2/data/x509/xmss/xmss_bouncycastle_sha256_10_root.pem
share/botan-2/data/x509/xmss/xmss_isara_root.pem
share/botan-2/data/x509_dn.vec
share/doc/botan-2/
share/doc/botan-2/authors.txt
share/doc/botan-2/handbook/
share/doc/botan-2/handbook/abi.rst
share/doc/botan-2/handbook/api_ref/
share/doc/botan-2/handbook/api_ref/bigint.rst
share/doc/botan-2/handbook/api_ref/block_cipher.rst
share/doc/botan-2/handbook/api_ref/cipher_modes.rst
share/doc/botan-2/handbook/api_ref/compression.rst
share/doc/botan-2/handbook/api_ref/contents.rst
share/doc/botan-2/handbook/api_ref/credentials_manager.rst
share/doc/botan-2/handbook/api_ref/cryptobox.rst
share/doc/botan-2/handbook/api_ref/ecc.rst
share/doc/botan-2/handbook/api_ref/env_vars.rst
share/doc/botan-2/handbook/api_ref/ffi.rst
share/doc/botan-2/handbook/api_ref/filters.rst
share/doc/botan-2/handbook/api_ref/fpe.rst
share/doc/botan-2/handbook/api_ref/hash.rst
share/doc/botan-2/handbook/api_ref/kdf.rst
share/doc/botan-2/handbook/api_ref/keywrap.rst
share/doc/botan-2/handbook/api_ref/message_auth_codes.rst
share/doc/botan-2/handbook/api_ref/otp.rst
share/doc/botan-2/handbook/api_ref/passhash.rst
share/doc/botan-2/handbook/api_ref/pbkdf.rst
share/doc/botan-2/handbook/api_ref/pkcs11.rst
share/doc/botan-2/handbook/api_ref/psk_db.rst
share/doc/botan-2/handbook/api_ref/pubkey.rst
share/doc/botan-2/handbook/api_ref/python.rst
share/doc/botan-2/handbook/api_ref/rng.rst
share/doc/botan-2/handbook/api_ref/roughtime.rst
share/doc/botan-2/handbook/api_ref/secmem.rst
share/doc/botan-2/handbook/api_ref/srp.rst
share/doc/botan-2/handbook/api_ref/stream_ciphers.rst
share/doc/botan-2/handbook/api_ref/tls.rst
share/doc/botan-2/handbook/api_ref/tpm.rst
share/doc/botan-2/handbook/api_ref/tss.rst
share/doc/botan-2/handbook/api_ref/versions.rst
share/doc/botan-2/handbook/api_ref/x509.rst
share/doc/botan-2/handbook/authors.txt
share/doc/botan-2/handbook/building.rst
share/doc/botan-2/handbook/cli.rst
share/doc/botan-2/handbook/contents.rst
share/doc/botan-2/handbook/credits.rst
share/doc/botan-2/handbook/deprecated.rst
share/doc/botan-2/handbook/dev_ref/
share/doc/botan-2/handbook/dev_ref/configure.rst
share/doc/botan-2/handbook/dev_ref/contents.rst
share/doc/botan-2/handbook/dev_ref/continuous_integration.rst
share/doc/botan-2/handbook/dev_ref/contributing.rst
share/doc/botan-2/handbook/dev_ref/fuzzing.rst
share/doc/botan-2/handbook/dev_ref/mistakes.rst
share/doc/botan-2/handbook/dev_ref/oids.rst
share/doc/botan-2/handbook/dev_ref/os.rst
share/doc/botan-2/handbook/dev_ref/reading_list.rst
share/doc/botan-2/handbook/dev_ref/release_process.rst
share/doc/botan-2/handbook/dev_ref/test_framework.rst
share/doc/botan-2/handbook/dev_ref/todo.rst
share/doc/botan-2/handbook/goals.rst
share/doc/botan-2/handbook/index.rst
share/doc/botan-2/handbook/old_news.rst
share/doc/botan-2/handbook/packaging.rst
share/doc/botan-2/handbook/pgpkey.txt
share/doc/botan-2/handbook/roadmap.rst
share/doc/botan-2/handbook/security.rst
share/doc/botan-2/handbook/side_channels.rst
share/doc/botan-2/handbook/support.rst
share/doc/botan-2/license.txt
share/doc/botan-2/manual/
share/doc/botan-2/manual/abi.rst
share/doc/botan-2/manual/bigint.rst
share/doc/botan-2/manual/block_cipher.rst
share/doc/botan-2/manual/building.rst
share/doc/botan-2/manual/cipher_modes.rst
share/doc/botan-2/manual/cli.rst
share/doc/botan-2/manual/compression.rst
share/doc/botan-2/manual/contents.rst
share/doc/botan-2/manual/credentials_manager.rst
share/doc/botan-2/manual/cryptobox.rst
share/doc/botan-2/manual/deprecated.rst
share/doc/botan-2/manual/ecc.rst
share/doc/botan-2/manual/ffi.rst
share/doc/botan-2/manual/filters.rst
share/doc/botan-2/manual/fpe.rst
share/doc/botan-2/manual/fuzzing.rst
share/doc/botan-2/manual/goals.rst
share/doc/botan-2/manual/hash.rst
share/doc/botan-2/manual/index.rst
share/doc/botan-2/manual/kdf.rst
share/doc/botan-2/manual/keywrap.rst
share/doc/botan-2/manual/message_auth_codes.rst
share/doc/botan-2/manual/otp.rst
share/doc/botan-2/manual/packaging.rst
share/doc/botan-2/manual/passhash.rst
share/doc/botan-2/manual/pbkdf.rst
share/doc/botan-2/manual/pkcs11.rst
share/doc/botan-2/manual/psk_db.rst
share/doc/botan-2/manual/pubkey.rst
share/doc/botan-2/manual/python.rst
share/doc/botan-2/manual/rng.rst
share/doc/botan-2/manual/roadmap.rst
share/doc/botan-2/manual/secmem.rst
share/doc/botan-2/manual/side_channels.rst
share/doc/botan-2/manual/srp.rst
share/doc/botan-2/manual/stream_ciphers.rst
share/doc/botan-2/manual/support.rst
share/doc/botan-2/manual/tls.rst
share/doc/botan-2/manual/tpm.rst
share/doc/botan-2/manual/tss.rst
share/doc/botan-2/manual/versions.rst
share/doc/botan-2/manual/x509.rst
share/doc/botan-2/news.txt
share/doc/botan-2/oids.txt
share/doc/botan-2/pgpkey.txt
share/doc/botan-2/reading_list.txt