Attachment 227523 Details for Bug 258131 – patch

[patch] patch

update-sec-mbedtls.patch (text/plain), 5.95 KB, created by Chris Petrik on 2021-08-29 07:44:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2021-08-29 07:44:19 UTC

Size: 5.95 KB

patch

obsolete

>diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile
>index b3db9e786cce..92c09d271e74 100644
>--- a/security/mbedtls/Makefile
>+++ b/security/mbedtls/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	mbedtls
>-PORTVERSION=	2.16.11
>+PORTVERSION=	3.0.0
> DISTVERSIONPREFIX=${PORTNAME}-
> CATEGORIES=	security devel
> 
>@@ -7,7 +7,7 @@ MAINTAINER=	tijl@FreeBSD.org
> COMMENT=	SSL/TLS and cryptography library
> 
> LICENSE=	APACHE20
>-LICENSE_FILE=	${WRKSRC}/apache-2.0.txt
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	ARMmbed
>@@ -29,8 +29,6 @@ post-patch:
> 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
> 
> post-install:
>-	${FIND} ${STAGEDIR}${PREFIX}/bin -type f -not -name \
>-		mbedtls_udp_proxy_wrapper.sh -exec ${STRIP_CMD} {} +
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
> 
> .include <bsd.port.mk>
>diff --git a/security/mbedtls/distinfo b/security/mbedtls/distinfo
>index f8c637f25214..86134dce794c 100644
>--- a/security/mbedtls/distinfo
>+++ b/security/mbedtls/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1626016938
>-SHA256 (ARMmbed-mbedtls-mbedtls-2.16.11_GH0.tar.gz) = 51bb9685c4f4ff9255da5659ff346b89dcaf129e3ba0f3b2b0c48a1a7495e701
>-SIZE (ARMmbed-mbedtls-mbedtls-2.16.11_GH0.tar.gz) = 2692209
>+TIMESTAMP = 1630185146
>+SHA256 (ARMmbed-mbedtls-mbedtls-3.0.0_GH0.tar.gz) = 377d376919be19f07c7e7adeeded088a525be40353f6d938a78e4f986bce2ae0
>+SIZE (ARMmbed-mbedtls-mbedtls-3.0.0_GH0.tar.gz) = 4163127
>diff --git a/security/mbedtls/pkg-plist b/security/mbedtls/pkg-plist
>index 1a58f02f8359..025c36e1ddd6 100644
>--- a/security/mbedtls/pkg-plist
>+++ b/security/mbedtls/pkg-plist
>@@ -4,6 +4,7 @@ bin/mbedtls_cert_req
> bin/mbedtls_cert_write
> bin/mbedtls_crl_app
> bin/mbedtls_crypt_and_hash
>+bin/mbedtls_crypto_examples
> bin/mbedtls_dh_client
> bin/mbedtls_dh_genprime
> bin/mbedtls_dh_server
>@@ -11,14 +12,24 @@ bin/mbedtls_dtls_client
> bin/mbedtls_dtls_server
> bin/mbedtls_ecdh_curve25519
> bin/mbedtls_ecdsa
>+bin/mbedtls_fuzz_client
>+bin/mbedtls_fuzz_dtlsclient
>+bin/mbedtls_fuzz_dtlsserver
>+bin/mbedtls_fuzz_privkey
>+bin/mbedtls_fuzz_pubkey
>+bin/mbedtls_fuzz_server
>+bin/mbedtls_fuzz_x509crl
>+bin/mbedtls_fuzz_x509crt
>+bin/mbedtls_fuzz_x509csr
> bin/mbedtls_gen_entropy
> bin/mbedtls_gen_key
> bin/mbedtls_gen_random_ctr_drbg
>-bin/mbedtls_gen_random_havege
> bin/mbedtls_generic_sum
> bin/mbedtls_hello
> bin/mbedtls_key_app
> bin/mbedtls_key_app_writer
>+bin/mbedtls_key_ladder_demo
>+bin/mbedtls_key_ladder_demo.sh
> bin/mbedtls_mini_client
> bin/mbedtls_mpi_demo
> bin/mbedtls_pem2der
>@@ -26,6 +37,7 @@ bin/mbedtls_pk_decrypt
> bin/mbedtls_pk_encrypt
> bin/mbedtls_pk_sign
> bin/mbedtls_pk_verify
>+bin/mbedtls_psa_constant_names
> bin/mbedtls_query_compile_time_config
> bin/mbedtls_req_app
> bin/mbedtls_rsa_decrypt
>@@ -38,6 +50,7 @@ bin/mbedtls_rsa_verify_pss
> bin/mbedtls_selftest
> bin/mbedtls_ssl_client1
> bin/mbedtls_ssl_client2
>+bin/mbedtls_ssl_context_info
> bin/mbedtls_ssl_fork_server
> bin/mbedtls_ssl_mail_client
> bin/mbedtls_ssl_server
>@@ -47,26 +60,21 @@ bin/mbedtls_udp_proxy
> bin/mbedtls_udp_proxy_wrapper.sh
> bin/mbedtls_zeroize
> include/mbedtls/aes.h
>-include/mbedtls/aesni.h
>-include/mbedtls/arc4.h
> include/mbedtls/aria.h
> include/mbedtls/asn1.h
> include/mbedtls/asn1write.h
> include/mbedtls/base64.h
> include/mbedtls/bignum.h
>-include/mbedtls/blowfish.h
>-include/mbedtls/bn_mul.h
>+include/mbedtls/build_info.h
> include/mbedtls/camellia.h
> include/mbedtls/ccm.h
>-include/mbedtls/certs.h
> include/mbedtls/chacha20.h
> include/mbedtls/chachapoly.h
> include/mbedtls/check_config.h
> include/mbedtls/cipher.h
>-include/mbedtls/cipher_internal.h
> include/mbedtls/cmac.h
>-include/mbedtls/compat-1.3.h
>-include/mbedtls/config.h
>+include/mbedtls/compat-2.x.h
>+include/mbedtls/config_psa.h
> include/mbedtls/ctr_drbg.h
> include/mbedtls/debug.h
> include/mbedtls/des.h
>@@ -75,38 +83,30 @@ include/mbedtls/ecdh.h
> include/mbedtls/ecdsa.h
> include/mbedtls/ecjpake.h
> include/mbedtls/ecp.h
>-include/mbedtls/ecp_internal.h
> include/mbedtls/entropy.h
>-include/mbedtls/entropy_poll.h
> include/mbedtls/error.h
> include/mbedtls/gcm.h
>-include/mbedtls/havege.h
> include/mbedtls/hkdf.h
> include/mbedtls/hmac_drbg.h
>+include/mbedtls/mbedtls_config.h
> include/mbedtls/md.h
>-include/mbedtls/md2.h
>-include/mbedtls/md4.h
> include/mbedtls/md5.h
>-include/mbedtls/md_internal.h
> include/mbedtls/memory_buffer_alloc.h
>-include/mbedtls/net.h
> include/mbedtls/net_sockets.h
> include/mbedtls/nist_kw.h
> include/mbedtls/oid.h
>-include/mbedtls/padlock.h
> include/mbedtls/pem.h
> include/mbedtls/pk.h
>-include/mbedtls/pk_internal.h
>-include/mbedtls/pkcs11.h
> include/mbedtls/pkcs12.h
> include/mbedtls/pkcs5.h
> include/mbedtls/platform.h
> include/mbedtls/platform_time.h
> include/mbedtls/platform_util.h
> include/mbedtls/poly1305.h
>+include/mbedtls/private_access.h
>+include/mbedtls/psa_util.h
> include/mbedtls/ripemd160.h
> include/mbedtls/rsa.h
>-include/mbedtls/rsa_internal.h
> include/mbedtls/sha1.h
> include/mbedtls/sha256.h
> include/mbedtls/sha512.h
>@@ -114,7 +114,6 @@ include/mbedtls/ssl.h
> include/mbedtls/ssl_cache.h
> include/mbedtls/ssl_ciphersuites.h
> include/mbedtls/ssl_cookie.h
>-include/mbedtls/ssl_internal.h
> include/mbedtls/ssl_ticket.h
> include/mbedtls/threading.h
> include/mbedtls/timing.h
>@@ -123,13 +122,27 @@ include/mbedtls/x509.h
> include/mbedtls/x509_crl.h
> include/mbedtls/x509_crt.h
> include/mbedtls/x509_csr.h
>-include/mbedtls/xtea.h
>+include/psa/crypto.h
>+include/psa/crypto_builtin_composites.h
>+include/psa/crypto_builtin_primitives.h
>+include/psa/crypto_compat.h
>+include/psa/crypto_config.h
>+include/psa/crypto_driver_common.h
>+include/psa/crypto_driver_contexts_composites.h
>+include/psa/crypto_driver_contexts_primitives.h
>+include/psa/crypto_extra.h
>+include/psa/crypto_platform.h
>+include/psa/crypto_se_driver.h
>+include/psa/crypto_sizes.h
>+include/psa/crypto_struct.h
>+include/psa/crypto_types.h
>+include/psa/crypto_values.h
> lib/libmbedcrypto.a
> lib/libmbedcrypto.so
>-lib/libmbedcrypto.so.3
>+lib/libmbedcrypto.so.10
> lib/libmbedtls.a
> lib/libmbedtls.so
>-lib/libmbedtls.so.12
>+lib/libmbedtls.so.16
> lib/libmbedx509.a
> lib/libmbedx509.so
>-lib/libmbedx509.so.0
>+lib/libmbedx509.so.4

Actions: View | Diff

Attachments on bug 258131: 227523