commit 7bc42c81169986aa0d93aaa7d01980ba5c45e154 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Jun 6 22:55:12 2020 +1000 [notify] mbedtls: 2.16.6 -> 2.22.0 ABI change check with revdep diff --git a/mbedtls/.footprint b/mbedtls/.footprint index 70dd7b2fa..8e8d15c68 100644 --- a/mbedtls/.footprint +++ b/mbedtls/.footprint @@ -1,54 +1,51 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/mbedtls_aescrypt2 --rwxr-xr-x root/root usr/bin/mbedtls_benchmark --rwxr-xr-x root/root usr/bin/mbedtls_cert_app --rwxr-xr-x root/root usr/bin/mbedtls_cert_req --rwxr-xr-x root/root usr/bin/mbedtls_cert_write --rwxr-xr-x root/root usr/bin/mbedtls_crl_app --rwxr-xr-x root/root usr/bin/mbedtls_crypt_and_hash --rwxr-xr-x root/root usr/bin/mbedtls_dh_client --rwxr-xr-x root/root usr/bin/mbedtls_dh_genprime --rwxr-xr-x root/root usr/bin/mbedtls_dh_server --rwxr-xr-x root/root usr/bin/mbedtls_dtls_client --rwxr-xr-x root/root usr/bin/mbedtls_dtls_server --rwxr-xr-x root/root usr/bin/mbedtls_ecdh_curve25519 --rwxr-xr-x root/root usr/bin/mbedtls_ecdsa --rwxr-xr-x root/root usr/bin/mbedtls_gen_entropy --rwxr-xr-x root/root usr/bin/mbedtls_gen_key --rwxr-xr-x root/root usr/bin/mbedtls_gen_random_ctr_drbg --rwxr-xr-x root/root usr/bin/mbedtls_gen_random_havege --rwxr-xr-x root/root usr/bin/mbedtls_generic_sum --rwxr-xr-x root/root usr/bin/mbedtls_hello --rwxr-xr-x root/root usr/bin/mbedtls_key_app --rwxr-xr-x root/root usr/bin/mbedtls_key_app_writer --rwxr-xr-x root/root usr/bin/mbedtls_mini_client --rwxr-xr-x root/root usr/bin/mbedtls_mpi_demo --rwxr-xr-x root/root usr/bin/mbedtls_pem2der --rwxr-xr-x root/root usr/bin/mbedtls_pk_decrypt --rwxr-xr-x root/root usr/bin/mbedtls_pk_encrypt --rwxr-xr-x root/root usr/bin/mbedtls_pk_sign --rwxr-xr-x root/root usr/bin/mbedtls_pk_verify --rwxr-xr-x root/root usr/bin/mbedtls_query_compile_time_config --rwxr-xr-x root/root usr/bin/mbedtls_req_app --rwxr-xr-x root/root usr/bin/mbedtls_rsa_decrypt --rwxr-xr-x root/root usr/bin/mbedtls_rsa_encrypt --rwxr-xr-x root/root usr/bin/mbedtls_rsa_genkey --rwxr-xr-x root/root usr/bin/mbedtls_rsa_sign --rwxr-xr-x root/root usr/bin/mbedtls_rsa_sign_pss --rwxr-xr-x root/root usr/bin/mbedtls_rsa_verify --rwxr-xr-x root/root usr/bin/mbedtls_rsa_verify_pss --rwxr-xr-x root/root usr/bin/mbedtls_selftest --rwxr-xr-x root/root usr/bin/mbedtls_ssl_client1 --rwxr-xr-x root/root usr/bin/mbedtls_ssl_client2 --rwxr-xr-x root/root usr/bin/mbedtls_ssl_fork_server --rwxr-xr-x root/root usr/bin/mbedtls_ssl_mail_client --rwxr-xr-x root/root usr/bin/mbedtls_ssl_server --rwxr-xr-x root/root usr/bin/mbedtls_ssl_server2 --rwxr-xr-x root/root usr/bin/mbedtls_strerror --rwxr-xr-x root/root usr/bin/mbedtls_udp_proxy --rwxr-xr-x root/root usr/bin/mbedtls_udp_proxy_wrapper.sh --rwxr-xr-x root/root usr/bin/mbedtls_zeroize +-rwxr-xr-x root/root usr/bin/aescrypt2 +-rwxr-xr-x root/root usr/bin/benchmark +-rwxr-xr-x root/root usr/bin/cert_app +-rwxr-xr-x root/root usr/bin/cert_req +-rwxr-xr-x root/root usr/bin/cert_write +-rwxr-xr-x root/root usr/bin/crl_app +-rwxr-xr-x root/root usr/bin/crypt_and_hash +-rwxr-xr-x root/root usr/bin/crypto_examples +-rwxr-xr-x root/root usr/bin/dh_client +-rwxr-xr-x root/root usr/bin/dh_genprime +-rwxr-xr-x root/root usr/bin/dh_server +-rwxr-xr-x root/root usr/bin/dtls_client +-rwxr-xr-x root/root usr/bin/dtls_server +-rwxr-xr-x root/root usr/bin/gen_entropy +-rwxr-xr-x root/root usr/bin/gen_key +-rwxr-xr-x root/root usr/bin/gen_random_ctr_drbg +-rwxr-xr-x root/root usr/bin/gen_random_havege +-rwxr-xr-x root/root usr/bin/generic_sum +-rwxr-xr-x root/root usr/bin/hello +-rwxr-xr-x root/root usr/bin/key_app +-rwxr-xr-x root/root usr/bin/key_ladder_demo +-rwxr-xr-x root/root usr/bin/key_ladder_demo.sh +-rwxr-xr-x root/root usr/bin/mini_client +-rwxr-xr-x root/root usr/bin/mpi_demo +-rwxr-xr-x root/root usr/bin/pem2der +-rwxr-xr-x root/root usr/bin/pk_decrypt +-rwxr-xr-x root/root usr/bin/pk_encrypt +-rwxr-xr-x root/root usr/bin/pk_sign +-rwxr-xr-x root/root usr/bin/pk_verify +-rwxr-xr-x root/root usr/bin/psa_constant_names +-rwxr-xr-x root/root usr/bin/query_compile_time_config +-rwxr-xr-x root/root usr/bin/req_app +-rwxr-xr-x root/root usr/bin/rsa_decrypt +-rwxr-xr-x root/root usr/bin/rsa_encrypt +-rwxr-xr-x root/root usr/bin/rsa_genkey +-rwxr-xr-x root/root usr/bin/rsa_sign +-rwxr-xr-x root/root usr/bin/rsa_verify +-rwxr-xr-x root/root usr/bin/selftest +-rwxr-xr-x root/root usr/bin/ssl_client1 +-rwxr-xr-x root/root usr/bin/ssl_client2 +-rwxr-xr-x root/root usr/bin/ssl_fork_server +-rwxr-xr-x root/root usr/bin/ssl_mail_client +-rwxr-xr-x root/root usr/bin/ssl_pthread_server +-rwxr-xr-x root/root usr/bin/ssl_server +-rwxr-xr-x root/root usr/bin/strerror +-rwxr-xr-x root/root usr/bin/udp_proxy drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/mbedtls/ -rw-r--r-- root/root usr/include/mbedtls/aes.h @@ -109,6 +106,7 @@ drwxr-xr-x root/root usr/include/mbedtls/ -rw-r--r-- root/root usr/include/mbedtls/platform_time.h -rw-r--r-- root/root usr/include/mbedtls/platform_util.h -rw-r--r-- root/root usr/include/mbedtls/poly1305.h +-rw-r--r-- root/root usr/include/mbedtls/psa_util.h -rw-r--r-- root/root usr/include/mbedtls/ripemd160.h -rw-r--r-- root/root usr/include/mbedtls/rsa.h -rw-r--r-- root/root usr/include/mbedtls/rsa_internal.h @@ -129,13 +127,29 @@ drwxr-xr-x root/root usr/include/mbedtls/ -rw-r--r-- root/root usr/include/mbedtls/x509_crt.h -rw-r--r-- root/root usr/include/mbedtls/x509_csr.h -rw-r--r-- root/root usr/include/mbedtls/xtea.h +drwxr-xr-x root/root usr/include/psa/ +-rw-r--r-- root/root usr/include/psa/crypto.h +-rw-r--r-- root/root usr/include/psa/crypto_accel_driver.h +-rw-r--r-- root/root usr/include/psa/crypto_compat.h +-rw-r--r-- root/root usr/include/psa/crypto_driver_common.h +-rw-r--r-- root/root usr/include/psa/crypto_entropy_driver.h +-rw-r--r-- root/root usr/include/psa/crypto_extra.h +-rw-r--r-- root/root usr/include/psa/crypto_platform.h +-rw-r--r-- root/root usr/include/psa/crypto_se_driver.h +-rw-r--r-- root/root usr/include/psa/crypto_sizes.h +-rw-r--r-- root/root usr/include/psa/crypto_struct.h +-rw-r--r-- root/root usr/include/psa/crypto_types.h +-rw-r--r-- root/root usr/include/psa/crypto_values.h drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libmbedcrypto.a -lrwxrwxrwx root/root usr/lib/libmbedcrypto.so -> libmbedcrypto.so.3 --rwxr-xr-x root/root usr/lib/libmbedcrypto.so.3 --rw-r--r-- root/root usr/lib/libmbedtls.a -lrwxrwxrwx root/root usr/lib/libmbedtls.so -> libmbedtls.so.12 --rwxr-xr-x root/root usr/lib/libmbedtls.so.12 --rw-r--r-- root/root usr/lib/libmbedx509.a -lrwxrwxrwx root/root usr/lib/libmbedx509.so -> libmbedx509.so.0 --rwxr-xr-x root/root usr/lib/libmbedx509.so.0 +-rwxr-xr-x root/root usr/lib/libmbedcrypto.a +lrwxrwxrwx root/root usr/lib/libmbedcrypto.so -> libmbedcrypto.so.4 +-rwxr-xr-x root/root usr/lib/libmbedcrypto.so.2.22.0 +lrwxrwxrwx root/root usr/lib/libmbedcrypto.so.4 -> libmbedcrypto.so.2.22.0 +-rwxr-xr-x root/root usr/lib/libmbedtls.a +lrwxrwxrwx root/root usr/lib/libmbedtls.so -> libmbedtls.so.13 +lrwxrwxrwx root/root usr/lib/libmbedtls.so.13 -> libmbedtls.so.2.22.0 +-rwxr-xr-x root/root usr/lib/libmbedtls.so.2.22.0 +-rwxr-xr-x root/root usr/lib/libmbedx509.a +lrwxrwxrwx root/root usr/lib/libmbedx509.so -> libmbedx509.so.1 +lrwxrwxrwx root/root usr/lib/libmbedx509.so.1 -> libmbedx509.so.2.22.0 +-rwxr-xr-x root/root usr/lib/libmbedx509.so.2.22.0 diff --git a/mbedtls/.signature b/mbedtls/.signature index 429c268ef..9b4c2c15f 100644 --- a/mbedtls/.signature +++ b/mbedtls/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30TT9m6o3AB9O9CwB2guNmW1jRykaqXExYHfTp41s9nUrIFBHfLfmB+TKGIzE/CE/sSXOohXEeaVHTValZZNpAM= -SHA256 (Pkgfile) = ff71ec44c0278505dcf3f3303432b4e1a6497d2dbd74c66a03a6f9e773f0666d -SHA256 (.footprint) = 85d749d9ece2c35c3e804c8d2ca344e78cd3421340a05e0b75465b2a3834d826 -SHA256 (mbedtls-2.16.6-gpl.tgz) = 80a484df42f32dbe95665cd4b18ce0dd14b6c67dfd561d36d1475802e41eb3ed +RWSagIOpLGJF3wPaCXJ6mRijm0Whp4rvS9GJXJnhd2NKsbxHOLMc4kLlMDtlQUXWv4fHwMvT/TDX2Fmvk1JpohW/hXmQZWFw6go= +SHA256 (Pkgfile) = 784d1eff706bd60f5eb235cd70ddb5f8c9b771a1277e7d2f8d85ba85321118c8 +SHA256 (.footprint) = f016ce80de38ce09d7e0a6400adfea68f6dd3663d341ac4e78acd5e7a230d43c +SHA256 (mbedtls-2.22.0.tar.gz) = 94ac6bdd209248028bd94b20bfac769e7922dda15c40c67a6170b0a58e7982f4 diff --git a/mbedtls/Pkgfile b/mbedtls/Pkgfile index dfd084967..ac6415607 100644 --- a/mbedtls/Pkgfile +++ b/mbedtls/Pkgfile @@ -1,21 +1,26 @@ -# Description: Portable cryptographic and SSL/TLS library, aka polarssl. +# Description: Cryptographic library for embedded systems # URL: https://tls.mbed.org/ # Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: cmake ninja name=mbedtls -version=2.16.6 +version=2.22.0 release=1 -source=(https://tls.mbed.org/download/$name-$version-gpl.tgz) +source=(https://github.com/ARMmbed/mbedtls/archive/$name-$version.tar.gz) build() { - cd $name-$version - # enable flags for non-embedded systems - sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h - sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h + sed -i 's|//\(#define MBEDTLS_HAVE_SSE2\)|\1|' $name-$name-$version/include/mbedtls/config.h + sed -i 's|//\(#define MBEDTLS_ZLIB_SUPPORT\)|\1|' $name-$name-$version/include/mbedtls/config.h + sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' $name-$name-$version/include/mbedtls/config.h + sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' $name-$name-$version/include/mbedtls/config.h - sed -i 's|<time.h>|"platform.h"|' include/mbedtls/ssl.h + cmake -S$name-$name-$version -Bbuild -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_ZLIB_SUPPORT=ON \ + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ + -DINSTALL_MBEDTLS_HEADERS=ON - LDFLAGS+=' -I../include ' make SHARED=1 no_test - make DESTDIR="$PKG/usr" install + cmake --build build + DESTDIR=$PKG cmake --build build --target install }